@@ -1603,10 +1603,8 @@ int intel_dp_dsc_compute_max_bpp(const struct intel_connector *connector,
1603
1603
return 0 ;
1604
1604
}
1605
1605
1606
- static int intel_dp_source_dsc_version_minor (struct intel_dp * intel_dp )
1606
+ static int intel_dp_source_dsc_version_minor (struct drm_i915_private * i915 )
1607
1607
{
1608
- struct drm_i915_private * i915 = dp_to_i915 (intel_dp );
1609
-
1610
1608
return DISPLAY_VER (i915 ) >= 14 ? 2 : 1 ;
1611
1609
}
1612
1610
@@ -1666,7 +1664,7 @@ static int intel_dp_dsc_compute_params(struct intel_encoder *encoder,
1666
1664
(intel_dp -> dsc_dpcd [DP_DSC_REV - DP_DSC_SUPPORT ] &
1667
1665
DP_DSC_MAJOR_MASK ) >> DP_DSC_MAJOR_SHIFT ;
1668
1666
vdsc_cfg -> dsc_version_minor =
1669
- min (intel_dp_source_dsc_version_minor (intel_dp ),
1667
+ min (intel_dp_source_dsc_version_minor (i915 ),
1670
1668
intel_dp_sink_dsc_version_minor (intel_dp ));
1671
1669
if (vdsc_cfg -> convert_rgb )
1672
1670
vdsc_cfg -> convert_rgb =
@@ -1697,6 +1695,7 @@ static int intel_dp_dsc_compute_params(struct intel_encoder *encoder,
1697
1695
static bool intel_dp_dsc_supports_format (struct intel_dp * intel_dp ,
1698
1696
enum intel_output_format output_format )
1699
1697
{
1698
+ struct drm_i915_private * i915 = dp_to_i915 (intel_dp );
1700
1699
u8 sink_dsc_format ;
1701
1700
1702
1701
switch (output_format ) {
@@ -1707,7 +1706,7 @@ static bool intel_dp_dsc_supports_format(struct intel_dp *intel_dp,
1707
1706
sink_dsc_format = DP_DSC_YCbCr444 ;
1708
1707
break ;
1709
1708
case INTEL_OUTPUT_FORMAT_YCBCR420 :
1710
- if (min (intel_dp_source_dsc_version_minor (intel_dp ),
1709
+ if (min (intel_dp_source_dsc_version_minor (i915 ),
1711
1710
intel_dp_sink_dsc_version_minor (intel_dp )) < 2 )
1712
1711
return false;
1713
1712
sink_dsc_format = DP_DSC_YCbCr420_Native ;
0 commit comments