Merge tag 'v5.9-rc4' into drm-next

[mirror_ubuntu-hirsute-kernel.git] / drivers / gpu / drm / i915 / display / intel_sprite.c

diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
index c89f5f7ccb06ea56cdf998ee58b04e915646ccc6..6b72223981becf2ef02f2decd49c2b090def9a6c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -2843,8 +2843,9 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane,
 static bool gen12_plane_supports_mc_ccs(struct drm_i915_private *dev_priv,
                                        enum plane_id plane_id)
 {
-       /* Wa_14010477008:tgl[a0..c0] */
-       if (IS_TGL_REVID(dev_priv, TGL_REVID_A0, TGL_REVID_C0))
+       /* Wa_14010477008:tgl[a0..c0],rkl[all] */
+       if (IS_ROCKETLAKE(dev_priv) ||
+           IS_TGL_REVID(dev_priv, TGL_REVID_A0, TGL_REVID_C0))
                return false;
 
        return plane_id < PLANE_SPRITE4;