[igt-dev] [PATCH i-g-t] lib/rendercopy: Assert that buffer dimensions/stride are acceptable

* [igt-dev] [PATCH i-g-t] lib/rendercopy: Assert that buffer dimensions/stride are acceptable
@ 2019-04-03 15:41 Ville Syrjala
  2019-04-03 16:35 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Ville Syrjala @ 2019-04-03 15:41 UTC (permalink / raw)
  To: igt-dev

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Sprinkle some asserts into rendercopy to make sure we don't try
to exceed the render engine surface size/stride limitations.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 lib/rendercopy_gen4.c | 4 ++++
 lib/rendercopy_gen6.c | 4 ++++
 lib/rendercopy_gen7.c | 4 ++++
 lib/rendercopy_gen8.c | 4 ++++
 lib/rendercopy_gen9.c | 4 ++++
 lib/rendercopy_i830.c | 8 ++++++++
 lib/rendercopy_i915.c | 9 +++++++++
 7 files changed, 37 insertions(+)

diff --git a/lib/rendercopy_gen4.c b/lib/rendercopy_gen4.c
index 67460c04ec5d..9111508f3ec9 100644
--- a/lib/rendercopy_gen4.c
+++ b/lib/rendercopy_gen4.c
@@ -142,6 +142,10 @@ gen4_bind_buf(struct intel_batchbuffer *batch,
 	uint32_t write_domain, read_domain;
 	int ret;
 
+	igt_assert_lte(buf->stride, 128*1024);
+	igt_assert_lte(igt_buf_width(buf), 8192);
+	igt_assert_lte(igt_buf_height(buf), 8192);
+
 	if (is_dst) {
 		write_domain = read_domain = I915_GEM_DOMAIN_RENDER;
 	} else {
diff --git a/lib/rendercopy_gen6.c b/lib/rendercopy_gen6.c
index f4c0105a80db..a6157cfc70f6 100644
--- a/lib/rendercopy_gen6.c
+++ b/lib/rendercopy_gen6.c
@@ -79,6 +79,10 @@ gen6_bind_buf(struct intel_batchbuffer *batch, const struct igt_buf *buf,
 	uint32_t write_domain, read_domain;
 	int ret;
 
+	igt_assert_lte(buf->stride, 128*1024);
+	igt_assert_lte(igt_buf_width(buf), 8192);
+	igt_assert_lte(igt_buf_height(buf), 8192);
+
 	if (is_dst) {
 		write_domain = read_domain = I915_GEM_DOMAIN_RENDER;
 	} else {
diff --git a/lib/rendercopy_gen7.c b/lib/rendercopy_gen7.c
index a790217c6f9a..0a5d4a151e0d 100644
--- a/lib/rendercopy_gen7.c
+++ b/lib/rendercopy_gen7.c
@@ -65,6 +65,10 @@ gen7_bind_buf(struct intel_batchbuffer *batch,
 	uint32_t write_domain, read_domain;
 	int ret;
 
+	igt_assert_lte(buf->stride, 256*1024);
+	igt_assert_lte(igt_buf_width(buf), 16384);
+	igt_assert_lte(igt_buf_height(buf), 16384);
+
 	switch (buf->bpp) {
 		case 8: format = SURFACEFORMAT_R8_UNORM; break;
 		case 16: format = SURFACEFORMAT_R8G8_UNORM; break;
diff --git a/lib/rendercopy_gen8.c b/lib/rendercopy_gen8.c
index 1c61b00c7324..643b6630d4a3 100644
--- a/lib/rendercopy_gen8.c
+++ b/lib/rendercopy_gen8.c
@@ -150,6 +150,10 @@ gen8_bind_buf(struct intel_batchbuffer *batch,
 	uint32_t write_domain, read_domain, offset;
 	int ret;
 
+	igt_assert_lte(buf->stride, 256*1024);
+	igt_assert_lte(igt_buf_width(buf), 16384);
+	igt_assert_lte(igt_buf_height(buf), 16384);
+
 	if (is_dst) {
 		write_domain = read_domain = I915_GEM_DOMAIN_RENDER;
 	} else {
diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c
index 2cf1ab1656c3..93e9d150e717 100644
--- a/lib/rendercopy_gen9.c
+++ b/lib/rendercopy_gen9.c
@@ -180,6 +180,10 @@ gen8_bind_buf(struct intel_batchbuffer *batch, const struct igt_buf *buf,
 	uint32_t write_domain, read_domain, offset;
 	int ret;
 
+	igt_assert_lte(buf->stride, 256*1024);
+	igt_assert_lte(igt_buf_width(buf), 16384);
+	igt_assert_lte(igt_buf_height(buf), 16384);
+
 	if (is_dst) {
 		write_domain = read_domain = I915_GEM_DOMAIN_RENDER;
 	} else {
diff --git a/lib/rendercopy_i830.c b/lib/rendercopy_i830.c
index c19a6a382e5b..e8c04718eb89 100644
--- a/lib/rendercopy_i830.c
+++ b/lib/rendercopy_i830.c
@@ -138,6 +138,10 @@ static void gen2_emit_target(struct intel_batchbuffer *batch,
 	uint32_t tiling;
 	uint32_t format;
 
+	igt_assert_lte(dst->stride, 8192);
+	igt_assert_lte(igt_buf_width(dst), 2048);
+	igt_assert_lte(igt_buf_height(dst), 2048);
+
 	switch (dst->bpp) {
 		case 8: format = COLR_BUF_8BIT; break;
 		case 16: format = COLR_BUF_RGB565; break;
@@ -175,6 +179,10 @@ static void gen2_emit_texture(struct intel_batchbuffer *batch,
 	uint32_t tiling;
 	uint32_t format;
 
+	igt_assert_lte(src->stride, 8192);
+	igt_assert_lte(igt_buf_width(src), 2048);
+	igt_assert_lte(igt_buf_height(src), 2048);
+
 	switch (src->bpp) {
 		case 8: format = MAPSURF_8BIT | MT_8BIT_L8; break;
 		case 16: format = MAPSURF_16BIT | MT_16BIT_RGB565; break;
diff --git a/lib/rendercopy_i915.c b/lib/rendercopy_i915.c
index b28fa98d8069..1baa7a1b96b2 100644
--- a/lib/rendercopy_i915.c
+++ b/lib/rendercopy_i915.c
@@ -87,6 +87,11 @@ void gen3_render_copyfunc(struct intel_batchbuffer *batch,
 	{
 #define TEX_COUNT 1
 		uint32_t format_bits, tiling_bits = 0;
+
+		igt_assert_lte(src->stride, 8192);
+		igt_assert_lte(igt_buf_width(src), 2048);
+		igt_assert_lte(igt_buf_height(src), 2048);
+
 		if (src->tiling != I915_TILING_NONE)
 			tiling_bits = MS3_TILED_SURFACE;
 		if (src->tiling == I915_TILING_Y)
@@ -123,6 +128,10 @@ void gen3_render_copyfunc(struct intel_batchbuffer *batch,
 		uint32_t tiling_bits = 0;
 		uint32_t format_bits;
 
+		igt_assert_lte(dst->stride, 8192);
+		igt_assert_lte(igt_buf_width(dst), 2048);
+		igt_assert_lte(igt_buf_height(dst), 2048);
+
 		switch (dst->bpp) {
 			case 8: format_bits = COLR_BUF_8BIT; break;
 			case 16: format_bits = COLR_BUF_RGB565; break;
-- 
2.19.2

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 5+ messages in thread