diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-05-12 05:32:36 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-05-12 05:32:36 +1000 |
| commit | dc49c3b1d463a99fb529d2a69cc0e2270d6cb27e (patch) | |
| tree | eb8fcf729b3e449446439458204545ead8de374c /include/drm/display/drm_dp_helper.h | |
| parent | ac9a78681b921877518763ba0e89202254349d1b (diff) | |
| parent | 2da5bffe9eaa5819a868e8eaaa11b3fd0f16a691 (diff) | |
Merge tag 'drm-misc-fixes-2023-05-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
drm-misc-fixes for v6.4-rc2:
- More DSC macro fixes.
- Small mipi-dsi fix.
- Scheduler timeout handling fix.
---
drm-misc-fixes for v6.4-rc1:
- Fix DSC macros.
- Fix VESA format for simplefb.
- Prohibit potential out-of-bounds access in generic fbdev emulation.
- Improve AST2500+ compat on ARM.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/b34135e3-2651-4e0a-a776-9b047882b1b2@linux.intel.com
Diffstat (limited to 'include/drm/display/drm_dp_helper.h')
| -rw-r--r-- | include/drm/display/drm_dp_helper.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/drm/display/drm_dp_helper.h b/include/drm/display/drm_dp_helper.h index 533d3ee7fe05..86f24a759268 100644 --- a/include/drm/display/drm_dp_helper.h +++ b/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 |