projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 760133d)
drm/i915/mtl: Drop FLAT CCS check
authorPallavi Mishra <pallavi.mishra@intel.com>
Fri, 5 May 2023 14:40:04 +0000 (16:40 +0200)
committerNirmoy Das <nirmoy.das@intel.com>
Mon, 8 May 2023 07:23:58 +0000 (09:23 +0200)
Remove FLAT CCS check from XY_FAST_COLOR_BLT usage, thus
enabling MTL to use it.

Signed-off-by: Pallavi Mishra <pallavi.mishra@intel.com>
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>
Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230505144005.23480-1-nirmoy.das@intel.com
drivers/gpu/drm/i915/gt/intel_migrate.c patch | blob | history

diff --git a/drivers/gpu/drm/i915/gt/intel_migrate.c b/drivers/gpu/drm/i915/gt/intel_migrate.c
index 3f638f1..e099887 100644 (file)
--- 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) |
Domain: System / Kernel;