From: Tvrtko Ursulin <tvrtko.ursu...@intel.com>
Currently object tiling is inferred from the frame buffer modifier
and only for legacy X scanout.
It is useful to support overriding this selection for certain tests
so add the capability.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursu...@intel.com>
Cc: Vivek Kasireddy <vivek.kasire...@intel.com>
---
lib/igt_fb.c | 21 ++++++++++++++-------
lib/igt_fb.h | 3 ++-
tests/kms_flip.c | 3 ++-
3 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index d04f02c0d035..73be93cb6e63 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -75,7 +75,8 @@ 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,
- uint64_t tiling, unsigned bo_size,
+ uint64_t tiling, unsigned int obj_tiling,
+ unsigned bo_size,
uint32_t *gem_handle_ret,
unsigned *size_ret,
unsigned *stride_ret)
@@ -113,7 +114,9 @@ static int create_bo_for_fb(int fd, int width, int height,
int bpp,
gem_handle = gem_create(fd, bo_size);
if (tiling == LOCAL_I915_FORMAT_MOD_X_TILED)
- ret = __gem_set_tiling(fd, gem_handle, I915_TILING_X, stride);
+ obj_tiling = I915_TILING_X;
+ if (obj_tiling != I915_TILING_NONE)
+ ret = __gem_set_tiling(fd, gem_handle, obj_tiling, stride);
*stride_ret = stride;
*size_ret = size;
@@ -414,7 +417,8 @@ void igt_paint_image(cairo_t *cr, const char *filename,
*/
unsigned int
igt_create_fb_with_bo_size(int fd, int width, int height,
- uint32_t format, uint64_t tiling,
+ uint32_t format,
+ uint64_t tiling, unsigned int obj_tiling,
struct igt_fb *fb, unsigned bo_size)
{
uint32_t fb_id;
@@ -426,8 +430,9 @@ igt_create_fb_with_bo_size(int fd, int width, int height,
igt_debug("%s(width=%d, height=%d, format=0x%x [bpp=%d],
tiling=0x%"PRIx64", size=%d)\n",
__func__, width, height, format, bpp, tiling, bo_size);
- do_or_die(create_bo_for_fb(fd, width, height, bpp, tiling, bo_size,
- &fb->gem_handle, &fb->size, &fb->stride));
+ do_or_die(create_bo_for_fb(fd, width, height, bpp, tiling, obj_tiling,
+ bo_size, &fb->gem_handle, &fb->size,
+ &fb->stride));
igt_debug("%s(handle=%d, pitch=%d)\n",
__func__, fb->gem_handle, fb->stride);
@@ -485,7 +490,8 @@ igt_create_fb_with_bo_size(int fd, int width, int height,
unsigned int igt_create_fb(int fd, int width, int height, uint32_t format,
uint64_t tiling, struct igt_fb *fb)
{
- return igt_create_fb_with_bo_size(fd, width, height, format, tiling,
fb, 0);
+ return igt_create_fb_with_bo_size(fd, width, height, format,
+ tiling, I915_TILING_NONE, fb, 0);
}
/**
@@ -714,7 +720,8 @@ static void create_cairo_surface__blit(int fd, struct
igt_fb *fb)
*/
bpp = igt_drm_format_to_bpp(fb->drm_format);
ret = create_bo_for_fb(fd, fb->width, fb->height, bpp,
- LOCAL_DRM_FORMAT_MOD_NONE, 0,
+ LOCAL_DRM_FORMAT_MOD_NONE, I915_TILING_NONE,
+ 0,
&blit->linear.handle,
&blit->linear.size,
&blit->linear.stride);
diff --git a/lib/igt_fb.h b/lib/igt_fb.h
index a07acd2444b8..fa92fd4efd5b 100644
--- a/lib/igt_fb.h
+++ b/lib/igt_fb.h
@@ -71,7 +71,8 @@ enum igt_text_align {
unsigned int
igt_create_fb_with_bo_size(int fd, int width, int height,
- uint32_t format, uint64_t tiling,
+ uint32_t format,
+ uint64_t tiling, unsigned int obj_tiling,
struct igt_fb *fb, unsigned bo_size);
unsigned int igt_create_fb(int fd, int width, int height, uint32_t format,
uint64_t tiling, struct igt_fb *fb);
diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index a139d402608e..60577d23b9a4 100644
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -1366,7 +1366,8 @@ static void run_test_on_crtc_set(struct test_output *o,
int *crtc_idxs,
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),
- tiling, &o->fb_info[1], bo_size);
+ tiling, I915_TILING_NONE,
+ &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),
LOCAL_I915_FORMAT_MOD_X_TILED,
&o->fb_info[2]);
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
