On 5/4/2023 12:28 PM, Juha-Pekka Heikkila wrote:
From: Pallavi Mishra <pallavi.mis...@intel.com>

Remove FLAT CCS check from XY_FAST_COLOR_BLT usage, thus
enabling MTL to use it.

Signed-off-by: Pallavi Mishra <pallavi.mis...@intel.com>
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikk...@gmail.com>

I think should fix the mtl migrate selftest failure. https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/bat-mtlp-6/igt@i915_selftest@l...@migrate.html#dmesg-warnings745

Reviewed-by: Nirmoy Das <nirmoy....@intel.com>

---
  drivers/gpu/drm/i915/gt/intel_migrate.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_migrate.c 
b/drivers/gpu/drm/i915/gt/intel_migrate.c
index 3f638f198796..e0998879a0e1 100644
--- a/drivers/gpu/drm/i915/gt/intel_migrate.c
+++ b/drivers/gpu/drm/i915/gt/intel_migrate.c
@@ -920,7 +920,7 @@ static int emit_clear(struct i915_request *rq, u32 offset, 
int size,
GEM_BUG_ON(size >> PAGE_SHIFT > S16_MAX); - if (HAS_FLAT_CCS(i915) && ver >= 12)
+       if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50))
                ring_sz = XY_FAST_COLOR_BLT_DW;
        else if (ver >= 8)
                ring_sz = 8;
@@ -931,7 +931,7 @@ static int emit_clear(struct i915_request *rq, u32 offset, 
int size,
        if (IS_ERR(cs))
                return PTR_ERR(cs);
- if (HAS_FLAT_CCS(i915) && ver >= 12) {
+       if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) {
                *cs++ = XY_FAST_COLOR_BLT_CMD | XY_FAST_COLOR_BLT_DEPTH_32 |
                        (XY_FAST_COLOR_BLT_DW - 2);
                *cs++ = FIELD_PREP(XY_FAST_COLOR_BLT_MOCS_MASK, mocs) |

Reply via email to