6.1-stable patches

added patches:
	drm-dsc-fix-dp_dsc_max_bpp_delta_-macro-values.patch

diff --git a/queue-6.1/drm-dsc-fix-dp_dsc_max_bpp_delta_-macro-values.patch b/queue-6.1/drm-dsc-fix-dp_dsc_max_bpp_delta_-macro-values.patch
new file mode 100644 (file)
index 0000000..148bda7
--- /dev/null
+++ b/queue-6.1/drm-dsc-fix-dp_dsc_max_bpp_delta_-macro-values.patch
@@ -0,0 +1,35 @@
+From 0d68683838f2850dd8ff31f1121e05bfb7a2def0 Mon Sep 17 00:00:00 2001
+From: Jani Nikula <jani.nikula@intel.com>
+Date: Thu, 6 Apr 2023 16:46:15 +0300
+Subject: drm/dsc: fix DP_DSC_MAX_BPP_DELTA_* macro values
+
+From: Jani Nikula <jani.nikula@intel.com>
+
+commit 0d68683838f2850dd8ff31f1121e05bfb7a2def0 upstream.
+
+The macro values just don't match the specs. Fix them.
+
+Fixes: 1482ec00be4a ("drm: Add missing DP DSC extended capability definitions.")
+Cc: Vinod Govindapillai <vinod.govindapillai@intel.com>
+Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
+Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20230406134615.1422509-2-jani.nikula@intel.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/drm/display/drm_dp.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/include/drm/display/drm_dp.h
++++ b/include/drm/display/drm_dp.h
+@@ -286,8 +286,8 @@
+ 
+ #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_BPP_DELTA_VERSION_MASK  0x06
+-# define DP_DSC_MAX_BPP_DELTA_AVAILABILITY  0x08
++# define DP_DSC_MAX_BPP_DELTA_VERSION_MASK  (0x3 << 5)        /* eDP 1.5 & DP 2.0 */
++# define DP_DSC_MAX_BPP_DELTA_AVAILABILITY  (1 << 7)  /* eDP 1.5 & DP 2.0 */
+ 
+ #define DP_DSC_DEC_COLOR_FORMAT_CAP         0x069
+ # define DP_DSC_RGB                         (1 << 0)

diff --git a/queue-6.1/series b/queue-6.1/series
index d5c5e92aeb6e17debcda03f0b7435d7c3943da1b..6cc452c0e70a37f158606fb401a50b8f62be4197 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -229,3 +229,4 @@ ext4-bail-out-of-ext4_xattr_ibody_get-fails-for-any-reason.patch
 ext4-fix-lockdep-warning-when-enabling-mmp.patch
 ext4-remove-a-bug_on-in-ext4_mb_release_group_pa.patch
 ext4-fix-invalid-free-tracking-in-ext4_xattr_move_to_block.patch
+drm-dsc-fix-dp_dsc_max_bpp_delta_-macro-values.patch