| Message ID | 20240918190441.29071-1-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] drm/i915/dp: Fix colorimetry detection | expand |
On Wed, 2024-09-18 at 22:04 +0300, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > 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: 00076671a648 ("drm/i915/display: Move colorimetry_support from > intel_psr to intel_dp") > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Jouni Högander <jouni.hogander@intel.com> > --- > drivers/gpu/drm/i915/display/intel_dp.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c > b/drivers/gpu/drm/i915/display/intel_dp.c > index 19f78432cc8f..f44951d8a0f8 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -4082,6 +4082,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. > * > @@ -4195,6 +4198,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); > } > > @@ -6946,9 +6952,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; >
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 19f78432cc8f..f44951d8a0f8 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -4082,6 +4082,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. * @@ -4195,6 +4198,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); } @@ -6946,9 +6952,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;