Commit a627455b authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Fix watermark calculations for gen12+ CCS+CC modifier 



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: d1e2775e ("drm/i915/tgl: Add Clear Color support for TGL Render Decompression")
Reviewed-by: default avatarJuha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221003111544.8007-4-ville.syrjala@linux.intel.com
parent 91c96514

drivers/gpu/drm/i915/display/skl_watermark.c

+4 −2
Original line number Diff line number Diff line
@@ -1712,12 +1712,14 @@ skl_compute_wm_params(const struct intel_crtc_state *crtc_state, 
		      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;