Commit 22512c3e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-fixes-2024-09-26' of... 

Merge tag 'drm-intel-next-fixes-2024-09-26' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-next

- Fix colorimetry detection for DP

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZvURJYm5lo-XIzbY@jlahtine-mobl.ger.corp.intel.com
parents d7126c0c e860513f

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;