drm/dsc: fix drm_edp_dsc_sink_output_bpp() DPCD high byte usage

From Jani Nikula
98643c9910575bd3a63ac8c587565cc7f3fc329b in linux-6.1.y/6.1.29
13525645e2246ebc8a21bd656248d86022a6ee8f in mainline linux

diff --git a/sys/dev/pci/drm/include/drm/display/drm_dp.h b/sys/dev/pci/drm/include/drm/display/drm_dp.h
index 9bc22a0..50428ba 100644 (file)
--- a/sys/dev/pci/drm/include/drm/display/drm_dp.h
+++ b/sys/dev/pci/drm/include/drm/display/drm_dp.h
@@ -286,7 +286,6 @@
 
 #define DP_DSC_MAX_BITS_PER_PIXEL_HI        0x068   /* eDP 1.4 */
 # define DP_DSC_MAX_BITS_PER_PIXEL_HI_MASK  (0x3 << 0)
-# define DP_DSC_MAX_BITS_PER_PIXEL_HI_SHIFT 8
 # define DP_DSC_MAX_BPP_DELTA_VERSION_MASK  0x06
 # define DP_DSC_MAX_BPP_DELTA_AVAILABILITY  0x08
 

diff --git a/sys/dev/pci/drm/include/drm/display/drm_dp_helper.h b/sys/dev/pci/drm/include/drm/display/drm_dp_helper.h
index f4001df..1d7b85b 100644 (file)
--- a/sys/dev/pci/drm/include/drm/display/drm_dp_helper.h
+++ b/sys/dev/pci/drm/include/drm/display/drm_dp_helper.h
@@ -181,9 +181,8 @@ static inline u16
 drm_edp_dsc_sink_output_bpp(const u8 dsc_dpcd[DP_DSC_RECEIVER_CAP_SIZE])
 {
        return dsc_dpcd[DP_DSC_MAX_BITS_PER_PIXEL_LOW - DP_DSC_SUPPORT] |
-               (dsc_dpcd[DP_DSC_MAX_BITS_PER_PIXEL_HI - DP_DSC_SUPPORT] &
-                DP_DSC_MAX_BITS_PER_PIXEL_HI_MASK <<
-                DP_DSC_MAX_BITS_PER_PIXEL_HI_SHIFT);
+               ((dsc_dpcd[DP_DSC_MAX_BITS_PER_PIXEL_HI - DP_DSC_SUPPORT] &
+                 DP_DSC_MAX_BITS_PER_PIXEL_HI_MASK) << 8);
 }
 
 static inline u32