lib/ioctl_wrappers: Query if device supports set/get legacy tiling

1/3

---
 lib/ioctl_wrappers.c | 17 +++++++++++++++++
 lib/ioctl_wrappers.h |  1 +
 2 files changed, 18 insertions(+)
index 627717d2..c1abb575 100644
@@ -133,6 +133,23 @@ __gem_get_tiling(int fd, struct drm_i915_gem_get_tiling *arg)
 	return err;
 }
 
+/**
+ * gem_has_legacy_hw_tiling:
+ * @fd: open i915 drm file descriptor
+ *
+ * Feature check to query if the device supports setting/getting
+ * legacy tiling formats for buffer objects
+ *
+ * Returns: True if tiling is supported
+ */
+bool
+gem_has_legacy_hw_tiling(int fd)
+{
+	struct drm_i915_gem_get_tiling arg = {};
+
+	return (__gem_get_tiling(fd, &arg) != -EOPNOTSUPP);
+}
+
 /**
  * gem_get_tiling:
  * @fd: open i915 drm file descriptor

index 7614e688..0ea77738 100644
@@ -146,6 +146,7 @@ void gem_require_caching(int fd);
 void gem_require_ring(int fd, unsigned ring);
 bool gem_has_mocs_registers(int fd);
 void gem_require_mocs_registers(int fd);
+bool gem_has_legacy_hw_tiling(int fd);
 
 #define gem_has_ring(f, r) gem_context_has_engine(f, 0, r)
 

2.23.1

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
 lib/igt_fb.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)
index c81b9de8..b5b1750e 100644
@@ -1975,17 +1975,27 @@ static bool blitter_ok(const struct igt_fb *fb)
 	return true;
 }
 
+static bool hw_can_detile(const struct igt_fb *fb)
+{
+	if (fb->modifier == DRM_FORMAT_MOD_NONE)
+		return true;
+
+	if (!gem_has_legacy_hw_tiling(fb->fd))
+		return false;
+
+	return fb->modifier != I915_FORMAT_MOD_Yf_TILED;
+}
+
 static bool use_enginecopy(const struct igt_fb *fb)
 {
 	return is_ccs_modifier(fb->modifier) ||
-		(fb->modifier == I915_FORMAT_MOD_Yf_TILED &&
-		 !blitter_ok(fb));
+		(!hw_can_detile(fb) && !blitter_ok(fb));
 }
 
 static bool use_blitter(const struct igt_fb *fb)
 {
 	return (fb->modifier == I915_FORMAT_MOD_Y_TILED ||
-		fb->modifier == I915_FORMAT_MOD_Yf_TILED) &&
+		!hw_can_detile(fb)) &&
 		blitter_ok(fb);
 }
 

2.23.1

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
  lib/igt_fb.c | 16 +++++++++++++---
  1 file changed, 13 insertions(+), 3 deletions(-)
index c81b9de8..b5b1750e 100644
@@ -1975,17 +1975,27 @@ static bool blitter_ok(const struct igt_fb *fb)
  	return true;
  }

 
+static bool hw_can_detile(const struct igt_fb *fb)
+{
+	if (fb->modifier == DRM_FORMAT_MOD_NONE)
+		return true;
+
+	if (!gem_has_legacy_hw_tiling(fb->fd))
+		return false;
+
+	return fb->modifier != I915_FORMAT_MOD_Yf_TILED;

+}
+
  static bool use_enginecopy(const struct igt_fb *fb)
  {
  	return is_ccs_modifier(fb->modifier) ||
-		(fb->modifier == I915_FORMAT_MOD_Yf_TILED &&
-		 !blitter_ok(fb));
+		(!hw_can_detile(fb) && !blitter_ok(fb));

  }
 
  static bool use_blitter(const struct igt_fb *fb)
  {
  	return (fb->modifier == I915_FORMAT_MOD_Y_TILED ||
-		fb->modifier == I915_FORMAT_MOD_Yf_TILED) &&
+		!hw_can_detile(fb)) &&
  		blitter_ok(fb);
  }
 

---
  lib/igt_fb.c | 16 +++++++++++++---
  1 file changed, 13 insertions(+), 3 deletions(-)
index c81b9de8..b5b1750e 100644
@@ -1975,17 +1975,27 @@ static bool blitter_ok(const struct igt_fb *fb)
  	return true;
  }
+static bool hw_can_detile(const struct igt_fb *fb)
+{
+	if (fb->modifier == DRM_FORMAT_MOD_NONE)
+		return true;

+
+	if (!gem_has_legacy_hw_tiling(fb->fd))
+		return false;
+
+	return fb->modifier != I915_FORMAT_MOD_Yf_TILED;

+}
+
  static bool use_enginecopy(const struct igt_fb *fb)
  {
  	return is_ccs_modifier(fb->modifier) ||
-		(fb->modifier == I915_FORMAT_MOD_Yf_TILED &&
-		 !blitter_ok(fb));
+		(!hw_can_detile(fb) && !blitter_ok(fb));
  }

  static bool use_blitter(const struct igt_fb *fb)
  {
  	return (fb->modifier == I915_FORMAT_MOD_Y_TILED ||
-		fb->modifier == I915_FORMAT_MOD_Yf_TILED) &&
+		!hw_can_detile(fb)) &&
  		blitter_ok(fb);
  }
 

---
   lib/igt_fb.c | 16 +++++++++++++---
   1 file changed, 13 insertions(+), 3 deletions(-)
index c81b9de8..b5b1750e 100644
@@ -1975,17 +1975,27 @@ static bool blitter_ok(const struct igt_fb *fb)
   	return true;
   }
+static bool hw_can_detile(const struct igt_fb *fb)
+{
+	if (fb->modifier == DRM_FORMAT_MOD_NONE)
+		return true;

+
+	if (!gem_has_legacy_hw_tiling(fb->fd))
+		return false;
+
+	return fb->modifier != I915_FORMAT_MOD_Yf_TILED;

+}
+
   static bool use_enginecopy(const struct igt_fb *fb)
   {
   	return is_ccs_modifier(fb->modifier) ||
-		(fb->modifier == I915_FORMAT_MOD_Yf_TILED &&
-		 !blitter_ok(fb));
+		(!hw_can_detile(fb) && !blitter_ok(fb));
   }
   static bool use_blitter(const struct igt_fb *fb)

   {
   	return (fb->modifier == I915_FORMAT_MOD_Y_TILED ||
-		fb->modifier == I915_FORMAT_MOD_Yf_TILED) &&
+		!hw_can_detile(fb)) &&
   		blitter_ok(fb);
   }
 

---
 lib/igt_fb.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)
index c81b9de8..b5b1750e 100644

@@ -1975,17 +1975,27 @@ static bool blitter_ok(const struct igt_fb *fb)
 	return true;
 }
 
+static bool hw_can_detile(const struct igt_fb *fb)
+{
+	if (fb->modifier == DRM_FORMAT_MOD_NONE)
+		return true;

---
 lib/igt_fb.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)
index c81b9de8..b5b1750e 100644
@@ -1975,17 +1975,27 @@ static bool blitter_ok(const struct igt_fb *fb)
 	return true;
 }
 

+static bool hw_can_detile(const struct igt_fb *fb)
+{
+	if (fb->modifier == DRM_FORMAT_MOD_NONE)
+		return true;

---
 lib/igt_fb.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
index b5b1750e..ccb76455 100644
@@ -944,9 +944,10 @@ static int create_bo_for_fb(struct igt_fb *fb)
 
 		if (is_i915_device(fd)) {
 			fb->gem_handle = gem_create(fd, fb->size);
-			gem_set_tiling(fd, fb->gem_handle,
-				       igt_fb_mod_to_tiling(fb->modifier),
-				       fb->strides[0]);
+			if (gem_has_legacy_hw_tiling(fd))
+				gem_set_tiling(fd, fb->gem_handle,
+					       igt_fb_mod_to_tiling(fb->modifier),
+					       fb->strides[0]);
 		} else if (is_vc4_device(fd)) {
 			fb->gem_handle = igt_vc4_create_bo(fd, fb->size);
 

2.23.1

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
---
  lib/igt_fb.c | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
index b5b1750e..ccb76455 100644

@@ -944,9 +944,10 @@ static int create_bo_for_fb(struct igt_fb *fb)
 
  		if (is_i915_device(fd)) {
  			fb->gem_handle = gem_create(fd, fb->size);
-			gem_set_tiling(fd, fb->gem_handle,
-				       igt_fb_mod_to_tiling(fb->modifier),
-				       fb->strides[0]);
+			if (gem_has_legacy_hw_tiling(fd))
+				gem_set_tiling(fd, fb->gem_handle,
+					       igt_fb_mod_to_tiling(fb->modifier),
+					       fb->strides[0]);

  		} else if (is_vc4_device(fd)) {
  			fb->gem_handle = igt_vc4_create_bo(fd, fb->size);
 


lib/ioctl_wrappers: Query if device supports set/get legacy tiling

Imre Deak

Imre Deak

Juha-Pekka Heikkila

Imre Deak

Juha-Pekka Heikkila

Dixit, Ashutosh

Imre Deak

Imre Deak

Juha-Pekka Heikkila

Patchwork

Patchwork