diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-06-13 04:07:56 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-06-13 04:07:56 +0000 |
| commit | 9a65413e492c9033d53c0376b5aeaeab43574684 (patch) | |
| tree | 4aa867d39a5cc7558696417f8e5f06196df9deef /sys | |
| parent | 225d45edf03f725943b2b8325360522f73e100cd (diff) | |
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
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/drm/include/drm/display/drm_dp.h | 1 | ||||
| -rw-r--r-- | sys/dev/pci/drm/include/drm/display/drm_dp_helper.h | 5 |
2 files changed, 2 insertions, 4 deletions
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 9bc22a02874..50428ba92ce 100644 --- 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 f4001df49a3..1d7b85b80cf 100644 --- 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 |