lib/igt_buf: Extend igt_buf to include two color surfaces

UV FBs have two color surfaces so extend the igt_buf struct accordingly
to support blitting such FBs.

The patch is produced with the coccinelle patch below.

No functional changes.

@@
@@

struct igt_buf {
	...
-	uint32_t stride;
	...
-	uint32_t size;
+	struct {
+		uint32_t stride;
+		uint32_t size;
+	} surface[2];
	...
};

@@
struct igt_buf b;
@@

<...
(
- b.stride
+ b.surface[0].stride
|
- b.size
+ b.surface[0].size
)
...>

@@
struct igt_buf *b;
@@

<...
(
- b->size
+ b->surface[0].size
|
- b->stride
+ b->surface[0].stride
)
...>

@@
identifier I;
expression E1;
expression E2;
@@

(
struct igt_buf I = {
-	.size = E1,
-	.stride = E2,
+	.surface[0] = {
+		.size = E1,
+		.stride = E2,
+	},
};
|
struct igt_buf I = {
-	.size = E1,
+	.surface[0] = {
+		.size = E1,
+	},
};
|
struct igt_buf I = {
-	.stride = E1,
+	.surface[0] = {
+		.stride = E1,
+	},
};
)

v2:
- Rebase on latest upstream. (Mika)

Cc: Mika Kahola <mika.kahola@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Mika Kahola <mika.kahola@intel.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/tests/i915/i915_pm_sseu.c b/tests/i915/i915_pm_sseu.c
index e671e190..c2dee118 100644
--- a/tests/i915/i915_pm_sseu.c
+++ b/tests/i915/i915_pm_sseu.c
@@ -299,10 +299,11 @@ gem_init(void)
 	igt_assert(gem.batch);
 	gem.init = 3;
 
-	gem.buf.stride = sizeof(uint32_t);
+	gem.buf.surface[0].stride = sizeof(uint32_t);
 	gem.buf.tiling = I915_TILING_NONE;
-	gem.buf.size = gem.buf.stride;
-	gem.buf.bo = drm_intel_bo_alloc(gem.bufmgr, "", gem.buf.size, 4096);
+	gem.buf.surface[0].size = gem.buf.surface[0].stride;
+	gem.buf.bo = drm_intel_bo_alloc(gem.bufmgr, "",
+					gem.buf.surface[0].size, 4096);
 	gem.buf.bpp = 32;
 	igt_assert(gem.buf.bo);
 	gem.init = 4;