Commit 05d2d45e authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Nuke intel_drrs_init() 



intel_drrs_init() is a mostly pointless wrapper around
intel_panel_add_edid_downclock_mode(), get rid of it.

The only really useful thing left in there is the debug
print regarding the DRRS type supported by the connector.
Let's just move that into intel_panel_init().

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220331112822.11462-5-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 54746f57

drivers/gpu/drm/i915/display/intel_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -5075,7 +5075,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, 
	intel_panel_add_edid_fixed_mode(intel_connector);

	if (intel_panel_preferred_fixed_mode(intel_connector) &&

	    intel_edp_has_drrs(intel_dp))

		intel_drrs_init(intel_connector);

		intel_panel_add_edid_downclock_mode(intel_connector);



	/* MSO requires information from the EDID */

	intel_edp_mso_init(intel_dp);

drivers/gpu/drm/i915/display/intel_drrs.c

+0 −24
Original line number Diff line number Diff line
@@ -354,27 +354,3 @@ void intel_crtc_drrs_init(struct intel_crtc *crtc) 
	mutex_init(&crtc->drrs.mutex);

	crtc->drrs.cpu_transcoder = INVALID_TRANSCODER;

}
 


/**

 * intel_drrs_init - Init DRRS for eDP connector

 * @connector: eDP connector

 *

 * This function is called only once at driver load to initialize

 * DRRS support for the connector.

 *

 * Returns:

 * Downclock mode if panel supports it, else return NULL.

 * DRRS support is determined by the presence of downclock mode (apart

 * from VBT setting).

 */

void intel_drrs_init(struct intel_connector *connector)

{

	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);



	intel_panel_add_edid_downclock_mode(connector);



	drm_dbg_kms(&dev_priv->drm,

		    "[CONNECTOR:%d:%s] DRRS type: %s\n",

		    connector->base.base.id, connector->base.name,

		    intel_drrs_type_str(intel_panel_drrs_type(connector)));

}

drivers/gpu/drm/i915/display/intel_drrs.h

+0 −1
Original line number Diff line number Diff line
@@ -27,6 +27,5 @@ void intel_drrs_compute_config(struct intel_connector *connector, 
			       struct intel_crtc_state *pipe_config,

			       int output_bpp, bool constant_n);

void intel_crtc_drrs_init(struct intel_crtc *crtc);

void intel_drrs_init(struct intel_connector *connector);



#endif /* __INTEL_DRRS_H__ */

drivers/gpu/drm/i915/display/intel_panel.c

+6 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "intel_connector.h"

#include "intel_de.h"

#include "intel_display_types.h"

#include "intel_drrs.h"

#include "intel_panel.h"



bool intel_panel_use_ssc(struct drm_i915_private *i915)
@@ -634,6 +635,11 @@ int intel_panel_init(struct intel_connector *connector) 


	intel_backlight_init_funcs(panel);



	drm_dbg_kms(connector->base.dev,

		    "[CONNECTOR:%d:%s] DRRS type: %s\n",

		    connector->base.base.id, connector->base.name,

		    intel_drrs_type_str(intel_panel_drrs_type(connector)));



	return 0;

}