Re: [Intel-gfx] [PATCH 1/4] drm/i915/mtl: Drop FLAT CCS check

2023-05-05 Thread Andi Shyti 
Hi JP,

On Thu, May 04, 2023 at 01:28:02PM +0300, Juha-Pekka Heikkila wrote:
> From: Pallavi Mishra 
> 
> Remove FLAT CCS check from XY_FAST_COLOR_BLT usage, thus
> enabling MTL to use it.
> 
> Signed-off-by: Pallavi Mishra 
> Signed-off-by: Juha-Pekka Heikkila 

Reviewed-by: Andi Shyti  

Thanks,
Andi

Re: [Intel-gfx] [PATCH 1/4] drm/i915/mtl: Drop FLAT CCS check

2023-05-04 Thread Andrzej Hajda 

On 04.05.2023 12:28, Juha-Pekka Heikkila wrote:

From: Pallavi Mishra 

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

Signed-off-by: Pallavi Mishra 
Signed-off-by: Juha-Pekka Heikkila 


Reviewed-by: Andrzej Hajda 

Regards
Andrzej


---
  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) |

Re: [Intel-gfx] [PATCH 1/4] drm/i915/mtl: Drop FLAT CCS check

2023-05-04 Thread Das, Nirmoy 



On 5/4/2023 12:28 PM, Juha-Pekka Heikkila wrote:

From: Pallavi Mishra 

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

Signed-off-by: Pallavi Mishra 
Signed-off-by: Juha-Pekka Heikkila 


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 


---
  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) |

[Intel-gfx] [PATCH 1/4] drm/i915/mtl: Drop FLAT CCS check

2023-05-04 Thread Juha-Pekka Heikkila 
From: Pallavi Mishra 

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

Signed-off-by: Pallavi Mishra 
Signed-off-by: Juha-Pekka Heikkila 
---
 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) |
-- 
2.25.1