Commit e860513f authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Joonas Lahtinen
Browse files

drm/i915/dp: Fix colorimetry detection 



intel_dp_init_connector() is no place for detecting stuff via
DPCD (except perhaps for eDP). Move the colorimetry stuff into
a more appropriate place.

Cc: Jouni Högander <jouni.hogander@intel.com>
Fixes: 00076671 ("drm/i915/display: Move colorimetry_support from intel_psr to intel_dp")
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240918190441.29071-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJouni Högander <jouni.hogander@intel.com>
(cherry picked from commit 35dba483)
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent d7126c0c

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

+6 −3
Original line number Diff line number Diff line
@@ -4067,6 +4067,9 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp, struct intel_connector *connector 
			 drm_dp_is_branch(intel_dp->dpcd));

	intel_init_dpcd_quirks(intel_dp, &intel_dp->desc.ident);



	intel_dp->colorimetry_support =

		intel_dp_get_colorimetry_status(intel_dp);



	/*

	 * Read the eDP display control registers.

	 *
@@ -4180,6 +4183,9 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) 


		intel_init_dpcd_quirks(intel_dp, &intel_dp->desc.ident);



		intel_dp->colorimetry_support =

			intel_dp_get_colorimetry_status(intel_dp);



		intel_dp_update_sink_caps(intel_dp);

	}
@@ -6931,9 +6937,6 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, 
				    "HDCP init failed, skipping.\n");

	}



	intel_dp->colorimetry_support =

		intel_dp_get_colorimetry_status(intel_dp);



	intel_dp->frl.is_trained = false;

	intel_dp->frl.trained_rate_gbps = 0;