| Message ID | 20241016132405.2231744-6-imre.deak@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Write source OUI for non-eDP sinks | expand |
On Wed, Oct 16, 2024 at 04:24:02PM +0300, Imre Deak wrote: > Reuse intel_dp_detect_dsc_caps() which already checks for the source's > DSC cap and retrieves the DPCD version from the DPRX caps. > > Signed-off-by: Imre Deak <imre.deak@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_dp.c | 38 ++++++++++++------------- > 1 file changed, 18 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > index 9ed4e5f8d798a..e2c37680caa91 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -4018,6 +4018,23 @@ static void intel_edp_get_dsc_sink_cap(u8 edp_dpcd_rev, struct intel_connector * > intel_dp_read_dsc_dpcd(connector->dp.dsc_decompression_aux, connector->dp.dsc_dpcd); > } > > +static void > +intel_dp_detect_dsc_caps(struct intel_dp *intel_dp, struct intel_connector *connector) > +{ > + struct drm_i915_private *i915 = dp_to_i915(intel_dp); > + > + /* Read DP Sink DSC Cap DPCD regs for DP v1.4 */ > + if (!HAS_DSC(i915)) > + return; > + > + if (intel_dp_is_edp(intel_dp)) > + intel_edp_get_dsc_sink_cap(intel_dp->edp_dpcd[0], > + connector); > + else > + intel_dp_get_dsc_sink_cap(intel_dp->dpcd[DP_DPCD_REV], > + connector); > +} > + > static void intel_edp_mso_mode_fixup(struct intel_connector *connector, > struct drm_display_mode *mode) > { > @@ -4193,9 +4210,7 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp, struct intel_connector *connector > intel_dp_set_max_sink_lane_count(intel_dp); > > /* Read the eDP DSC DPCD registers */ > - if (HAS_DSC(dev_priv)) > - intel_edp_get_dsc_sink_cap(intel_dp->edp_dpcd[0], > - connector); > + intel_dp_detect_dsc_caps(intel_dp, connector); > > /* > * If needed, program our source OUI so we can make various Intel-specific AUX services > @@ -5583,23 +5598,6 @@ intel_dp_unset_edid(struct intel_dp *intel_dp) > false); > } > > -static void > -intel_dp_detect_dsc_caps(struct intel_dp *intel_dp, struct intel_connector *connector) > -{ > - struct drm_i915_private *i915 = dp_to_i915(intel_dp); > - > - /* Read DP Sink DSC Cap DPCD regs for DP v1.4 */ > - if (!HAS_DSC(i915)) > - return; > - > - if (intel_dp_is_edp(intel_dp)) > - intel_edp_get_dsc_sink_cap(intel_dp->edp_dpcd[0], > - connector); > - else > - intel_dp_get_dsc_sink_cap(intel_dp->dpcd[DP_DPCD_REV], > - connector); > -} > - > static void > intel_dp_detect_sdp_caps(struct intel_dp *intel_dp) > { > -- > 2.44.2
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 9ed4e5f8d798a..e2c37680caa91 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -4018,6 +4018,23 @@ static void intel_edp_get_dsc_sink_cap(u8 edp_dpcd_rev, struct intel_connector * intel_dp_read_dsc_dpcd(connector->dp.dsc_decompression_aux, connector->dp.dsc_dpcd); } +static void +intel_dp_detect_dsc_caps(struct intel_dp *intel_dp, struct intel_connector *connector) +{ + struct drm_i915_private *i915 = dp_to_i915(intel_dp); + + /* Read DP Sink DSC Cap DPCD regs for DP v1.4 */ + if (!HAS_DSC(i915)) + return; + + if (intel_dp_is_edp(intel_dp)) + intel_edp_get_dsc_sink_cap(intel_dp->edp_dpcd[0], + connector); + else + intel_dp_get_dsc_sink_cap(intel_dp->dpcd[DP_DPCD_REV], + connector); +} + static void intel_edp_mso_mode_fixup(struct intel_connector *connector, struct drm_display_mode *mode) { @@ -4193,9 +4210,7 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp, struct intel_connector *connector intel_dp_set_max_sink_lane_count(intel_dp); /* Read the eDP DSC DPCD registers */ - if (HAS_DSC(dev_priv)) - intel_edp_get_dsc_sink_cap(intel_dp->edp_dpcd[0], - connector); + intel_dp_detect_dsc_caps(intel_dp, connector); /* * If needed, program our source OUI so we can make various Intel-specific AUX services @@ -5583,23 +5598,6 @@ intel_dp_unset_edid(struct intel_dp *intel_dp) false); } -static void -intel_dp_detect_dsc_caps(struct intel_dp *intel_dp, struct intel_connector *connector) -{ - struct drm_i915_private *i915 = dp_to_i915(intel_dp); - - /* Read DP Sink DSC Cap DPCD regs for DP v1.4 */ - if (!HAS_DSC(i915)) - return; - - if (intel_dp_is_edp(intel_dp)) - intel_edp_get_dsc_sink_cap(intel_dp->edp_dpcd[0], - connector); - else - intel_dp_get_dsc_sink_cap(intel_dp->dpcd[DP_DPCD_REV], - connector); -} - static void intel_dp_detect_sdp_caps(struct intel_dp *intel_dp) {
Reuse intel_dp_detect_dsc_caps() which already checks for the source's DSC cap and retrieves the DPCD version from the DPRX caps. Signed-off-by: Imre Deak <imre.deak@intel.com> --- drivers/gpu/drm/i915/display/intel_dp.c | 38 ++++++++++++------------- 1 file changed, 18 insertions(+), 20 deletions(-)