5.15-stable patches

added patches:
	drm-i915-fix-watermark-calculations-for-gen12-ccs-cc-modifier.patch
	drm-i915-fix-watermark-calculations-for-gen12-mc-ccs-modifier.patch

diff --git a/queue-5.15/drm-i915-fix-watermark-calculations-for-gen12-ccs-cc-modifier.patch b/queue-5.15/drm-i915-fix-watermark-calculations-for-gen12-ccs-cc-modifier.patch
new file mode 100644 (file)
index 0000000..7153a04
--- /dev/null
+++ b/queue-5.15/drm-i915-fix-watermark-calculations-for-gen12-ccs-cc-modifier.patch
@@ -0,0 +1,50 @@
+From 070a2855900de17b1e11a0dc35af9794e80f1a28 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
+Date: Mon, 3 Oct 2022 14:15:41 +0300
+Subject: drm/i915: Fix watermark calculations for gen12+ CCS+CC modifier
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Ville Syrjälä <ville.syrjala@linux.intel.com>
+
+commit 070a2855900de17b1e11a0dc35af9794e80f1a28 upstream.
+
+Take the gen12+ CCS+CC modifier into account when calculating the
+watermarks. Othwerwise we'll calculate the watermarks thinking this
+Y-tiled modifier is linear.
+
+The rc_surface part is actually a nop since that is not used
+for any glk+ platform.
+
+Cc: stable@vger.kernel.org
+Fixes: d1e2775e9b96 ("drm/i915/tgl: Add Clear Color support for TGL Render Decompression")
+Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
+Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20221003111544.8007-4-ville.syrjala@linux.intel.com
+(cherry picked from commit a627455bbe50a111475d7a42beb58fa64bd96c83)
+Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/i915/intel_pm.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/i915/intel_pm.c
++++ b/drivers/gpu/drm/i915/intel_pm.c
+@@ -5404,12 +5404,14 @@ skl_compute_wm_params(const struct intel
+                     modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
+                     modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
+                     modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
+-                    modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS;
++                    modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
++                    modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC;
+       wp->x_tiled = modifier == I915_FORMAT_MOD_X_TILED;
+       wp->rc_surface = modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
+                        modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
+                        modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
+-                       modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS;
++                       modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
++                       modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC;
+       wp->is_planar = intel_format_info_is_yuv_semiplanar(format, modifier);
+ 
+       wp->width = width;

diff --git a/queue-5.15/drm-i915-fix-watermark-calculations-for-gen12-mc-ccs-modifier.patch b/queue-5.15/drm-i915-fix-watermark-calculations-for-gen12-mc-ccs-modifier.patch
new file mode 100644 (file)
index 0000000..0bd4940
--- /dev/null
+++ b/queue-5.15/drm-i915-fix-watermark-calculations-for-gen12-mc-ccs-modifier.patch
@@ -0,0 +1,51 @@
+From 484b2b9281000274ef7c5cb0a9ebc5da6f5c281c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
+Date: Mon, 3 Oct 2022 14:15:40 +0300
+Subject: drm/i915: Fix watermark calculations for gen12+ MC CCS modifier
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Ville Syrjälä <ville.syrjala@linux.intel.com>
+
+commit 484b2b9281000274ef7c5cb0a9ebc5da6f5c281c upstream.
+
+Take the gen12+ MC CCS modifier into account when calculating the
+watermarks. Othwerwise we'll calculate the watermarks thinking this
+Y-tiled modifier is linear.
+
+The rc_surface part is actually a nop since that is not used
+for any glk+ platform.
+
+v2: Split RC CCS vs. MC CCS to separate patches
+
+Cc: stable@vger.kernel.org
+Fixes: 2dfbf9d2873a ("drm/i915/tgl: Gen-12 display can decompress surfaces compressed by the media engine")
+Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
+Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20221003111544.8007-3-ville.syrjala@linux.intel.com
+(cherry picked from commit 91c9651425fe955b1387f3637607dda005f3f710)
+Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/i915/intel_pm.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/i915/intel_pm.c
++++ b/drivers/gpu/drm/i915/intel_pm.c
+@@ -5403,11 +5403,13 @@ skl_compute_wm_params(const struct intel
+                     modifier == I915_FORMAT_MOD_Yf_TILED ||
+                     modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
+                     modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
+-                    modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS;
++                    modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
++                    modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS;
+       wp->x_tiled = modifier == I915_FORMAT_MOD_X_TILED;
+       wp->rc_surface = modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
+                        modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
+-                       modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS;
++                       modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
++                       modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS;
+       wp->is_planar = intel_format_info_is_yuv_semiplanar(format, modifier);
+ 
+       wp->width = width;

diff --git a/queue-5.15/series b/queue-5.15/series
index 12e31a6dfdc0e880be873ffe19ee653cdb389ea9..63316f8772d0f10f518df1138249c79c8b32ad3f 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -128,3 +128,5 @@ staging-greybus-audio_helper-remove-unused-and-wrong-debugfs-usage.patch
 drm-nouveau-kms-nv140-disable-interlacing.patch
 drm-nouveau-fix-a-use-after-free-in-nouveau_gem_prime_import_sg_table.patch
 drm-i915-fix-watermark-calculations-for-gen12-rc-ccs-modifier.patch
+drm-i915-fix-watermark-calculations-for-gen12-mc-ccs-modifier.patch
+drm-i915-fix-watermark-calculations-for-gen12-ccs-cc-modifier.patch