Commit b2e3a1af authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Tvrtko Ursulin
Browse files

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



Take the DG2 CCS+CC modifier into account when calculating the
watermarks. Othwerwise we'll calculate the watermarks thinking this
tile-4 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: 680025dc ("drm/i915/dg2: Add support for DG2 clear color compression")
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-6-ville.syrjala@linux.intel.com


(cherry picked from commit 334810f8)
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
parent ccfa6d35

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

+4 −2
Original line number Diff line number Diff line
@@ -1715,7 +1715,8 @@ skl_compute_wm_params(const struct intel_crtc_state *crtc_state, 
		      modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||

		      modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||

		      modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||

		      modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS;

		      modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS ||

		      modifier == I915_FORMAT_MOD_4_TILED_DG2_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 ||
@@ -1723,7 +1724,8 @@ skl_compute_wm_params(const struct intel_crtc_state *crtc_state, 
			 modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||

			 modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||

			 modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||

			 modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS;

			 modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS ||

			 modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC;

	wp->is_planar = intel_format_info_is_yuv_semiplanar(format, modifier);



	wp->width = width;