From: Greg Kroah-Hartman Date: Sun, 16 Oct 2022 16:29:07 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v5.4.219~78 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49a4ecf0ec81642f5c7c18b21a603722517d227f;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: drm-i915-fix-watermark-calculations-for-gen12-rc-ccs-modifier.patch --- diff --git a/queue-5.15/drm-i915-fix-watermark-calculations-for-gen12-rc-ccs-modifier.patch b/queue-5.15/drm-i915-fix-watermark-calculations-for-gen12-rc-ccs-modifier.patch new file mode 100644 index 00000000000..34e1e462003 --- /dev/null +++ b/queue-5.15/drm-i915-fix-watermark-calculations-for-gen12-rc-ccs-modifier.patch @@ -0,0 +1,50 @@ +From c56453a00f19ccddee302f5f9fe96b80e0b47fd3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= +Date: Mon, 3 Oct 2022 14:15:39 +0300 +Subject: drm/i915: Fix watermark calculations for gen12+ RC CCS modifier +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ville Syrjälä + +commit c56453a00f19ccddee302f5f9fe96b80e0b47fd3 upstream. + +Take the gen12+ RC 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: b3e57bccd68a ("drm/i915/tgl: Gen-12 render decompression") +Reviewed-by: Juha-Pekka Heikkila +Signed-off-by: Ville Syrjälä +Link: https://patchwork.freedesktop.org/patch/msgid/20221003111544.8007-2-ville.syrjala@linux.intel.com +(cherry picked from commit a89a96a586114f67598c6391c75678b4dba5c2da) +Signed-off-by: Tvrtko Ursulin +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -5402,10 +5402,12 @@ skl_compute_wm_params(const struct intel + wp->y_tiled = modifier == I915_FORMAT_MOD_Y_TILED || + modifier == I915_FORMAT_MOD_Yf_TILED || + modifier == I915_FORMAT_MOD_Y_TILED_CCS || +- modifier == I915_FORMAT_MOD_Yf_TILED_CCS; ++ modifier == I915_FORMAT_MOD_Yf_TILED_CCS || ++ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_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_Yf_TILED_CCS || ++ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_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 75ba8c5f95f..12e31a6dfdc 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -127,3 +127,4 @@ kvm-vmx-drop-bits-31-16-when-shoving-exception-error-code-into-vmcs.patch 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