Skip to content

Commit 99fe4ae

Browse files
committed
drm/i915/dp: Reuse intel_dp_detect_dsc_caps() for eDP
Reuse intel_dp_detect_dsc_caps() which already checks for the source's DSC cap and retrieves the DPCD version from the DPRX caps. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Imre Deak <imre.deak@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20241025160259.3088727-6-imre.deak@intel.com
1 parent c8081b2 commit 99fe4ae

File tree

1 file changed

+18
-20
lines changed

1 file changed

+18
-20
lines changed

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

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4017,6 +4017,23 @@ static void intel_edp_get_dsc_sink_cap(u8 edp_dpcd_rev, struct intel_connector *
40174017
intel_dp_read_dsc_dpcd(connector->dp.dsc_decompression_aux, connector->dp.dsc_dpcd);
40184018
}
40194019

4020+
static void
4021+
intel_dp_detect_dsc_caps(struct intel_dp *intel_dp, struct intel_connector *connector)
4022+
{
4023+
struct drm_i915_private *i915 = dp_to_i915(intel_dp);
4024+
4025+
/* Read DP Sink DSC Cap DPCD regs for DP v1.4 */
4026+
if (!HAS_DSC(i915))
4027+
return;
4028+
4029+
if (intel_dp_is_edp(intel_dp))
4030+
intel_edp_get_dsc_sink_cap(intel_dp->edp_dpcd[0],
4031+
connector);
4032+
else
4033+
intel_dp_get_dsc_sink_cap(intel_dp->dpcd[DP_DPCD_REV],
4034+
connector);
4035+
}
4036+
40204037
static void intel_edp_mso_mode_fixup(struct intel_connector *connector,
40214038
struct drm_display_mode *mode)
40224039
{
@@ -4192,9 +4209,7 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp, struct intel_connector *connector
41924209
intel_dp_set_max_sink_lane_count(intel_dp);
41934210

41944211
/* Read the eDP DSC DPCD registers */
4195-
if (HAS_DSC(dev_priv))
4196-
intel_edp_get_dsc_sink_cap(intel_dp->edp_dpcd[0],
4197-
connector);
4212+
intel_dp_detect_dsc_caps(intel_dp, connector);
41984213

41994214
/*
42004215
* If needed, program our source OUI so we can make various Intel-specific AUX services
@@ -5581,23 +5596,6 @@ intel_dp_unset_edid(struct intel_dp *intel_dp)
55815596
false);
55825597
}
55835598

5584-
static void
5585-
intel_dp_detect_dsc_caps(struct intel_dp *intel_dp, struct intel_connector *connector)
5586-
{
5587-
struct drm_i915_private *i915 = dp_to_i915(intel_dp);
5588-
5589-
/* Read DP Sink DSC Cap DPCD regs for DP v1.4 */
5590-
if (!HAS_DSC(i915))
5591-
return;
5592-
5593-
if (intel_dp_is_edp(intel_dp))
5594-
intel_edp_get_dsc_sink_cap(intel_dp->edp_dpcd[0],
5595-
connector);
5596-
else
5597-
intel_dp_get_dsc_sink_cap(intel_dp->dpcd[DP_DPCD_REV],
5598-
connector);
5599-
}
5600-
56015599
static void
56025600
intel_dp_detect_sdp_caps(struct intel_dp *intel_dp)
56035601
{

0 commit comments

Comments
 (0)