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, 2 insertions, 2 deletions

diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c
index 630b9be7..f105e295 100644
--- a/tests/kms_cursor_crc.c
+++ b/tests/kms_cursor_crc.c
@@ -385,9 +385,9 @@ static void cleanup_crtc(data_t *data)
 static void scratch_buf_init(data_t *data, int buffer)
 {
 	data->igtbo[buffer].bo = data->drmibo[buffer];
-	data->igtbo[buffer].stride = data->primary_fb[buffer].strides[0];
+	data->igtbo[buffer].surface[0].stride = data->primary_fb[buffer].strides[0];
 	data->igtbo[buffer].tiling = data->primary_fb[buffer].modifier;
-	data->igtbo[buffer].size = data->primary_fb[buffer].size;
+	data->igtbo[buffer].surface[0].size = data->primary_fb[buffer].size;
 	data->igtbo[buffer].bpp = data->primary_fb[buffer].plane_bpp[0];
 }