* [PATCH 01/16] lib: Change the fb creation functions to take fully qualified tiling formats
2014-08-21 13:59 [PATCH i-g-t 00/16] Use a tiling format in fb creation functions Damien Lespiau
@ 2014-08-21 13:59 ` Damien Lespiau
2014-08-21 13:59 ` [PATCH 02/16] kms_cursor_crc: Use I915_TILING_NONE to create fbs Damien Lespiau
` (14 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Damien Lespiau @ 2014-08-21 13:59 UTC (permalink / raw)
To: intel-gfx
In the future, we'll need more than X tiling here. So give a full enum
instead of bool meaning X-tiled.
It's fine to do this change without updating the users just yet as
'true' happens to be I915_TILING_X.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
lib/igt_fb.c | 37 +++++++++++++++++++------------------
lib/igt_fb.h | 17 ++++++++++-------
2 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index d07af0d..30b8593 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -75,15 +75,15 @@ static struct format_desc_struct {
/* helpers to create nice-looking framebuffers */
static int create_bo_for_fb(int fd, int width, int height, int bpp,
- bool tiled, uint32_t *gem_handle_ret,
- unsigned *size_ret, unsigned *stride_ret,
- unsigned bo_size)
+ unsigned int tiling, uint32_t *gem_handle_ret,
+ unsigned *size_ret, unsigned *stride_ret, unsigned
+ bo_size)
{
uint32_t gem_handle;
int size, ret = 0;
unsigned stride;
- if (tiled) {
+ if (tiling) {
int v;
/* Round the tiling up to the next power-of-two and the
@@ -111,8 +111,8 @@ static int create_bo_for_fb(int fd, int width, int height, int bpp,
bo_size = size;
gem_handle = gem_create(fd, bo_size);
- if (tiled)
- ret = __gem_set_tiling(fd, gem_handle, I915_TILING_X, stride);
+ if (tiling)
+ ret = __gem_set_tiling(fd, gem_handle, tiling, stride);
*stride_ret = stride;
*size_ret = size;
@@ -384,7 +384,7 @@ void igt_paint_image(cairo_t *cr, const char *filename,
* @width: width of the framebuffer in pixel
* @height: height of the framebuffer in pixel
* @format: drm fourcc pixel format code
- * @tiled: X-tiled or linear framebuffer
+ * @tiling: tiling layout of the framebuffer
* @fb: pointer to an #igt_fb structure
* @bo_size: size of the backing bo (0 for minimum needed size)
*
@@ -399,9 +399,10 @@ void igt_paint_image(cairo_t *cr, const char *filename,
* The kms id of the created framebuffer on success or a negative error code on
* failure.
*/
-unsigned int igt_create_fb_with_bo_size(int fd, int width, int height,
- uint32_t format, bool tiled,
- struct igt_fb *fb, unsigned bo_size)
+unsigned int
+igt_create_fb_with_bo_size(int fd, int width, int height,
+ uint32_t format, unsigned int tiling,
+ struct igt_fb *fb, unsigned bo_size)
{
uint32_t handles[4];
uint32_t pitches[4];
@@ -413,7 +414,7 @@ unsigned int igt_create_fb_with_bo_size(int fd, int width, int height,
memset(fb, 0, sizeof(*fb));
bpp = igt_drm_format_to_bpp(format);
- ret = create_bo_for_fb(fd, width, height, bpp, tiled, &fb->gem_handle,
+ ret = create_bo_for_fb(fd, width, height, bpp, tiling, &fb->gem_handle,
&fb->size, &fb->stride, bo_size);
if (ret < 0)
return ret;
@@ -432,7 +433,7 @@ unsigned int igt_create_fb_with_bo_size(int fd, int width, int height,
fb->width = width;
fb->height = height;
- fb->tiling = tiled;
+ fb->tiling = tiling;
fb->drm_format = format;
fb->fb_id = fb_id;
@@ -445,7 +446,7 @@ unsigned int igt_create_fb_with_bo_size(int fd, int width, int height,
* @width: width of the framebuffer in pixel
* @height: height of the framebuffer in pixel
* @format: drm fourcc pixel format code
- * @tiled: X-tiled or linear framebuffer
+ * @tiling: tiling layout of the framebuffer
* @fb: pointer to an #igt_fb structure
*
* This function allocates a gem buffer object suitable to back a framebuffer
@@ -460,9 +461,9 @@ unsigned int igt_create_fb_with_bo_size(int fd, int width, int height,
* failure.
*/
unsigned int igt_create_fb(int fd, int width, int height, uint32_t format,
- bool tiled, struct igt_fb *fb)
+ unsigned int tiling, struct igt_fb *fb)
{
- return igt_create_fb_with_bo_size(fd, width, height, format, tiled, fb, 0);
+ return igt_create_fb_with_bo_size(fd, width, height, format, tiling, fb, 0);
}
/**
@@ -471,7 +472,7 @@ unsigned int igt_create_fb(int fd, int width, int height, uint32_t format,
* @width: width of the framebuffer in pixel
* @height: height of the framebuffer in pixel
* @format: drm fourcc pixel format code
- * @tiled: X-tiled or linear framebuffer
+ * @tiling: tiling layout of the framebuffer
* @r: red value to use as fill color
* @g: gree value to use as fill color
* @b: blue value to use as fill color
@@ -489,14 +490,14 @@ unsigned int igt_create_fb(int fd, int width, int height, uint32_t format,
* failure.
*/
unsigned int igt_create_color_fb(int fd, int width, int height,
- uint32_t format, bool tiled,
+ uint32_t format, unsigned int tiling,
double r, double g, double b,
struct igt_fb *fb /* out */)
{
unsigned int fb_id;
cairo_t *cr;
- fb_id = igt_create_fb(fd, width, height, format, tiled, fb);
+ fb_id = igt_create_fb(fd, width, height, format, tiling, fb);
igt_assert(fb_id);
cr = igt_get_cairo_ctx(fd, fb);
diff --git a/lib/igt_fb.h b/lib/igt_fb.h
index f5110d4..4295df9 100644
--- a/lib/igt_fb.h
+++ b/lib/igt_fb.h
@@ -41,6 +41,8 @@ typedef struct _cairo cairo_t;
#include <drm_fourcc.h>
#include <xf86drmMode.h>
+#include <i915_drm.h>
+
/* helpers to create nice-looking framebuffers */
struct igt_fb {
uint32_t fb_id;
@@ -63,15 +65,16 @@ enum igt_text_align {
align_hcenter = 0x08,
};
-unsigned int igt_create_fb_with_bo_size(int fd, int width, int height,
- uint32_t format, bool tiled,
- struct igt_fb *fb, unsigned bo_size);
+unsigned int
+igt_create_fb_with_bo_size(int fd, int width, int height,
+ uint32_t format, unsigned int tiling,
+ struct igt_fb *fb, unsigned bo_size);
unsigned int igt_create_fb(int fd, int width, int height, uint32_t format,
- bool tiled, struct igt_fb *fb);
+ unsigned int , struct igt_fb *fb);
unsigned int igt_create_color_fb(int fd, int width, int height,
- uint32_t format, bool tiled,
- double r, double g, double b,
- struct igt_fb *fb /* out */);
+ uint32_t format, unsigned int tiling,
+ double r, double g, double b,
+ struct igt_fb *fb /* out */);
void igt_remove_fb(int fd, struct igt_fb *fb);
/* cairo-based painting */
--
1.8.3.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 02/16] kms_cursor_crc: Use I915_TILING_NONE to create fbs
2014-08-21 13:59 [PATCH i-g-t 00/16] Use a tiling format in fb creation functions Damien Lespiau
2014-08-21 13:59 ` [PATCH 01/16] lib: Change the fb creation functions to take fully qualified tiling formats Damien Lespiau
@ 2014-08-21 13:59 ` Damien Lespiau
2014-08-21 13:59 ` [PATCH 03/16] kms_fbc_crc: Use I915_TILING_X " Damien Lespiau
` (13 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Damien Lespiau @ 2014-08-21 13:59 UTC (permalink / raw)
To: intel-gfx
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
tests/kms_cursor_crc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c
index 6af30fd..47531f3 100644
--- a/tests/kms_cursor_crc.c
+++ b/tests/kms_cursor_crc.c
@@ -235,7 +235,7 @@ static bool prepare_crtc(data_t *data, igt_output_t *output,
mode = igt_output_get_mode(output);
igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
DRM_FORMAT_XRGB8888,
- false, /* tiled */
+ I915_TILING_NONE,
0.0, 0.0, 0.0,
&data->primary_fb);
@@ -337,7 +337,7 @@ static void create_cursor_fb(data_t *data, int cur_w, int cur_h)
uint32_t fb_id;
fb_id = igt_create_fb(data->drm_fd, cur_w, cur_h,
- DRM_FORMAT_ARGB8888, false,
+ DRM_FORMAT_ARGB8888, I915_TILING_NONE,
&data->fb);
igt_assert(fb_id);
@@ -360,7 +360,7 @@ static void test_cursor_size(data_t *data)
* smaller ones to see that the size is applied correctly
*/
fb_id = igt_create_fb(data->drm_fd, cursor_max_size, cursor_max_size,
- DRM_FORMAT_ARGB8888, false, &data->fb);
+ DRM_FORMAT_ARGB8888, I915_TILING_NONE, &data->fb);
igt_assert(fb_id);
/* Use a solid white rectangle as the cursor */
--
1.8.3.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 03/16] kms_fbc_crc: Use I915_TILING_X to create fbs
2014-08-21 13:59 [PATCH i-g-t 00/16] Use a tiling format in fb creation functions Damien Lespiau
2014-08-21 13:59 ` [PATCH 01/16] lib: Change the fb creation functions to take fully qualified tiling formats Damien Lespiau
2014-08-21 13:59 ` [PATCH 02/16] kms_cursor_crc: Use I915_TILING_NONE to create fbs Damien Lespiau
@ 2014-08-21 13:59 ` Damien Lespiau
2014-08-21 13:59 ` [PATCH 04/16] kms_fence_pin_leak: " Damien Lespiau
` (12 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Damien Lespiau @ 2014-08-21 13:59 UTC (permalink / raw)
To: intel-gfx
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
tests/kms_fbc_crc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/kms_fbc_crc.c b/tests/kms_fbc_crc.c
index 9aeffd0..5ab048f 100644
--- a/tests/kms_fbc_crc.c
+++ b/tests/kms_fbc_crc.c
@@ -307,12 +307,12 @@ static bool prepare_test(data_t *data, enum test_mode test_mode)
data->fb_id[0] = igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
DRM_FORMAT_XRGB8888,
- true, /* tiled */
+ I915_TILING_X,
0.0, 0.0, 0.0, &data->fb[0]);
igt_assert(data->fb_id[0]);
data->fb_id[1] = igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
DRM_FORMAT_XRGB8888,
- true, /* tiled */
+ I915_TILING_X,
0.1, 0.1, 0.1,
&data->fb[1]);
igt_assert(data->fb_id[1]);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 04/16] kms_fence_pin_leak: Use I915_TILING_X to create fbs
2014-08-21 13:59 [PATCH i-g-t 00/16] Use a tiling format in fb creation functions Damien Lespiau
` (2 preceding siblings ...)
2014-08-21 13:59 ` [PATCH 03/16] kms_fbc_crc: Use I915_TILING_X " Damien Lespiau
@ 2014-08-21 13:59 ` Damien Lespiau
2014-08-21 13:59 ` [PATCH 05/16] kms_flip: Adjust to the new igt_create_fb*() API Damien Lespiau
` (11 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Damien Lespiau @ 2014-08-21 13:59 UTC (permalink / raw)
To: intel-gfx
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
tests/kms_fence_pin_leak.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/kms_fence_pin_leak.c b/tests/kms_fence_pin_leak.c
index 51bc72f..93f4e16 100644
--- a/tests/kms_fence_pin_leak.c
+++ b/tests/kms_fence_pin_leak.c
@@ -127,12 +127,12 @@ static bool run_single_test(data_t *data, enum pipe pipe, igt_output_t *output)
igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
DRM_FORMAT_XRGB8888,
- true, /* need a fence so must be tiled */
+ I915_TILING_X, /* need a fence so must be tiled */
0.0, 0.0, 0.0,
&fb[0]);
igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
DRM_FORMAT_XRGB8888,
- true, /* need a fence so must be tiled */
+ I915_TILING_X, /* need a fence so must be tiled */
0.0, 0.0, 0.0,
&fb[1]);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 05/16] kms_flip: Adjust to the new igt_create_fb*() API
2014-08-21 13:59 [PATCH i-g-t 00/16] Use a tiling format in fb creation functions Damien Lespiau
` (3 preceding siblings ...)
2014-08-21 13:59 ` [PATCH 04/16] kms_fence_pin_leak: " Damien Lespiau
@ 2014-08-21 13:59 ` Damien Lespiau
2014-08-21 13:59 ` [PATCH 06/16] kms_flip_tiling: Adjust to the new igt_create_.*fb() API Damien Lespiau
` (10 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Damien Lespiau @ 2014-08-21 13:59 UTC (permalink / raw)
To: intel-gfx
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
tests/kms_flip.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index 5cd8c2f..0faed85 100644
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -227,7 +227,7 @@ static void emit_fence_stress(struct test_output *o)
uint32_t tiling = I915_TILING_X;
unsigned long pitch = 0;
bo[i] = drm_intel_bo_alloc_tiled(bufmgr,
- "tiled bo", 1024, 1024, 4,
+ "X tiled bo", 1024, 1024, 4,
&tiling, &pitch, 0);
exec[i].handle = bo[i]->handle;
exec[i].flags = EXEC_OBJECT_NEEDS_FENCE;
@@ -1241,7 +1241,7 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
char test_name[128];
unsigned elapsed;
unsigned bo_size = 0;
- bool tiled;
+ unsigned int tiling;
int i;
switch (crtc_count) {
@@ -1273,9 +1273,9 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
if (o->flags & TEST_PAN)
o->fb_width *= 2;
- tiled = false;
+ tiling = I915_TILING_NONE;
if (o->flags & TEST_FENCE_STRESS)
- tiled = true;
+ tiling = I915_TILING_X;
/* 256 MB is usually the maximum mappable aperture,
* (make it 4x times that to ensure failure) */
@@ -1284,13 +1284,13 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
o->fb_ids[0] = igt_create_fb(drm_fd, o->fb_width, o->fb_height,
igt_bpp_depth_to_drm_format(o->bpp, o->depth),
- tiled, &o->fb_info[0]);
+ tiling, &o->fb_info[0]);
o->fb_ids[1] = igt_create_fb_with_bo_size(drm_fd, o->fb_width, o->fb_height,
igt_bpp_depth_to_drm_format(o->bpp, o->depth),
- tiled, &o->fb_info[1], bo_size);
+ tiling, &o->fb_info[1], bo_size);
o->fb_ids[2] = igt_create_fb(drm_fd, o->fb_width, o->fb_height,
igt_bpp_depth_to_drm_format(o->bpp, o->depth),
- true, &o->fb_info[2]);
+ I915_TILING_X, &o->fb_info[2]);
igt_assert(o->fb_ids[0]);
igt_assert(o->fb_ids[1]);
if (o->flags & TEST_FB_BAD_TILING)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 06/16] kms_flip_tiling: Adjust to the new igt_create_.*fb() API
2014-08-21 13:59 [PATCH i-g-t 00/16] Use a tiling format in fb creation functions Damien Lespiau
` (4 preceding siblings ...)
2014-08-21 13:59 ` [PATCH 05/16] kms_flip: Adjust to the new igt_create_fb*() API Damien Lespiau
@ 2014-08-21 13:59 ` Damien Lespiau
2014-08-21 13:59 ` [PATCH 07/16] kms_mmio_vs_cs_flip: " Damien Lespiau
` (9 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Damien Lespiau @ 2014-08-21 13:59 UTC (permalink / raw)
To: intel-gfx
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
tests/kms_flip_tiling.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/kms_flip_tiling.c b/tests/kms_flip_tiling.c
index 6f8ee94..1f2caac 100644
--- a/tests/kms_flip_tiling.c
+++ b/tests/kms_flip_tiling.c
@@ -81,7 +81,7 @@ test_flip_changes_tiling(data_t *data, igt_output_t *output)
while (width < mode->hdisplay)
width *= 2;
fb_id = igt_create_fb(data->drm_fd, width, mode->vdisplay,
- DRM_FORMAT_XRGB8888, false, &linear);
+ DRM_FORMAT_XRGB8888, I915_TILING_NONE, &linear);
/* fill it with a pattern that will look wrong if tiling is wrong */
fill_linear_fb(&linear, data, mode);
@@ -93,7 +93,8 @@ test_flip_changes_tiling(data_t *data, igt_output_t *output)
/* allocate a tiled buffer and set the crtc with it */
igt_create_color_fb(data->drm_fd, width, mode->vdisplay,
- DRM_FORMAT_XRGB8888, true, 0.0, 0.0, 0.0, &tiled);
+ DRM_FORMAT_XRGB8888, I915_TILING_X, 0.0, 0.0, 0.0,
+ &tiled);
igt_plane_set_fb(primary, &tiled);
igt_display_commit(&data->display);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 07/16] kms_mmio_vs_cs_flip: Adjust to the new igt_create_.*fb() API
2014-08-21 13:59 [PATCH i-g-t 00/16] Use a tiling format in fb creation functions Damien Lespiau
` (5 preceding siblings ...)
2014-08-21 13:59 ` [PATCH 06/16] kms_flip_tiling: Adjust to the new igt_create_.*fb() API Damien Lespiau
@ 2014-08-21 13:59 ` Damien Lespiau
2014-08-21 13:59 ` [PATCH 08/16] kms_pipe_crc_basic: Adjust to the new igt_create.*fb() API Damien Lespiau
` (8 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Damien Lespiau @ 2014-08-21 13:59 UTC (permalink / raw)
To: intel-gfx
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
tests/kms_mmio_vs_cs_flip.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/kms_mmio_vs_cs_flip.c b/tests/kms_mmio_vs_cs_flip.c
index 243e424..09396a9 100644
--- a/tests/kms_mmio_vs_cs_flip.c
+++ b/tests/kms_mmio_vs_cs_flip.c
@@ -220,17 +220,17 @@ test_plane(data_t *data, igt_output_t *output, enum pipe pipe, enum igt_plane pl
mode = igt_output_get_mode(output);
igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
DRM_FORMAT_XRGB8888,
- false, /* tiled */
+ I915_TILING_NONE,
1.0, 0.0, 0.0,
&red_fb);
igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
DRM_FORMAT_XRGB8888,
- false, /* tiled */
+ I915_TILING_NONE,
0.0, 1.0, 0.0,
&green_fb);
igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
DRM_FORMAT_XRGB8888,
- false, /* tiled */
+ I915_TILING_NONE,
0.0, 0.0, 1.0,
&blue_fb);
@@ -385,17 +385,17 @@ test_crtc(data_t *data, igt_output_t *output, enum pipe pipe)
mode = igt_output_get_mode(output);
igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay+1,
DRM_FORMAT_XRGB8888,
- false, /* tiled */
+ I915_TILING_NONE,
1.0, 0.0, 0.0,
&red_fb);
igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay+1,
DRM_FORMAT_XRGB8888,
- false, /* tiled */
+ I915_TILING_NONE,
0.0, 0.0, 1.0,
&blue_fb);
igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay+1,
DRM_FORMAT_XRGB8888,
- false, /* tiled */
+ I915_TILING_NONE,
0.0, 1.0, 0.0,
&green_fb);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 08/16] kms_pipe_crc_basic: Adjust to the new igt_create.*fb() API
2014-08-21 13:59 [PATCH i-g-t 00/16] Use a tiling format in fb creation functions Damien Lespiau
` (6 preceding siblings ...)
2014-08-21 13:59 ` [PATCH 07/16] kms_mmio_vs_cs_flip: " Damien Lespiau
@ 2014-08-21 13:59 ` Damien Lespiau
2014-08-21 13:59 ` [PATCH 09/16] kms_plane: " Damien Lespiau
` (7 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Damien Lespiau @ 2014-08-21 13:59 UTC (permalink / raw)
To: intel-gfx
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
tests/kms_pipe_crc_basic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c
index 15aba2f..510a7d5 100644
--- a/tests/kms_pipe_crc_basic.c
+++ b/tests/kms_pipe_crc_basic.c
@@ -138,7 +138,7 @@ test_read_crc_for_output(data_t *data, int pipe, igt_output_t *output,
igt_create_color_fb(data->drm_fd,
mode->hdisplay, mode->vdisplay,
DRM_FORMAT_XRGB8888,
- false, /* tiled */
+ I915_TILING_NONE,
colors[c].r,
colors[c].g,
colors[c].b,
--
1.8.3.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 09/16] kms_plane: Adjust to the new igt_create.*fb() API
2014-08-21 13:59 [PATCH i-g-t 00/16] Use a tiling format in fb creation functions Damien Lespiau
` (7 preceding siblings ...)
2014-08-21 13:59 ` [PATCH 08/16] kms_pipe_crc_basic: Adjust to the new igt_create.*fb() API Damien Lespiau
@ 2014-08-21 13:59 ` Damien Lespiau
2014-08-21 13:59 ` [PATCH 10/16] kms_psr_sink_crc: " Damien Lespiau
` (6 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Damien Lespiau @ 2014-08-21 13:59 UTC (permalink / raw)
To: intel-gfx
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
tests/kms_plane.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/kms_plane.c b/tests/kms_plane.c
index 42af2fb..07b1637 100644
--- a/tests/kms_plane.c
+++ b/tests/kms_plane.c
@@ -78,7 +78,7 @@ test_grab_crc(data_t *data, igt_output_t *output, enum pipe pipe,
mode = igt_output_get_mode(output);
igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
DRM_FORMAT_XRGB8888,
- false, /* tiled */
+ I915_TILING_NONE,
fb_color->red, fb_color->green, fb_color->blue,
&fb);
igt_plane_set_fb(primary, &fb);
@@ -130,7 +130,7 @@ create_fb_for_mode__position(data_t *data, drmModeModeInfo *mode,
fb_id = igt_create_fb(data->drm_fd,
mode->hdisplay, mode->vdisplay,
DRM_FORMAT_XRGB8888,
- false /* tiling */,
+ I915_TILING_NONE,
fb);
igt_assert(fb_id);
@@ -179,7 +179,7 @@ test_plane_position_with_output(data_t *data,
igt_create_color_fb(data->drm_fd,
64, 64, /* width, height */
DRM_FORMAT_XRGB8888,
- false, /* tiled */
+ I915_TILING_NONE,
0.0, 1.0, 0.0,
&sprite_fb);
igt_plane_set_fb(sprite, &sprite_fb);
@@ -248,7 +248,7 @@ create_fb_for_mode__panning(data_t *data, drmModeModeInfo *mode,
fb_id = igt_create_fb(data->drm_fd,
mode->hdisplay * 2, mode->vdisplay * 2,
DRM_FORMAT_XRGB8888,
- false /* tiling */,
+ I915_TILING_NONE,
fb);
igt_assert(fb_id);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 10/16] kms_psr_sink_crc: Adjust to the new igt_create.*fb() API
2014-08-21 13:59 [PATCH i-g-t 00/16] Use a tiling format in fb creation functions Damien Lespiau
` (8 preceding siblings ...)
2014-08-21 13:59 ` [PATCH 09/16] kms_plane: " Damien Lespiau
@ 2014-08-21 13:59 ` Damien Lespiau
2014-08-21 13:59 ` [PATCH 11/16] kms_render: " Damien Lespiau
` (5 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Damien Lespiau @ 2014-08-21 13:59 UTC (permalink / raw)
To: intel-gfx
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
tests/kms_psr_sink_crc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/kms_psr_sink_crc.c b/tests/kms_psr_sink_crc.c
index 8e8c908..909d6ca 100644
--- a/tests/kms_psr_sink_crc.c
+++ b/tests/kms_psr_sink_crc.c
@@ -108,7 +108,7 @@ static uint32_t create_fb(data_t *data,
cairo_t *cr;
fb_id = igt_create_fb(data->drm_fd, w, h,
- DRM_FORMAT_XRGB8888, true, fb);
+ DRM_FORMAT_XRGB8888, I915_TILING_X, fb);
igt_assert(fb_id);
cr = igt_get_cairo_ctx(data->drm_fd, fb);
@@ -124,7 +124,7 @@ static void create_cursor_fb(data_t *data, struct igt_fb *fb)
cairo_t *cr;
data->fb_id[2] = igt_create_fb(data->drm_fd, 64, 64,
- DRM_FORMAT_ARGB8888, false,
+ DRM_FORMAT_ARGB8888, I915_TILING_NONE,
fb);
igt_assert(data->fb_id[2]);
@@ -528,13 +528,13 @@ static void test_sprite(data_t *data)
igt_create_color_fb(data->drm_fd,
mode->hdisplay, mode->vdisplay,
- DRM_FORMAT_XRGB8888, true, /* tiled */
+ DRM_FORMAT_XRGB8888, I915_TILING_X,
0.0, 1.0, 0.0,
&data->fb[0]);
igt_create_color_fb(data->drm_fd,
mode->hdisplay/2, mode->vdisplay/2,
- DRM_FORMAT_XRGB8888, true, /* tiled */
+ DRM_FORMAT_XRGB8888, I915_TILING_X,
1.0, 0.0, 0.0,
&data->fb[1]);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 11/16] kms_render: Adjust to the new igt_create.*fb() API
2014-08-21 13:59 [PATCH i-g-t 00/16] Use a tiling format in fb creation functions Damien Lespiau
` (9 preceding siblings ...)
2014-08-21 13:59 ` [PATCH 10/16] kms_psr_sink_crc: " Damien Lespiau
@ 2014-08-21 13:59 ` Damien Lespiau
2014-08-21 13:59 ` [PATCH 12/16] kms_setmode: Adjust to the " Damien Lespiau
` (4 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Damien Lespiau @ 2014-08-21 13:59 UTC (permalink / raw)
To: intel-gfx
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
tests/kms_render.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/kms_render.c b/tests/kms_render.c
index f457929..db2ed45 100644
--- a/tests/kms_render.c
+++ b/tests/kms_render.c
@@ -125,10 +125,12 @@ static int test_format(const char *test_name,
width = mode->hdisplay;
height = mode->vdisplay;
- if (!igt_create_fb(drm_fd, width, height, format, false, &fb[0]))
+ if (!igt_create_fb(drm_fd, width, height, format, I915_TILING_NONE,
+ &fb[0]))
goto err1;
- if (!igt_create_fb(drm_fd, width, height, format, false, &fb[1]))
+ if (!igt_create_fb(drm_fd, width, height, format, I915_TILING_NONE,
+ &fb[1]))
goto err2;
if (drmModeSetCrtc(drm_fd, cconf->crtc->crtc_id, fb[0].fb_id,
--
1.8.3.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 12/16] kms_setmode: Adjust to the igt_create.*fb() API
2014-08-21 13:59 [PATCH i-g-t 00/16] Use a tiling format in fb creation functions Damien Lespiau
` (10 preceding siblings ...)
2014-08-21 13:59 ` [PATCH 11/16] kms_render: " Damien Lespiau
@ 2014-08-21 13:59 ` Damien Lespiau
2014-08-21 13:59 ` [PATCH 13/16] kms_sink_crc_basic: Adjust to the new " Damien Lespiau
` (3 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Damien Lespiau @ 2014-08-21 13:59 UTC (permalink / raw)
To: intel-gfx
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
tests/kms_setmode.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c
index 59e2434..a43af1c 100644
--- a/tests/kms_setmode.c
+++ b/tests/kms_setmode.c
@@ -179,16 +179,14 @@ static void create_fb_for_crtc(struct crtc_config *crtc,
{
int bpp;
int depth;
- bool enable_tiling;
int fb_id;
bpp = 32;
depth = 24;
- enable_tiling = false;
fb_id = igt_create_fb(drm_fd, crtc->mode.hdisplay,
crtc->mode.vdisplay,
igt_bpp_depth_to_drm_format(bpp, depth),
- enable_tiling, fb_info);
+ I915_TILING_NONE, fb_info);
igt_assert(fb_id > 0);
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 13/16] kms_sink_crc_basic: Adjust to the new igt_create.*fb() API
2014-08-21 13:59 [PATCH i-g-t 00/16] Use a tiling format in fb creation functions Damien Lespiau
` (11 preceding siblings ...)
2014-08-21 13:59 ` [PATCH 12/16] kms_setmode: Adjust to the " Damien Lespiau
@ 2014-08-21 13:59 ` Damien Lespiau
2014-08-21 13:59 ` [PATCH 14/16] pm_lpsp: " Damien Lespiau
` (2 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Damien Lespiau @ 2014-08-21 13:59 UTC (permalink / raw)
To: intel-gfx
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
tests/kms_sink_crc_basic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/kms_sink_crc_basic.c b/tests/kms_sink_crc_basic.c
index b977dec..443f82e 100644
--- a/tests/kms_sink_crc_basic.c
+++ b/tests/kms_sink_crc_basic.c
@@ -70,7 +70,7 @@ static uint32_t create_fb(data_t *data,
uint32_t fb_id;
fb_id = igt_create_fb(data->drm_fd, w, h,
- DRM_FORMAT_XRGB8888, false, fb);
+ DRM_FORMAT_XRGB8888, I915_TILING_NONE, fb);
igt_assert(fb_id);
cr = igt_get_cairo_ctx(data->drm_fd, fb);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 14/16] pm_lpsp: Adjust to the new igt_create.*fb() API
2014-08-21 13:59 [PATCH i-g-t 00/16] Use a tiling format in fb creation functions Damien Lespiau
` (12 preceding siblings ...)
2014-08-21 13:59 ` [PATCH 13/16] kms_sink_crc_basic: Adjust to the new " Damien Lespiau
@ 2014-08-21 13:59 ` Damien Lespiau
2014-08-21 13:59 ` [PATCH 15/16] pm_rpm: Adjust to the new igt_create*fb() API Damien Lespiau
2014-08-21 13:59 ` [PATCH 16/16] testdisplay: Make the desired tiling mode an unsigned int Damien Lespiau
15 siblings, 0 replies; 17+ messages in thread
From: Damien Lespiau @ 2014-08-21 13:59 UTC (permalink / raw)
To: intel-gfx
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
tests/pm_lpsp.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tests/pm_lpsp.c b/tests/pm_lpsp.c
index 250b140..78d6d08 100644
--- a/tests/pm_lpsp.c
+++ b/tests/pm_lpsp.c
@@ -84,9 +84,8 @@ static uint32_t create_fb(int drm_fd, int width, int height)
cairo_t *cr;
uint32_t buffer_id;
- buffer_id = igt_create_fb(drm_fd, width, height,
- DRM_FORMAT_XRGB8888,
- false, &fb);
+ buffer_id = igt_create_fb(drm_fd, width, height, DRM_FORMAT_XRGB8888,
+ I915_TILING_NONE, &fb);
cr = igt_get_cairo_ctx(drm_fd, &fb);
igt_paint_test_pattern(cr, width, height);
cairo_destroy(cr);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 15/16] pm_rpm: Adjust to the new igt_create*fb() API
2014-08-21 13:59 [PATCH i-g-t 00/16] Use a tiling format in fb creation functions Damien Lespiau
` (13 preceding siblings ...)
2014-08-21 13:59 ` [PATCH 14/16] pm_lpsp: " Damien Lespiau
@ 2014-08-21 13:59 ` Damien Lespiau
2014-08-21 13:59 ` [PATCH 16/16] testdisplay: Make the desired tiling mode an unsigned int Damien Lespiau
15 siblings, 0 replies; 17+ messages in thread
From: Damien Lespiau @ 2014-08-21 13:59 UTC (permalink / raw)
To: intel-gfx
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
tests/pm_rpm.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c
index 841566b..b691ae3 100644
--- a/tests/pm_rpm.c
+++ b/tests/pm_rpm.c
@@ -285,7 +285,7 @@ static bool init_modeset_params_for_type(struct mode_set_data *data,
return false;
igt_create_fb(drm_fd, mode->hdisplay, mode->vdisplay,
- DRM_FORMAT_XRGB8888, false, ¶ms->fb);
+ DRM_FORMAT_XRGB8888, I915_TILING_NONE, ¶ms->fb);
cr = igt_get_cairo_ctx(drm_fd, ¶ms->fb);
igt_paint_test_pattern(cr, mode->hdisplay, mode->vdisplay);
cairo_destroy(cr);
@@ -1427,9 +1427,12 @@ static void cursor_subtest(bool dpms)
igt_require(default_mode_params);
crtc_id = default_mode_params->crtc_id;
- igt_create_fb(drm_fd, 64, 64, DRM_FORMAT_ARGB8888, false, &cursor_fb1);
- igt_create_fb(drm_fd, 64, 64, DRM_FORMAT_ARGB8888, false, &cursor_fb2);
- igt_create_fb(drm_fd, 64, 64, DRM_FORMAT_ARGB8888, true, &cursor_fb3);
+ igt_create_fb(drm_fd, 64, 64, DRM_FORMAT_ARGB8888, I915_TILING_NONE,
+ &cursor_fb1);
+ igt_create_fb(drm_fd, 64, 64, DRM_FORMAT_ARGB8888, I915_TILING_NONE,
+ &cursor_fb2);
+ igt_create_fb(drm_fd, 64, 64, DRM_FORMAT_ARGB8888, I915_TILING_X,
+ &cursor_fb3);
fill_igt_fb(&cursor_fb1, 0xFF00FFFF);
fill_igt_fb(&cursor_fb2, 0xFF00FF00);
@@ -1536,7 +1539,7 @@ static void test_one_plane(bool dpms, uint32_t plane_id,
uint32_t crtc_id;
struct igt_fb plane_fb1, plane_fb2;
int32_t crtc_x = 0, crtc_y = 0;
- bool tiling;
+ unsigned int tiling;
disable_all_screens_and_wait(&ms_data);
@@ -1548,19 +1551,19 @@ static void test_one_plane(bool dpms, uint32_t plane_id,
plane_format = DRM_FORMAT_XRGB8888;
plane_w = 64;
plane_h = 64;
- tiling = true;
+ tiling = I915_TILING_X;
break;
case PLANE_PRIMARY:
plane_format = DRM_FORMAT_XRGB8888;
plane_w = default_mode_params->mode->hdisplay;
plane_h = default_mode_params->mode->vdisplay;
- tiling = true;
+ tiling = I915_TILING_X;
break;
case PLANE_CURSOR:
plane_format = DRM_FORMAT_ARGB8888;
plane_w = 64;
plane_h = 64;
- tiling = false;
+ tiling = I915_TILING_NONE;
break;
default:
igt_assert(0);
@@ -1679,7 +1682,7 @@ static void fences_subtest(bool dpms)
params.connector_id = default_mode_params->connector_id;
params.mode = default_mode_params->mode;
igt_create_fb(drm_fd, params.mode->hdisplay, params.mode->vdisplay,
- DRM_FORMAT_XRGB8888, true, ¶ms.fb);
+ DRM_FORMAT_XRGB8888, I915_TILING_X, ¶ms.fb);
/* Even though we passed "true" as the tiling argument, double-check
* that the fb is really tiled. */
--
1.8.3.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 16/16] testdisplay: Make the desired tiling mode an unsigned int
2014-08-21 13:59 [PATCH i-g-t 00/16] Use a tiling format in fb creation functions Damien Lespiau
` (14 preceding siblings ...)
2014-08-21 13:59 ` [PATCH 15/16] pm_rpm: Adjust to the new igt_create*fb() API Damien Lespiau
@ 2014-08-21 13:59 ` Damien Lespiau
15 siblings, 0 replies; 17+ messages in thread
From: Damien Lespiau @ 2014-08-21 13:59 UTC (permalink / raw)
To: intel-gfx
We may be able to scan out more tiling formats in the future.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
tests/testdisplay.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/tests/testdisplay.c b/tests/testdisplay.c
index 89ee110..dbca203 100644
--- a/tests/testdisplay.c
+++ b/tests/testdisplay.c
@@ -79,7 +79,8 @@ struct termios saved_tio;
drmModeRes *resources;
int drm_fd, modes;
int test_all_modes = 0, test_preferred_mode = 0, force_mode = 0, test_plane,
- test_stereo_modes, enable_tiling;
+ test_stereo_modes;
+unsigned int tiling = I915_TILING_NONE;
int sleep_between_modes = 5;
int do_dpms = 0; /* This aliases to DPMS_ON */
uint32_t depth = 24, stride, bpp;
@@ -369,8 +370,8 @@ set_mode(struct connector *c)
height = c->mode.vdisplay;
fb_id = igt_create_fb(drm_fd, width, height,
- igt_bpp_depth_to_drm_format(bpp, depth),
- enable_tiling, &fb_info[current_fb]);
+ igt_bpp_depth_to_drm_format(bpp, depth),
+ tiling, &fb_info[current_fb]);
paint_output_info(c, &fb_info[current_fb]);
paint_color_key(&fb_info[current_fb]);
@@ -494,8 +495,8 @@ static uint32_t create_stereo_fb(drmModeModeInfo *mode, struct igt_fb *fb)
stereo_fb_layout_from_mode(&layout, mode);
fb_id = igt_create_fb(drm_fd, layout.fb_width, layout.fb_height,
- igt_bpp_depth_to_drm_format(bpp, depth),
- enable_tiling, fb);
+ igt_bpp_depth_to_drm_format(bpp, depth),
+ tiling, fb);
cr = igt_get_cairo_ctx(drm_fd, fb);
igt_paint_image(cr, IGT_DATADIR"/1080p-left.png",
@@ -803,7 +804,7 @@ int main(int argc, char **argv)
test_preferred_mode = 1;
break;
case 't':
- enable_tiling = 1;
+ tiling = I915_TILING_X;
break;
case 'r':
qr_code = 1;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 17+ messages in thread