lib/igt_fb: Allow specifiying object tiling when creating frame buffers
PATCH 1/3 lib/igt_fb: Allow specifiying object tiling when creating frame buffers
From: Tvrtko Ursulin <[email protected]>
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.
--- lib/igt_fb.c | 21 ++++++++++++++------- lib/igt_fb.h | 3 ++- tests/kms_flip.c | 3 ++- 3 files changed, 18 insertions(+), 9 deletions(-)
lib/igt_fb.c +14 -7
@@ -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);
lib/igt_fb.h +2 -1
@@ -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);
tests/kms_flip.c +2 -1
@@ -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 ]);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/3 lib/igt_kms: Set new rotation property before displaying
From: Tvrtko Ursulin <[email protected]>
This is not really tested that much apart that it doesn't break kms_rotation_crc and it makes one new test case work.
It only serves as proof of concept to demonstrate a particular bug.
--- lib/igt_kms.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
lib/igt_kms.c +8 -8
@@ -1316,6 +1316,14 @@ static int igt_drm_plane_commit(igt_plane_t *plane,igt_assert (igt_plane_supports_rotation (plane) || !plane->rotation_changed); +if (plane->rotation_changed) { + ret =igt_plane_set_property (plane, plane->rotation_property, + plane->rotation); + + plane->rotation_changed = false; +CHECK_RETURN (ret, fail_on_error); + } + fb_id =igt_plane_get_fb_id (plane); crtc_id = output->config.crtc->crtc_id;
@@ -1377,14 +1385,6 @@ static int igt_drm_plane_commit(igt_plane_t *plane, plane->position_changed = false; plane->size_changed = false; -if (plane->rotation_changed) { - ret =igt_plane_set_property (plane, plane->rotation_property, - plane->rotation); - - plane->rotation_changed = false; -CHECK_RETURN (ret, fail_on_error); - } -return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 kms_rotation_crc: Test case for rotated VMA first with legacy tiling
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Specifically targetting a WARN_ON in the kernel, i915_gem_fence.c:
if (WARN_ON(!obj->map_and_fenceable)) return -EINVAL;
Which happens for objects with legacy tiling set to Y at the point object is pinned to display with no normal VMA in existance and hence obj->map_and_fenceable false.
--- tests/kms_rotation_crc.c | 121 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 96 insertions(+), 25 deletions(-)
tests/kms_rotation_crc.c +96 -25
@@ -81,7 +81,8 @@ paint_squares(data_t *data, drmModeModeInfo *mode, igt_rotation_t rotation,cairo_destroy (cr); } -static void commit_crtc (data_t *data,igt_output_t *output,igt_plane_t *plane) +static void commit_crtc (data_t *data,igt_output_t *output,igt_plane_t *plane, +bool render) {igt_display_t *display = &data->display;enum igt_commit_style commit =COMMIT_LEGACY ;
@@ -108,17 +109,18 @@ static void commit_crtc(data_t *data, igt_output_t *output, igt_plane_t *plane) commit =COMMIT_UNIVERSAL ; } -igt_display_commit2 (display, commit); +if (render) +igt_display_commit2 (display, commit); }static void prepare_crtc (data_t *data,igt_output_t *output,enum pipe pipe, -igt_plane_t *plane) +igt_plane_t *plane,bool render) {drmModeModeInfo *mode;int fb_id, fb_modeset_id;unsigned int w, h; -uint64_t tiling = data->override_tiling ? - data->override_tiling :LOCAL_DRM_FORMAT_MOD_NONE ; +uint64_t tiling; +unsigned int obj_tiling = !render ?I915_TILING_Y :I915_TILING_NONE ;uint32_t pixel_format = data->override_fmt ? data->override_fmt :DRM_FORMAT_XRGB8888 ;
@@ -133,6 +135,14 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe, w = mode->hdisplay; h = mode->vdisplay; +if (data->override_tiling) + tiling = data->override_tiling; +else if (data->rotation ==IGT_ROTATION_90 || + data->rotation ==IGT_ROTATION_270 ) + tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +else + tiling =LOCAL_DRM_FORMAT_MOD_NONE ; + fb_modeset_id = igt_create_fb(data->gfx_fd, w, h, pixel_format,
@@ -146,8 +156,6 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe,*/ if (data->rotation ==IGT_ROTATION_90 || data->rotation ==IGT_ROTATION_270 ) { - tiling = data->override_tiling ? - data->override_tiling :LOCAL_I915_FORMAT_MOD_Y_TILED ; w = h = mode->vdisplay; }else if (plane->is_cursor) { pixel_format = data->override_fmt ?
@@ -158,24 +166,29 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe, data->w = w; data->h = h; - fb_id =igt_create_fb (data->gfx_fd, - w, h, - pixel_format, - tiling, - &data->fb); + fb_id =igt_create_fb_with_bo_size (data->gfx_fd, + w, h, + pixel_format, + tiling, obj_tiling, + &data->fb,0 );igt_assert (fb_id); -/* Step 1: create a reference CRC for a software-rotated fb */ -paint_squares (data, mode, data->rotation, plane); -commit_crtc (data, output, plane); -igt_pipe_crc_collect_crc (data->pipe_crc, &data->ref_crc); - -/* -* Step 2: prepare the plane with an non-rotated fb let the hw -* rotate it. -*/ -paint_squares (data, mode,IGT_ROTATION_0 , plane); -igt_plane_set_fb (plane, &data->fb); +if (render) { +/* Step 1: create a reference CRC for a software-rotated fb */ +paint_squares (data, mode, data->rotation, plane); +commit_crtc (data, output, plane, render); +igt_pipe_crc_collect_crc (data->pipe_crc, &data->ref_crc); + +/* +* Step 2: prepare the plane with an non-rotated fb let the hw +* rotate it. +*/ +paint_squares (data, mode,IGT_ROTATION_0 , plane); +igt_plane_set_fb (plane, &data->fb); + }else { +commit_crtc (data, output, plane, render); +igt_plane_set_fb (plane, &data->fb); + } }static void cleanup_crtc (data_t *data,igt_output_t *output,igt_plane_t *plane)
@@ -226,7 +239,7 @@ static void test_plane_rotation(data_t *data, enum igt_plane plane_type) plane =igt_output_get_plane (output, plane_type);igt_require (igt_plane_supports_rotation (plane)); -prepare_crtc (data, output, pipe, plane); +prepare_crtc (data, output, pipe, plane, true);igt_display_commit2 (display, commit);
@@ -252,7 +265,7 @@ static void test_plane_rotation(data_t *data, enum igt_plane plane_type)kmstest_restore_vt_mode ();kmstest_set_vt_graphics_mode (); -commit_crtc (data, output, plane); +commit_crtc (data, output, plane, true);igt_pipe_crc_collect_crc (data->pipe_crc, &crc_output);igt_assert_crc_equal (&crc_unrotated, &crc_output);
@@ -264,6 +277,52 @@ static void test_plane_rotation(data_t *data, enum igt_plane plane_type)igt_require_f (valid_tests,"no valid crtc/connector combinations found\n" ); } +static void +test_plane_rotation_first (data_t *data,enum igt_plane plane_type) +{ +igt_display_t *display = &data->display; +igt_output_t *output; +enum pipe pipe; +int valid_tests =0 ; +enum igt_commit_style commit =COMMIT_LEGACY ; +int ret; + +if (plane_type ==IGT_PLANE_PRIMARY || plane_type ==IGT_PLANE_CURSOR ) { +igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + +for_each_connected_output (display, output) { +for_each_pipe (display, pipe) { +igt_plane_t *plane; + +igt_output_set_pipe (output, pipe); + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane)); + +prepare_crtc (data, output, pipe, plane, false); + +igt_plane_set_rotation (plane, data->rotation); + ret =igt_display_try_commit2 (display, commit); +igt_assert (ret ==0 ); + +/* +* check the rotation state has been reset when the VT +* mode is restored +*/ +kmstest_restore_vt_mode (); +kmstest_set_vt_graphics_mode (); + +commit_crtc (data, output, plane, false); + + valid_tests++; +cleanup_crtc (data, output, plane); + } + } +igt_require_f (valid_tests,"no valid crtc/connector combinations found\n" ); +} + igt_main {data_t data = {};
@@ -302,6 +361,18 @@ igt_maintest_plane_rotation (&data,IGT_PLANE_PRIMARY ); } +/* +* Test rotated VMA instantiated first for the frame buffer object, +* in other words with no normal VMA in existance first. Done by +* avoiding rendering anything to the frame buffer and setting +* rotation before commiting to display. +*/ + igt_subtest_f("primary-rotation-90-first") { +igt_require (gen >=9 ); + data.rotation =IGT_ROTATION_90 ; +test_plane_rotation_first (&data,IGT_PLANE_PRIMARY ); + } + igt_subtest_f("primary-rotation-270") {igt_require (gen >=9 ); data.rotation =IGT_ROTATION_270 ;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
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.
So you want to set up the object tiling differently from the fb tiling? Why is that? And don't we reject it in the kernel? If we don't need a fence for scanout (ie. FBC or gen2/3) we could allow it I suppose, but not sure it it really helps with anything.
BTW I was thinking of allowing the test to pass in an already created bo to igt_create_fb to use in some fb->offsets[] tests.
Quoted 110 lines
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Vivek Kasireddy <[email protected]>--- lib/igt_fb.c | 21 ++++++++++++++------- lib/igt_fb.h | 3 ++- tests/kms_flip.c | 3 ++- 3 files changed, 18 insertions(+), 9 deletions(-)lib/igt_fb.c +14
-7@@ -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);lib/igt_fb.h +2
-1@@ -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);tests/kms_flip.c +2
-1@@ -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 ]);Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi,
Quoted 6 lines · Ville Syrjälä
Quoted 5 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Currently object tiling is inferred from the frame buffer modifier and only for legacy X scanout.
Quoted 7 lines
Quoted 2 lines
It is useful to support overriding this selection for certain tests so add the capability.
So you want to set up the object tiling differently from the fb tiling? Why is that? And don't we reject it in the kernel? If we don't need a fence for scanout (ie. FBC or gen2/3) we could allow it I suppose, but not sure it it really helps with anything.
Hm, yes and no. Only different in a sense that currently igt_fb leaves object tiling at linear regardless of the fb modifier tiling. (Apart for the legacy X where it requires that they match.)
I needed a way of having Y tiled fb modifier and Y tiled object to hit a warning in i915_gem_object_get_fence when only the rotated view exists.
Patch series is probably to invasive anyway, especially I did not spend any time evaluating if 2/3 is safe. So hopefully Vivek can refine his version of the testcase which would then be completely confined to kms_rotation_crc.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 18 lines · Tvrtko Ursulin
Hi,
Quoted 6 lines · Ville Syrjälä
Quoted 5 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Currently object tiling is inferred from the frame buffer modifier and only for legacy X scanout.
Quoted 7 lines
Quoted 2 lines
It is useful to support overriding this selection for certain tests so add the capability.
So you want to set up the object tiling differently from the fb tiling? Why is that? And don't we reject it in the kernel? If we don't need a fence for scanout (ie. FBC or gen2/3) we could allow it I suppose, but not sure it it really helps with anything.
Quoted 6 lines
Hm, yes and no. Only different in a sense that currently
igt_fbleaves object tiling at linear regardless of the fb modifier tiling. (Apart for the legacy X where it requires that they match.)I needed a way of having Y tiled fb modifier and Y tiled object to hit a warning in
i915_gem_object_get_fencewhen only the rotated view exists.
Is there a problem of just doing what X tiled did also for Y tiled?
Quoted 9 lines
Patch series is probably to invasive anyway, especially I did not spend any time evaluating if 2/3 is safe. So hopefully Vivek can refine his version of the testcase which would then be completely confined to
kms_rotation_crc.Regards,
Tvrtko
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 19 lines · Ville Syrjälä
Quoted 18 lines · Tvrtko Ursulin
Hi,
Quoted 13 lines · Ville Syrjälä
Quoted 7 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
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.
So you want to set up the object tiling differently from the fb tiling? Why is that? And don't we reject it in the kernel? If we don't need a fence for scanout (ie. FBC or gen2/3) we could allow it I suppose, but not sure it it really helps with anything.
Quoted 8 lines
Quoted 6 lines
Hm, yes and no. Only different in a sense that currently
igt_fbleaves object tiling at linear regardless of the fb modifier tiling. (Apart for the legacy X where it requires that they match.)I needed a way of having Y tiled fb modifier and Y tiled object to hit a warning in
i915_gem_object_get_fencewhen only the rotated view exists.Is there a problem of just doing what X tiled did also for Y tiled?
What do you mean? In the kernel or igt_fb? If latter then it needs to be able to have object tiling as linear by default since that is how fb modifiers were intended to be used - decoupled from obj tiling. Is that what you meant?
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 28 lines · Tvrtko Ursulin
Quoted 26 lines · Ville Syrjälä
Quoted 24 lines · Tvrtko Ursulin
Hi,
Quoted 6 lines · Ville Syrjälä
Quoted 5 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Currently object tiling is inferred from the frame buffer modifier and only for legacy X scanout.
Quoted 7 lines
Quoted 2 lines
It is useful to support overriding this selection for certain tests so add the capability.
So you want to set up the object tiling differently from the fb tiling? Why is that? And don't we reject it in the kernel? If we don't need a fence for scanout (ie. FBC or gen2/3) we could allow it I suppose, but not sure it it really helps with anything.
Hm, yes and no. Only different in a sense that currently
igt_fbleaves object tiling at linear regardless of the fb modifier tiling. (Apart for the legacy X where it requires that they match.)I needed a way of having Y tiled fb modifier and Y tiled object to hit a warning in
i915_gem_object_get_fencewhen only the rotated view exists.
Quoted 6 lines
Quoted 1 line
Is there a problem of just doing what X tiled did also for Y tiled?
What do you mean? In the kernel or
igt_fb? If latter then it needs to be able to have object tiling as linear by default since that is how fb modifiers were intended to be used - decoupled from obj tiling. Is that what you meant?
Just setting obj to Y tiled when fb is Y tiled from igt_fb.
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 29 lines · Ville Syrjälä
Quoted 28 lines · Tvrtko Ursulin
Quoted 26 lines · Ville Syrjälä
Quoted 24 lines · Tvrtko Ursulin
Hi,
Quoted 6 lines · Ville Syrjälä
Quoted 5 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Currently object tiling is inferred from the frame buffer modifier and only for legacy X scanout.
Quoted 7 lines
Quoted 2 lines
It is useful to support overriding this selection for certain tests so add the capability.
So you want to set up the object tiling differently from the fb tiling? Why is that? And don't we reject it in the kernel? If we don't need a fence for scanout (ie. FBC or gen2/3) we could allow it I suppose, but not sure it it really helps with anything.
Hm, yes and no. Only different in a sense that currently
igt_fbleaves object tiling at linear regardless of the fb modifier tiling. (Apart for the legacy X where it requires that they match.)I needed a way of having Y tiled fb modifier and Y tiled object to hit a warning in
i915_gem_object_get_fencewhen only the rotated view exists.
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
Is there a problem of just doing what X tiled did also for Y tiled?
What do you mean? In the kernel or
igt_fb? If latter then it needs to be able to have object tiling as linear by default since that is how fb modifiers were intended to be used - decoupled from obj tiling. Is that what you meant?Just setting obj to Y tiled when fb is Y tiled from
igt_fb.
Right, so I explained that - we want to have Y tiled fb modifier + linear object in the majority of cases, _apart_ from this special test case which tries to hit a WARN_ON on !obj->map_and_fenceable. Which happens when obj tiling is Y, and fb tiling is Y, _and_ no normal VMA exists, just the rotate one.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 igt/kms_rotation_crc: Add a subtest to validate Y-tiled obj + Y fb modifier
In reply to Tvrtko UrsulinThe main goal of this subtest is to verify whether flipping a framebuffer with a Y fb modifier (90/270 degree rotation) and an associated Y-tiled object works or not.
--- tests/kms_rotation_crc.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+)
tests/kms_rotation_crc.c +83 -0
@@ -264,6 +264,83 @@ static void test_plane_rotation(data_t *data, enum igt_plane plane_type)igt_require_f (valid_tests,"no valid crtc/connector combinations found\n" ); } +static void test_plane_rotation_ytiled_obj (data_t *data,enum igt_plane plane_type) +{ +igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd; +int valid_tests =0 ; +igt_output_t *output; +int ret; + +if (plane_type ==IGT_PLANE_PRIMARY || plane_type ==IGT_PLANE_CURSOR ) { +igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + +for_each_connected_output (display, output) { +igt_plane_t *plane; +drmModeModeInfo *mode =igt_output_get_mode (output); +unsigned int w = mode->hdisplay; +unsigned int h = mode->vdisplay; +unsigned int stride, size; +uint32_t gem_handle; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ; + + gem_handle =gem_create (fd, size); + ret =__gem_set_tiling (fd, gem_handle,I915_TILING_Y , stride); +igt_assert (ret ==0 ); + +do_or_die (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data->fb.fb_id)); + + data->fb.width = w; + data->fb.height = h; + data->fb.gem_handle = gem_handle; + data->fb.stride = stride; + data->fb.size = size; + data->fb.tiling = tiling; + data->fb.drm_format = format; + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane)); + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +igt_plane_set_rotation (plane, data->rotation); +paint_squares (data, mode,IGT_ROTATION_0 , plane); +igt_plane_set_fb (plane, &data->fb); + +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); +igt_assert (ret ==0 ); + +kmstest_restore_vt_mode (); +kmstest_set_vt_graphics_mode (); +igt_display_commit2 (display, commit); + + valid_tests++; +igt_remove_fb (fd, &data->fb); +igt_output_set_pipe (output,PIPE_ANY ); + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + } +igt_require_f (valid_tests,"no valid crtc/connector combinations found\n" ); +} + igt_main {data_t data = {};
@@ -345,6 +422,12 @@ igt_maintest_plane_rotation (&data,IGT_PLANE_PRIMARY ); } + igt_subtest_f("primary-rotation-90-Y-tiled") { +igt_require (gen >=9 ); + data.rotation =IGT_ROTATION_90 ; +test_plane_rotation_ytiled_obj (&data,IGT_PLANE_PRIMARY ); + } + igt_fixture {igt_display_fini (&data.display); }
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] igt/kms_rotation_crc: Add a subtest to validate Y-tiled obj + Y fb modifier
Hi,
Quoted 70 lines · Vivek Kasireddy
The main goal of this subtest is to verify whether flipping a framebuffer with a Y fb modifier (90/270 degree rotation) and an associated Y-tiled object works or not.
Cc Tvrtko Ursulin <[email protected]>Signed-off-by Vivek Kasireddy <[email protected]>--- tests/kms_rotation_crc.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+)tests/kms_rotation_crc.c +52
-0@@ -264,6 +264,83 @@ static void test_plane_rotation(data_t *data, enum igt_plane plane_type)igt_require_f (valid_tests,"no valid crtc/connector combinations found\n" ); } +static void test_plane_rotation_ytiled_obj (data_t *data,enum igt_plane plane_type) +{ +igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd; +int valid_tests =0 ; +igt_output_t *output; +int ret; + +if (plane_type ==IGT_PLANE_PRIMARY || plane_type ==IGT_PLANE_CURSOR ) { +igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + +for_each_connected_output (display, output) { +igt_plane_t *plane; +drmModeModeInfo *mode =igt_output_get_mode (output); +unsigned int w = mode->hdisplay; +unsigned int h = mode->vdisplay; +unsigned int stride, size; +uint32_t gem_handle; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ; + + gem_handle =gem_create (fd, size); + ret =__gem_set_tiling (fd, gem_handle,I915_TILING_Y , stride); +igt_assert (ret ==0 ); + +do_or_die (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data->fb.fb_id)); + + data->fb.width = w; + data->fb.height = h; + data->fb.gem_handle = gem_handle; + data->fb.stride = stride; + data->fb.size = size; + data->fb.tiling = tiling; + data->fb.drm_format = format; + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane)); + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); +
tests/kms_rotation_crc.c static void test_plane_rotation(data_t *data, enum igt_plane plane_type) · line 328
Quoted 10 lines
tests/kms_rotation_crc.c +10
-0+igt_plane_set_rotation (plane, data->rotation); +paint_squares (data, mode,IGT_ROTATION_0 , plane); +igt_plane_set_fb (plane, &data->fb); + +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); +igt_assert (ret ==0 );
This manages to trigger the WARN? How come since paint_squares above will have created the normal VMA?
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] igt/kms_rotation_crc: Add a subtest to validate Y-tiled obj + Y fb modifier
Hi Tvrtko,
Quoted 87 lines · On Mon, 19 Oct 2015 11:20:05 +0100 Tvrtko Ursulin…
Hi,
Quoted 83 lines · Vivek Kasireddy
The main goal of this subtest is to verify whether flipping a framebuffer with a Y fb modifier (90/270 degree rotation) and an associated Y-tiled object works or not.
Cc Tvrtko Ursulin <[email protected]>Signed-off-by Vivek Kasireddy <[email protected]>--- tests/kms_rotation_crc.c | 83++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+)
tests/kms_rotation_crc.c +0
-0@@ -264,6 +264,83 @@ static void test_plane_rotation(data_t *data,enum
igt_planeplane_type)igt_require_f(valid_tests, "no valid crtc/connector combinations found\n"); }+static void
test_plane_rotation_ytiled_obj(data_t *data, enum igt_plane plane_type)+{tests/kms_rotation_crc.c +11
-0+igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd; +int valid_tests =0 ; +igt_output_t *output; +int ret; + + if (plane_type == IGT_PLANE_PRIMARY || plane_type ==
IGT_PLANE_CURSOR) {tests/kms_rotation_crc.c +7
-0+igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + +for_each_connected_output (display, output) { +igt_plane_t *plane; + drmModeModeInfo *mode =
igt_output_get_mode(output);tests/kms_rotation_crc.c +6
-0+unsigned int w = mode->hdisplay; +unsigned int h = mode->vdisplay; +unsigned int stride, size; +uint32_t gem_handle; + + for (stride = 512; stride < (w * bpp / 8); stride*= 2)
tests/kms_rotation_crc.c +2
-0+ ; + for (size = 1024*1024; size < stride * h; size *=2)
tests/kms_rotation_crc.c +4
-0+ ; + + gem_handle =gem_create (fd, size); + ret = __gem_set_tiling(fd, gem_handle,
I915_TILING_Y, stride);tests/kms_rotation_crc.c +4
-0+igt_assert (ret ==0 ); + + do_or_die(__kms_addfb(fd, gem_handle, w, h, stride, + format, tiling,
LOCAL_DRM_MODE_FB_MODIFIERS,tests/kms_rotation_crc.c +21
-0+ &data->fb.fb_id)); + + data->fb.width = w; + data->fb.height = h; + data->fb.gem_handle = gem_handle; + data->fb.stride = stride; + data->fb.size = size; + data->fb.tiling = tiling; + data->fb.drm_format = format; + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane)); + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +igt_plane_set_rotation (plane, data->rotation); +paint_squares (data, mode,IGT_ROTATION_0 , plane); +igt_plane_set_fb (plane, &data->fb); + + drmModeObjectSetProperty(fd,
plane->drm_plane->plane_id,
Quoted 8 lines
tests/kms_rotation_crc.c static void test_plane_rotation(data_t *data, enum igt_plane plane_type) · line 328
Quoted 5 lines
tests/kms_rotation_crc.c +5
-0+DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); +igt_assert (ret ==0 );This manages to trigger the WARN? How come since
paint_squaresabove will have created the normal VMA?
Yes, this does trigger the WARN regardless of whether paint_squares is called or not. I am going to have to find out why the normal VMA was not created when paint_squares was called. And, this subtest does not restore the console cleanly which is something I also have to fix.
Thanks,
Vivek
Quoted 4 lines
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] igt/kms_rotation_crc: Add a subtest to validate Y-tiled obj + Y fb modifier
Quoted 101 lines · Vivek Kasireddy
Hi Tvrtko,
Quoted 87 lines · On Mon, 19 Oct 2015 11:20:05 +0100 Tvrtko Ursulin…
Hi,
Quoted 83 lines · Vivek Kasireddy
The main goal of this subtest is to verify whether flipping a framebuffer with a Y fb modifier (90/270 degree rotation) and an associated Y-tiled object works or not.
Cc Tvrtko Ursulin <[email protected]>Signed-off-by Vivek Kasireddy <[email protected]>--- tests/kms_rotation_crc.c | 83++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+)
tests/kms_rotation_crc.c +0
-0@@ -264,6 +264,83 @@ static void test_plane_rotation(data_t *data,enum
igt_planeplane_type)igt_require_f(valid_tests, "no valid crtc/connector combinations found\n"); }+static void
test_plane_rotation_ytiled_obj(data_t *data, enum igt_plane plane_type)+{tests/kms_rotation_crc.c +11
-0+igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd; +int valid_tests =0 ; +igt_output_t *output; +int ret; + + if (plane_type == IGT_PLANE_PRIMARY || plane_type ==
IGT_PLANE_CURSOR) {tests/kms_rotation_crc.c +7
-0+igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + +for_each_connected_output (display, output) { +igt_plane_t *plane; + drmModeModeInfo *mode =
igt_output_get_mode(output);tests/kms_rotation_crc.c +6
-0+unsigned int w = mode->hdisplay; +unsigned int h = mode->vdisplay; +unsigned int stride, size; +uint32_t gem_handle; + + for (stride = 512; stride < (w * bpp / 8); stride*= 2)
tests/kms_rotation_crc.c +2
-0+ ; + for (size = 1024*1024; size < stride * h; size *=2)
tests/kms_rotation_crc.c +4
-0+ ; + + gem_handle =gem_create (fd, size); + ret = __gem_set_tiling(fd, gem_handle,
I915_TILING_Y, stride);tests/kms_rotation_crc.c +4
-0+igt_assert (ret ==0 ); + + do_or_die(__kms_addfb(fd, gem_handle, w, h, stride, + format, tiling,
LOCAL_DRM_MODE_FB_MODIFIERS,tests/kms_rotation_crc.c +21
-0+ &data->fb.fb_id)); + + data->fb.width = w; + data->fb.height = h; + data->fb.gem_handle = gem_handle; + data->fb.stride = stride; + data->fb.size = size; + data->fb.tiling = tiling; + data->fb.drm_format = format; + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane)); + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +igt_plane_set_rotation (plane, data->rotation); +paint_squares (data, mode,IGT_ROTATION_0 , plane); +igt_plane_set_fb (plane, &data->fb); + + drmModeObjectSetProperty(fd,
plane->drm_plane->plane_id,Quoted 8 lines
tests/kms_rotation_crc.c static void test_plane_rotation(data_t *data, enum igt_plane plane_type) · line 328
Quoted 5 lines
tests/kms_rotation_crc.c +5
-0+DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); +igt_assert (ret ==0 );This manages to trigger the WARN? How come since
paint_squaresabove will have created the normal VMA?
Quoted 4 lines
Yes, this does trigger the WARN regardless of whether
paint_squaresis called or not. I am going to have to find out why the normal VMA was not created whenpaint_squareswas called. And, this subtest does not restore the console cleanly which is something I also have to fix.
Could be that normal VMA is not created in the Cairo rendering path for Y tiled buffers. Since the final rendering is done via a blit and if you have PPGTT that would do it I think.
If PPGTT is always true for gen9 then this could work.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] igt/kms_rotation_crc: Add a subtest to validate Y-tiled obj + Y fb modifier
Quoted 111 lines · On Tue, 20 Oct 2015 10:10:20 +0100 Tvrtko Ursulin…
Quoted 103 lines · Vivek Kasireddy
Hi Tvrtko,
Quoted 89 lines · On Mon, 19 Oct 2015 11:20:05 +0100 Tvrtko Ursulin…
Hi,
Quoted 85 lines · Vivek Kasireddy
The main goal of this subtest is to verify whether flipping a framebuffer with a Y fb modifier (90/270 degree rotation) and an associated Y-tiled object works or not.
Cc Tvrtko Ursulin <[email protected]>Signed-off-by Vivek Kasireddy <[email protected]>--- tests/kms_rotation_crc.c | 83++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+)
tests/kms_rotation_crc.c +0
-0@@ -264,6 +264,83 @@ static void test_plane_rotation(data_t *data,enum
igt_planeplane_type)igt_require_f(valid_tests, "no valid crtc/connector combinations found\n"); }+static void
test_plane_rotation_ytiled_obj(data_t *data, enum igt_plane plane_type)+{tests/kms_rotation_crc.c +11
-0+igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd; +int valid_tests =0 ; +igt_output_t *output; +int ret; + + if (plane_type == IGT_PLANE_PRIMARY || plane_type ==
IGT_PLANE_CURSOR) {tests/kms_rotation_crc.c +7
-0+igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + +for_each_connected_output (display, output) { +igt_plane_t *plane; + drmModeModeInfo *mode =
igt_output_get_mode(output);tests/kms_rotation_crc.c +6
-0+unsigned int w = mode->hdisplay; +unsigned int h = mode->vdisplay; +unsigned int stride, size; +uint32_t gem_handle; + + for (stride = 512; stride < (w * bpp / 8); stride*= 2)
tests/kms_rotation_crc.c +2
-0+ ; + for (size = 1024*1024; size < stride * h; size *=2)
tests/kms_rotation_crc.c +4
-0+ ; + + gem_handle =gem_create (fd, size); + ret = __gem_set_tiling(fd, gem_handle,
I915_TILING_Y, stride);tests/kms_rotation_crc.c +3
-0+igt_assert (ret ==0 ); + + do_or_die(__kms_addfb(fd, gem_handle, w, h,stride,
tests/kms_rotation_crc.c +1
-0+ format, tiling,
LOCAL_DRM_MODE_FB_MODIFIERS,tests/kms_rotation_crc.c +21
-0+ &data->fb.fb_id)); + + data->fb.width = w; + data->fb.height = h; + data->fb.gem_handle = gem_handle; + data->fb.stride = stride; + data->fb.size = size; + data->fb.tiling = tiling; + data->fb.drm_format = format; + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane)); + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +igt_plane_set_rotation (plane, data->rotation); +paint_squares (data, mode,IGT_ROTATION_0 , plane); +igt_plane_set_fb (plane, &data->fb); + + drmModeObjectSetProperty(fd,
plane->drm_plane->plane_id,tests/kms_rotation_crc.c +1
-0+ DRM_MODE_OBJECT_PLANE,Quoted 8 lines
tests/kms_rotation_crc.c static void test_plane_rotation(data_t *data, enum igt_plane plane_type) · line 328
Quoted 5 lines
+
plane->rotation_property,tests/kms_rotation_crc.c +3
-0+ plane->rotation); + ret =igt_display_try_commit2 (display, commit); +igt_assert (ret ==0 );This manages to trigger the WARN? How come since
paint_squaresabove will have created the normal VMA?Quoted 5 lines
Yes, this does trigger the WARN regardless of whether
paint_squaresis called or not. I am going to have to find out why the normal VMA was not created whenpaint_squareswas called. And, this subtest does not restore the console cleanly which is something I also have to fix.
Quoted 5 lines
Could be that normal VMA is not created in the Cairo rendering path for Y tiled buffers. Since the final rendering is done via a blit and if you have PPGTT that would do it I think.
If PPGTT is always true for gen9 then this could work.
Hi Tvrtko,
Yes, I see that PPGTT is always true for gen9 and perhaps the reason why the normal VMA is not created. Do you suggest that I get rid of the call to paint_squares and further simplify the test by just flipping the fb to only one output?
Thanks and Regards,
Vivek
Quoted 4 lines
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 igt/kms_rotation_crc: Add a subtest to validate Y-tiled obj + Y fb modifier (v2)
In reply to Tvrtko UrsulinThe main goal of this subtest is to verify whether flipping a framebuffer with a Y fb modifier (90/270 degree rotation) and with an associated Y-tiled object works or not.
v2: Do not call paint_squares and just use one output.
--- tests/kms_rotation_crc.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+)
tests/kms_rotation_crc.c +73 -0
@@ -264,6 +264,73 @@ static void test_plane_rotation(data_t *data, enum igt_plane plane_type)igt_require_f (valid_tests,"no valid crtc/connector combinations found\n" ); } +static void test_plane_rotation_ytiled_obj (data_t *data,enum igt_plane plane_type) +{ +igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd; +int valid_tests =0 ; +igt_output_t *output = &display->outputs[0 ]; +int ret; + +if (plane_type ==IGT_PLANE_PRIMARY || plane_type ==IGT_PLANE_CURSOR ) { +igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + +if (output && output->valid) { +igt_plane_t *plane; +drmModeModeInfo *mode =igt_output_get_mode (output); +unsigned int w = mode->hdisplay; +unsigned int h = mode->vdisplay; +unsigned int stride, size; +uint32_t gem_handle; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ; + + gem_handle =gem_create (fd, size); + ret =__gem_set_tiling (fd, gem_handle,I915_TILING_Y , stride); +igt_assert (ret ==0 ); + +do_or_die (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data->fb.fb_id)); + data->fb.width = w; + data->fb.height = h; + data->fb.gem_handle = gem_handle; + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane)); + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +igt_plane_set_rotation (plane, data->rotation); +igt_plane_set_fb (plane, &data->fb); + +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); + +kmstest_restore_vt_mode (); +kmstest_set_vt_graphics_mode (); + +igt_remove_fb (fd, &data->fb); +igt_assert (ret ==0 ); + + valid_tests++; + } +igt_require_f (valid_tests,"no valid output found\n" ); +} + igt_main {data_t data = {};
@@ -345,6 +412,12 @@ igt_maintest_plane_rotation (&data,IGT_PLANE_PRIMARY ); } + igt_subtest_f("primary-rotation-90-Y-tiled") { +igt_require (gen >=9 ); + data.rotation =IGT_ROTATION_90 ; +test_plane_rotation_ytiled_obj (&data,IGT_PLANE_PRIMARY ); + } + igt_fixture {igt_display_fini (&data.display); }
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] igt/kms_rotation_crc: Add a subtest to validate Y-tiled obj + Y fb modifier (v2)
Hi,
Quoted 1 line · Vivek Kasireddy
The main goal of this subtest is to verify whether flipping a
Need to change to commit message since there is no flipping involved.
Quoted 2 lines
framebuffer with a Y fb modifier (90/270 degree rotation) and with an associated Y-tiled object works or not.
And also explain in more detail the requirement to not have a normal VMA before the rotated one is displayed.
Quoted 24 lines
v2: Do not call
paint_squaresand just use one output.Cc Tvrtko Ursulin <[email protected]>Signed-off-by Vivek Kasireddy <[email protected]>--- tests/kms_rotation_crc.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+)tests/kms_rotation_crc.c +8
-0@@ -264,6 +264,73 @@ static void test_plane_rotation(data_t *data, enum igt_plane plane_type)igt_require_f (valid_tests,"no valid crtc/connector combinations found\n" ); } +static void test_plane_rotation_ytiled_obj (data_t *data,enum igt_plane plane_type) +{ +igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd;
tests/kms_rotation_crc.c static void test_plane_rotation(data_t *data, enum igt_plane plane_type) · line 284
Quoted 10 lines
tests/kms_rotation_crc.c +10
-0+int valid_tests =0 ; +igt_output_t *output = &display->outputs[0 ]; +int ret; + +if (plane_type ==IGT_PLANE_PRIMARY || plane_type ==IGT_PLANE_CURSOR ) { +igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + +if (output && output->valid) {
How about getting rid of this indentation level and valid_tests by just doing igt_require on the condition above?
Quoted 15 lines
tests/kms_rotation_crc.c +15
-0+igt_plane_t *plane; +drmModeModeInfo *mode =igt_output_get_mode (output); +unsigned int w = mode->hdisplay; +unsigned int h = mode->vdisplay; +unsigned int stride, size; +uint32_t gem_handle; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ; + + gem_handle =gem_create (fd, size); + ret =__gem_set_tiling (fd, gem_handle,I915_TILING_Y , stride); +igt_assert (ret ==0 );
tests/kms_rotation_crc.c static void test_plane_rotation(data_t *data, enum igt_plane plane_type) · line 309
Quoted 10 lines
tests/kms_rotation_crc.c +10
-0+ +do_or_die (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data->fb.fb_id)); + data->fb.width = w; + data->fb.height = h; + data->fb.gem_handle = gem_handle; + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane));
This would maybe be cleaner above the fb allocation, to group all the asserts together.
Otherwise looks fine to me.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 igt/kms_rotation_crc: Add a subtest to validate Y-tiled obj + Y fb modifier (v3)
The main goal of this subtest is to trigger the following warning in the function i915_gem_object_get_fence():
if (WARN_ON(!obj->map_and_fenceable))
To trigger this warning, the subtest first creates a Y-tiled object and an associated framebuffer with the Y-fb modifier. Furthermore, to prevent the map_and_fenceable from being set, we make sure that the object does not have a normal VMA by refraining from rendering to the object and by setting the rotation property upfront before calling commit.
v2: Do not call paint_squares and just use one output.
v3: Convert an if condition to igt_require and move the plane rotation requirement further up before the fb allocation.
--- tests/kms_rotation_crc.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+)
tests/kms_rotation_crc.c +68 -0
@@ -264,6 +264,68 @@ static void test_plane_rotation(data_t *data, enum igt_plane plane_type)igt_require_f (valid_tests,"no valid crtc/connector combinations found\n" ); } +static void test_plane_rotation_ytiled_obj (data_t *data,enum igt_plane plane_type) +{ +igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd; +igt_output_t *output = &display->outputs[0 ]; +igt_plane_t *plane; +drmModeModeInfo *mode; +unsigned int stride, size, w, h; +uint32_t gem_handle; +int ret; + +igt_require (output !=NULL && output->valid == true); + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane)); + +if (plane_type ==IGT_PLANE_PRIMARY || plane_type ==IGT_PLANE_CURSOR ) { +igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + + mode =igt_output_get_mode (output); + w = mode->hdisplay; + h = mode->vdisplay; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ; + + gem_handle =gem_create (fd, size); + ret =__gem_set_tiling (fd, gem_handle,I915_TILING_Y , stride); +igt_assert (ret ==0 ); + +do_or_die (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data->fb.fb_id)); + data->fb.width = w; + data->fb.height = h; + data->fb.gem_handle = gem_handle; + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +igt_plane_set_rotation (plane, data->rotation); +igt_plane_set_fb (plane, &data->fb); + +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); + +kmstest_restore_vt_mode (); +igt_remove_fb (fd, &data->fb); +igt_assert (ret ==0 ); +} + igt_main {data_t data = {};
@@ -345,6 +407,12 @@ igt_maintest_plane_rotation (&data,IGT_PLANE_PRIMARY ); } + igt_subtest_f("primary-rotation-90-Y-tiled") { +igt_require (gen >=9 ); + data.rotation =IGT_ROTATION_90 ; +test_plane_rotation_ytiled_obj (&data,IGT_PLANE_PRIMARY ); + } + igt_fixture {igt_display_fini (&data.display); }
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] igt/kms_rotation_crc: Add a subtest to validate Y-tiled obj + Y fb modifier (v3)
Hi,
Quoted 98 lines · Vivek Kasireddy
The main goal of this subtest is to trigger the following warning in the function
i915_gem_object_get_fence():if (WARN_ON(!obj->map_and_fenceable))To trigger this warning, the subtest first creates a Y-tiled object and an associated framebuffer with the Y-fb modifier. Furthermore, to prevent the
map_and_fenceablefrom being set, we make sure that the object does not have a normal VMA by refraining from rendering to the object and by setting the rotation property upfront before calling commit.v2: Do not call
paint_squaresand just use one output.v3: Convert an if condition to
igt_requireand move the plane rotation requirement further up before the fb allocation.Cc Tvrtko Ursulin <[email protected]>Signed-off-by Vivek Kasireddy <[email protected]>--- tests/kms_rotation_crc.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+)tests/kms_rotation_crc.c +62
-0@@ -264,6 +264,68 @@ static void test_plane_rotation(data_t *data, enum igt_plane plane_type)igt_require_f (valid_tests,"no valid crtc/connector combinations found\n" ); } +static void test_plane_rotation_ytiled_obj (data_t *data,enum igt_plane plane_type) +{ +igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd; +igt_output_t *output = &display->outputs[0 ]; +igt_plane_t *plane; +drmModeModeInfo *mode; +unsigned int stride, size, w, h; +uint32_t gem_handle; +int ret; + +igt_require (output !=NULL && output->valid == true); + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane)); + +if (plane_type ==IGT_PLANE_PRIMARY || plane_type ==IGT_PLANE_CURSOR ) { +igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + + mode =igt_output_get_mode (output); + w = mode->hdisplay; + h = mode->vdisplay; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ; + + gem_handle =gem_create (fd, size); + ret =__gem_set_tiling (fd, gem_handle,I915_TILING_Y , stride); +igt_assert (ret ==0 ); + +do_or_die (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data->fb.fb_id)); + data->fb.width = w; + data->fb.height = h; + data->fb.gem_handle = gem_handle; + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +igt_plane_set_rotation (plane, data->rotation); +igt_plane_set_fb (plane, &data->fb); + +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); + +kmstest_restore_vt_mode (); +igt_remove_fb (fd, &data->fb); +igt_assert (ret ==0 ); +} + igt_main {data_t data = {};@@ -345,6 +407,12 @@ igt_maintest_plane_rotation (&data,IGT_PLANE_PRIMARY ); }
tests/kms_rotation_crc.c igt_main · line 418
Quoted 10 lines
tests/kms_rotation_crc.c +6
-0+ igt_subtest_f("primary-rotation-90-Y-tiled") { +igt_require (gen >=9 ); + data.rotation =IGT_ROTATION_90 ; +test_plane_rotation_ytiled_obj (&data,IGT_PLANE_PRIMARY ); + } + igt_fixture {igt_display_fini (&data.display); }
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedRe: [PATCH] igt/kms_rotation_crc: Add a subtest to validate Y-tiled obj + Y fb modifier (v3)
Quoted 102 lines · Tvrtko Ursulin
Hi,
Quoted 98 lines · Vivek Kasireddy
The main goal of this subtest is to trigger the following warning in the function
i915_gem_object_get_fence():if (WARN_ON(!obj->map_and_fenceable))To trigger this warning, the subtest first creates a Y-tiled object and an associated framebuffer with the Y-fb modifier. Furthermore, to prevent the
map_and_fenceablefrom being set, we make sure that the object does not have a normal VMA by refraining from rendering to the object and by setting the rotation property upfront before calling commit.v2: Do not call
paint_squaresand just use one output.v3: Convert an if condition to
igt_requireand move the plane rotation requirement further up before the fb allocation.Cc Tvrtko Ursulin <[email protected]>Signed-off-by Vivek Kasireddy <[email protected]>--- tests/kms_rotation_crc.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+)tests/kms_rotation_crc.c +62
-0@@ -264,6 +264,68 @@ static void test_plane_rotation(data_t *data, enum igt_plane plane_type)igt_require_f (valid_tests,"no valid crtc/connector combinations found\n" ); } +static void test_plane_rotation_ytiled_obj (data_t *data,enum igt_plane plane_type) +{ +igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd; +igt_output_t *output = &display->outputs[0 ]; +igt_plane_t *plane; +drmModeModeInfo *mode; +unsigned int stride, size, w, h; +uint32_t gem_handle; +int ret; + +igt_require (output !=NULL && output->valid == true); + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane)); + +if (plane_type ==IGT_PLANE_PRIMARY || plane_type ==IGT_PLANE_CURSOR ) { +igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + + mode =igt_output_get_mode (output); + w = mode->hdisplay; + h = mode->vdisplay; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ; + + gem_handle =gem_create (fd, size); + ret =__gem_set_tiling (fd, gem_handle,I915_TILING_Y , stride); +igt_assert (ret ==0 ); + +do_or_die (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data->fb.fb_id)); + data->fb.width = w; + data->fb.height = h; + data->fb.gem_handle = gem_handle; + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +igt_plane_set_rotation (plane, data->rotation); +igt_plane_set_fb (plane, &data->fb); + +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); + +kmstest_restore_vt_mode (); +igt_remove_fb (fd, &data->fb); +igt_assert (ret ==0 ); +} + igt_main {data_t data = {};@@ -345,6 +407,12 @@ igt_maintest_plane_rotation (&data,IGT_PLANE_PRIMARY ); }
Quoted 12 lines
tests/kms_rotation_crc.c igt_main · line 418
Quoted 10 lines
tests/kms_rotation_crc.c +6
-0+ igt_subtest_f("primary-rotation-90-Y-tiled") { +igt_require (gen >=9 ); + data.rotation =IGT_ROTATION_90 ; +test_plane_rotation_ytiled_obj (&data,IGT_PLANE_PRIMARY ); + } + igt_fixture {igt_display_fini (&data.display); }Reviewed-by Tvrtko Ursulin <[email protected]>
Applied, thanks.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] igt/kms_rotation_crc: Add a subtest to validate Y-tiled obj + Y fb modifier (v3)
Quoted 122 lines · On Fri, 23 Oct 2015 13:35:21 +0200 Daniel Vetter <[email protected]> wrote:
Quoted 107 lines · Tvrtko Ursulin
Hi,
Quoted 103 lines · Vivek Kasireddy
The main goal of this subtest is to trigger the following warning in the function
i915_gem_object_get_fence():if (WARN_ON(!obj->map_and_fenceable))To trigger this warning, the subtest first creates a Y-tiled object and an associated framebuffer with the Y-fb modifier. Furthermore, to prevent the
map_and_fenceablefrom being set, we make sure that the object does not have a normal VMA by refraining from rendering to the object and by setting the rotation property upfront before calling commit.v2: Do not call
paint_squaresand just use one output.v3: Convert an if condition to
igt_requireand move the plane rotation requirement further up before the fb allocation.Cc Tvrtko Ursulin <[email protected]>Signed-off-by Vivek Kasireddy <[email protected]>--- tests/kms_rotation_crc.c | 68++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+)
tests/kms_rotation_crc.c +35
-0@@ -264,6 +264,68 @@ static void test_plane_rotation(data_t *data, enum igt_plane plane_type) igt_require_f(valid_tests, "no valid crtc/connector combinations found\n"); } +static void test_plane_rotation_ytiled_obj (data_t *data,enum igt_plane plane_type) +{ + igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd; +igt_output_t *output = &display->outputs[0 ]; +igt_plane_t *plane; +drmModeModeInfo *mode; +unsigned int stride, size, w, h; +uint32_t gem_handle; +int ret; + + igt_require(output != NULL && output->valid == true); + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane )); + + if (plane_type == IGT_PLANE_PRIMARY || plane_type == IGT_PLANE_CURSOR) { +igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + + mode =igt_output_get_mode (output); + w = mode->hdisplay; + h = mode->vdisplay; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ; + + gem_handle =gem_create (fd, size); + ret = __gem_set_tiling(fd, gem_handle, I915_TILING_Y,stride);
tests/kms_rotation_crc.c +26
-0+igt_assert (ret ==0 ); + +do_or_die (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data->fb.fb_id)); + data->fb.width = w; + data->fb.height = h; + data->fb.gem_handle = gem_handle; + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +igt_plane_set_rotation (plane, data->rotation); +igt_plane_set_fb (plane, &data->fb); + +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); + +kmstest_restore_vt_mode (); +igt_remove_fb (fd, &data->fb); +igt_assert (ret ==0 ); +} + igt_main {data_t data = {};@@ -345,6 +407,12 @@ igt_maintest_plane_rotation (&data,IGT_PLANE_PRIMARY ); }Quoted 13 lines
Quoted 11 lines
tests/kms_rotation_crc.c +6
-0+ igt_subtest_f("primary-rotation-90-Y-tiled") { +igt_require (gen >=9 ); + data.rotation =IGT_ROTATION_90 ; +test_plane_rotation_ytiled_obj (&data,IGT_PLANE_PRIMARY ); + } + igt_fixture {igt_display_fini (&data.display);}
Reviewed-by Tvrtko Ursulin <[email protected]>
Quoted 2 lines
Applied, thanks.
-Daniel
Hi Daniel,
Not sure whether Tvrtko or Chris have any futher comments on the fix for this bug but do you have any comments?
This was the fix:
http://lists.freedesktop.org/archives/intel-gfx/2015-September/076183.html
Thanks and Regards,
Vivek
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] igt/kms_rotation_crc: Add a subtest to validate Y-tiled obj + Y fb modifier (v3)
In reply to Daniel VetterQuoted 116 lines · Daniel Vetter
Quoted 102 lines · Tvrtko Ursulin
Hi,
Quoted 98 lines · Vivek Kasireddy
The main goal of this subtest is to trigger the following warning in the function
i915_gem_object_get_fence():if (WARN_ON(!obj->map_and_fenceable))To trigger this warning, the subtest first creates a Y-tiled object and an associated framebuffer with the Y-fb modifier. Furthermore, to prevent the
map_and_fenceablefrom being set, we make sure that the object does not have a normal VMA by refraining from rendering to the object and by setting the rotation property upfront before calling commit.v2: Do not call
paint_squaresand just use one output.v3: Convert an if condition to
igt_requireand move the plane rotation requirement further up before the fb allocation.Cc Tvrtko Ursulin <[email protected]>Signed-off-by Vivek Kasireddy <[email protected]>--- tests/kms_rotation_crc.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+)tests/kms_rotation_crc.c +62
-0@@ -264,6 +264,68 @@ static void test_plane_rotation(data_t *data, enum igt_plane plane_type)igt_require_f (valid_tests,"no valid crtc/connector combinations found\n" ); } +static void test_plane_rotation_ytiled_obj (data_t *data,enum igt_plane plane_type) +{ +igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd; +igt_output_t *output = &display->outputs[0 ]; +igt_plane_t *plane; +drmModeModeInfo *mode; +unsigned int stride, size, w, h; +uint32_t gem_handle; +int ret; + +igt_require (output !=NULL && output->valid == true); + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane)); + +if (plane_type ==IGT_PLANE_PRIMARY || plane_type ==IGT_PLANE_CURSOR ) { +igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + + mode =igt_output_get_mode (output); + w = mode->hdisplay; + h = mode->vdisplay; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ; + + gem_handle =gem_create (fd, size); + ret =__gem_set_tiling (fd, gem_handle,I915_TILING_Y , stride); +igt_assert (ret ==0 ); + +do_or_die (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data->fb.fb_id)); + data->fb.width = w; + data->fb.height = h; + data->fb.gem_handle = gem_handle; + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +igt_plane_set_rotation (plane, data->rotation); +igt_plane_set_fb (plane, &data->fb); + +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); + +kmstest_restore_vt_mode (); +igt_remove_fb (fd, &data->fb); +igt_assert (ret ==0 ); +} + igt_main {data_t data = {};@@ -345,6 +407,12 @@ igt_maintest_plane_rotation (&data,IGT_PLANE_PRIMARY ); }Quoted 12 lines
tests/kms_rotation_crc.c igt_main · line 418
Quoted 10 lines
tests/kms_rotation_crc.c +6
-0+ igt_subtest_f("primary-rotation-90-Y-tiled") { +igt_require (gen >=9 ); + data.rotation =IGT_ROTATION_90 ; +test_plane_rotation_ytiled_obj (&data,IGT_PLANE_PRIMARY ); + } + igt_fixture {igt_display_fini (&data.display); }Reviewed-by Tvrtko Ursulin <[email protected]>
Quoted 1 line
Applied, thanks.
Hasn't hit the repo yet.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 igt/kms_rotation_crc: Add a subtest to validate Y-tiled obj + Y fb modifier (v4)
The main goal of this subtest is to trigger the following warning in the function i915_gem_object_get_fence():
if (WARN_ON(!obj->map_and_fenceable))
To trigger this warning, the subtest first creates a Y-tiled object and an associated framebuffer with the Y-fb modifier. Furthermore, to prevent the map_and_fenceable from being set, we make sure that the object does not have a normal VMA by refraining from rendering to the object and by setting the rotation property upfront before calling commit.
v2: Do not call paint_squares and just use one output.
v3: Convert an if condition to igt_require and move the plane rotation requirement further up before the fb allocation.
v4: After setting rotation to 90 and committing, change the rotation to 0 and commit once more. This is to test if the i915 driver hits any warnings while pinning and unpinning an object that has both normal and rotated views.
--- tests/kms_rotation_crc.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+)
tests/kms_rotation_crc.c +84 -0
@@ -264,6 +264,84 @@ static void test_plane_rotation(data_t *data, enum igt_plane plane_type)igt_require_f (valid_tests,"no valid crtc/connector combinations found\n" ); } +static void test_plane_rotation_ytiled_obj (data_t *data,enum igt_plane plane_type) +{ +igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd; +igt_output_t *output = &display->outputs[0 ]; +igt_plane_t *plane; +drmModeModeInfo *mode; +unsigned int stride, size, w, h; +uint32_t gem_handle; +int ret; + +igt_require (output !=NULL && output->valid == true); + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane)); + +if (plane_type ==IGT_PLANE_PRIMARY || plane_type ==IGT_PLANE_CURSOR ) { +igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + + mode =igt_output_get_mode (output); + w = mode->hdisplay; + h = mode->vdisplay; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ; + + gem_handle =gem_create (fd, size); + ret =__gem_set_tiling (fd, gem_handle,I915_TILING_Y , stride); +igt_assert (ret ==0 ); + +do_or_die (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data->fb.fb_id)); + data->fb.width = w; + data->fb.height = h; + data->fb.gem_handle = gem_handle; + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +igt_plane_set_rotation (plane, data->rotation); +igt_plane_set_fb (plane, &data->fb); + +/* +* Set the rotation property before commit to make sure the object +* only has a rotated view. +*/ +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); + + +/* +* We set the rotation to 0 so that the underlying object will now +* have a normal view. +*/ +igt_plane_set_rotation (plane,IGT_ROTATION_0 ); +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); + +kmstest_restore_vt_mode (); +igt_remove_fb (fd, &data->fb); +igt_assert (ret ==0 ); +} + igt_main {data_t data = {};
@@ -345,6 +423,12 @@ igt_maintest_plane_rotation (&data,IGT_PLANE_PRIMARY ); } + igt_subtest_f("primary-rotation-90-Y-tiled") { +igt_require (gen >=9 ); + data.rotation =IGT_ROTATION_90 ; +test_plane_rotation_ytiled_obj (&data,IGT_PLANE_PRIMARY ); + } + igt_fixture {igt_display_fini (&data.display); }
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] igt/kms_rotation_crc: Add a subtest to validate Y-tiled obj + Y fb modifier (v4)
Quoted 119 lines · Vivek Kasireddy
The main goal of this subtest is to trigger the following warning in the function
i915_gem_object_get_fence():if (WARN_ON(!obj->map_and_fenceable))To trigger this warning, the subtest first creates a Y-tiled object and an associated framebuffer with the Y-fb modifier. Furthermore, to prevent the
map_and_fenceablefrom being set, we make sure that the object does not have a normal VMA by refraining from rendering to the object and by setting the rotation property upfront before calling commit.v2: Do not call
paint_squaresand just use one output.v3: Convert an if condition to
igt_requireand move the plane rotation requirement further up before the fb allocation.v4: After setting rotation to 90 and committing, change the rotation to 0 and commit once more. This is to test if the i915 driver hits any warnings while pinning and unpinning an object that has both normal and rotated views.
Cc Tvrtko Ursulin <[email protected]>Signed-off-by Vivek Kasireddy <[email protected]>--- tests/kms_rotation_crc.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+)tests/kms_rotation_crc.c +78
-0@@ -264,6 +264,84 @@ static void test_plane_rotation(data_t *data, enum igt_plane plane_type)igt_require_f (valid_tests,"no valid crtc/connector combinations found\n" ); } +static void test_plane_rotation_ytiled_obj (data_t *data,enum igt_plane plane_type) +{ +igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd; +igt_output_t *output = &display->outputs[0 ]; +igt_plane_t *plane; +drmModeModeInfo *mode; +unsigned int stride, size, w, h; +uint32_t gem_handle; +int ret; + +igt_require (output !=NULL && output->valid == true); + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane)); + +if (plane_type ==IGT_PLANE_PRIMARY || plane_type ==IGT_PLANE_CURSOR ) { +igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + + mode =igt_output_get_mode (output); + w = mode->hdisplay; + h = mode->vdisplay; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ; + + gem_handle =gem_create (fd, size); + ret =__gem_set_tiling (fd, gem_handle,I915_TILING_Y , stride); +igt_assert (ret ==0 ); + +do_or_die (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data->fb.fb_id)); + data->fb.width = w; + data->fb.height = h; + data->fb.gem_handle = gem_handle; + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +igt_plane_set_rotation (plane, data->rotation); +igt_plane_set_fb (plane, &data->fb); + +/* +* Set the rotation property before commit to make sure the object +* only has a rotated view. +*/ +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); + + +/* +* We set the rotation to 0 so that the underlying object will now +* have a normal view. +*/ +igt_plane_set_rotation (plane,IGT_ROTATION_0 ); +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); + +kmstest_restore_vt_mode (); +igt_remove_fb (fd, &data->fb); +igt_assert (ret ==0 ); +} + igt_main {data_t data = {};@@ -345,6 +423,12 @@ igt_maintest_plane_rotation (&data,IGT_PLANE_PRIMARY ); }
tests/kms_rotation_crc.c igt_main · line 434
Quoted 10 lines
tests/kms_rotation_crc.c +6
-0+ igt_subtest_f("primary-rotation-90-Y-tiled") { +igt_require (gen >=9 ); + data.rotation =IGT_ROTATION_90 ; +test_plane_rotation_ytiled_obj (&data,IGT_PLANE_PRIMARY ); + } + igt_fixture {igt_display_fini (&data.display); }
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 igt/kms_rotation_crc: Add a subtest to validate Y-tiled obj + Y fb modifier (v5)
The main goal of this subtest is to trigger the following warning in the function i915_gem_object_get_fence():
if (WARN_ON(!obj->map_and_fenceable))
To trigger this warning, the subtest first creates a Y-tiled object and an associated framebuffer with the Y-fb modifier. Furthermore, to prevent the map_and_fenceable from being set, we make sure that the object does not have a normal VMA by refraining from rendering to the object and by setting the rotation property upfront before calling commit.
v2: Do not call paint_squares and just use one output.
v3: Convert an if condition to igt_require and move the plane rotation requirement further up before the fb allocation.
v4: After setting rotation to 90 and committing, change the rotation to 0 and commit once more. This is to test if the i915 driver hits any warnings while pinning and unpinning an object that has both normal and rotated views.
v5:
- Add another subtest to toggle the order of rotation
- Exhaustively test the i915 driver's pinning and unpinning code paths for any fence leaks by iterating until MAX available fences.
--- tests/kms_rotation_crc.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+)
tests/kms_rotation_crc.c +84 -0
@@ -264,6 +264,80 @@ static void test_plane_rotation(data_t *data, enum igt_plane plane_type)igt_require_f (valid_tests,"no valid crtc/connector combinations found\n" ); } +static void test_plane_rotation_ytiled_obj (data_t *data,enum igt_plane plane_type, +int toggle) +{ +igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd; +igt_output_t *output = &display->outputs[0 ]; +igt_plane_t *plane; +drmModeModeInfo *mode; +unsigned int stride, size, w, h; +uint32_t gem_handle; +int num_fences =gem_available_fences (fd); +int i, ret; + +igt_require (output !=NULL && output->valid == true); + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane)); + +if (plane_type ==IGT_PLANE_PRIMARY || plane_type ==IGT_PLANE_CURSOR ) { +igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + + mode =igt_output_get_mode (output); + w = mode->hdisplay; + h = mode->vdisplay; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ; + + gem_handle =gem_create (fd, size); + ret =__gem_set_tiling (fd, gem_handle,I915_TILING_Y , stride); +igt_assert (ret ==0 ); + +do_or_die (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data->fb.fb_id)); + data->fb.width = w; + data->fb.height = h; + data->fb.gem_handle = gem_handle; + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +igt_plane_set_fb (plane, &data->fb); + +for (i =0 ; i < num_fences +1 ; i++) { +igt_plane_set_rotation (plane, toggle ?IGT_ROTATION_0 :IGT_ROTATION_90 ); +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); +igt_assert (ret ==0 ); + +igt_plane_set_rotation (plane, toggle ?IGT_ROTATION_90 :IGT_ROTATION_0 ); +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); +igt_assert (ret ==0 ); + } + +kmstest_restore_vt_mode (); +igt_remove_fb (fd, &data->fb); +} + igt_main {data_t data = {};
@@ -345,6 +419,16 @@ igt_maintest_plane_rotation (&data,IGT_PLANE_PRIMARY ); } + igt_subtest_f("primary-rotation-90-to-0-Y-tiled") { +igt_require (gen >=9 ); +test_plane_rotation_ytiled_obj (&data,IGT_PLANE_PRIMARY ,0 ); + } + + igt_subtest_f("primary-rotation-0-to-90-Y-tiled") { +igt_require (gen >=9 ); +test_plane_rotation_ytiled_obj (&data,IGT_PLANE_PRIMARY ,1 ); + } + igt_fixture {igt_display_fini (&data.display); }
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] igt/kms_rotation_crc: Add a subtest to validate Y-tiled obj + Y fb modifier (v5)
Quoted 98 lines · Vivek Kasireddy
The main goal of this subtest is to trigger the following warning in the function
i915_gem_object_get_fence():if (WARN_ON(!obj->map_and_fenceable))To trigger this warning, the subtest first creates a Y-tiled object and an associated framebuffer with the Y-fb modifier. Furthermore, to prevent the
map_and_fenceablefrom being set, we make sure that the object does not have a normal VMA by refraining from rendering to the object and by setting the rotation property upfront before calling commit.v2: Do not call
paint_squaresand just use one output.v3: Convert an if condition to
igt_requireand move the plane rotation requirement further up before the fb allocation.v4: After setting rotation to 90 and committing, change the rotation to 0 and commit once more. This is to test if the i915 driver hits any warnings while pinning and unpinning an object that has both normal and rotated views.
v5:
- Add another subtest to toggle the order of rotation
- Exhaustively test the i915 driver's pinning and unpinning code paths for any fence leaks by iterating until MAX available fences.Cc Tvrtko Ursulin <[email protected]>Signed-off-by Vivek Kasireddy <[email protected]>--- tests/kms_rotation_crc.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+)tests/kms_rotation_crc.c +59
-0@@ -264,6 +264,80 @@ static void test_plane_rotation(data_t *data, enum igt_plane plane_type)igt_require_f (valid_tests,"no valid crtc/connector combinations found\n" ); } +static void test_plane_rotation_ytiled_obj (data_t *data,enum igt_plane plane_type, +int toggle) +{ +igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd; +igt_output_t *output = &display->outputs[0 ]; +igt_plane_t *plane; +drmModeModeInfo *mode; +unsigned int stride, size, w, h; +uint32_t gem_handle; +int num_fences =gem_available_fences (fd); +int i, ret; + +igt_require (output !=NULL && output->valid == true); + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane)); + +if (plane_type ==IGT_PLANE_PRIMARY || plane_type ==IGT_PLANE_CURSOR ) { +igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + + mode =igt_output_get_mode (output); + w = mode->hdisplay; + h = mode->vdisplay; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ; + + gem_handle =gem_create (fd, size); + ret =__gem_set_tiling (fd, gem_handle,I915_TILING_Y , stride); +igt_assert (ret ==0 ); + +do_or_die (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data->fb.fb_id)); + data->fb.width = w; + data->fb.height = h; + data->fb.gem_handle = gem_handle; + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +igt_plane_set_fb (plane, &data->fb); + +for (i =0 ; i < num_fences +1 ; i++) { +igt_plane_set_rotation (plane, toggle ?IGT_ROTATION_0 :IGT_ROTATION_90 ); +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit);
tests/kms_rotation_crc.c static void test_plane_rotation(data_t *data, enum igt_plane plane_type) · line 335
Quoted 10 lines
tests/kms_rotation_crc.c +10
-0+igt_assert (ret ==0 ); + +igt_plane_set_rotation (plane, toggle ?IGT_ROTATION_90 :IGT_ROTATION_0 ); +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); +igt_assert (ret ==0 ); + }
It manages to exhaust the fences with only one object? I was expecting that multiple objects will be required since if it is only one how come it allocates more than one fence register?
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] igt/kms_rotation_crc: Add a subtest to validate Y-tiled obj + Y fb modifier (v5)
Hi Tvrtko,
Quoted 115 lines · On Fri, 30 Oct 2015 10:22:08 +0000 Tvrtko Ursulin…
Quoted 113 lines · Vivek Kasireddy
The main goal of this subtest is to trigger the following warning in the function
i915_gem_object_get_fence():if (WARN_ON(!obj->map_and_fenceable))To trigger this warning, the subtest first creates a Y-tiled object and an associated framebuffer with the Y-fb modifier. Furthermore, to prevent the
map_and_fenceablefrom being set, we make sure that the object does not have a normal VMA by refraining from rendering to the object and by setting the rotation property upfront before calling commit.v2: Do not call
paint_squaresand just use one output.v3: Convert an if condition to
igt_requireand move the plane rotation requirement further up before the fb allocation.v4: After setting rotation to 90 and committing, change the rotation to 0 and commit once more. This is to test if the i915 driver hits any warnings while pinning and unpinning an object that has both normal and rotated views.
v5:
- Add another subtest to toggle the order of rotation
- Exhaustively test the i915 driver's pinning and unpinning code paths for any fence leaks by iterating until MAX available fences.Cc Tvrtko Ursulin <[email protected]>Signed-off-by Vivek Kasireddy <[email protected]>--- tests/kms_rotation_crc.c | 84++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+)
tests/kms_rotation_crc.c +0
-0@@ -264,6 +264,80 @@ static void test_plane_rotation(data_t *data,enum
igt_planeplane_type)igt_require_f(valid_tests, "no valid crtc/connector combinations found\n"); }+static void test_plane_rotation_ytiled_obj(data_t *data, enum
igt_planeplane_type,tests/kms_rotation_crc.c +22
-0+ int toggle) +{ + igt_display_t *display = &data->display; + uint64_t tiling = LOCAL_I915_FORMAT_MOD_Y_TILED; + uint32_t format = DRM_FORMAT_XRGB8888; + int bpp = igt_drm_format_to_bpp(format); + enum igt_commit_style commit = COMMIT_LEGACY; + int fd = data->gfx_fd; + igt_output_t *output = &display->outputs[0]; + igt_plane_t *plane; + drmModeModeInfo *mode; + unsigned int stride, size, w, h; + uint32_t gem_handle; + int num_fences = gem_available_fences(fd); + int i, ret; + + igt_require(output != NULL && output->valid == true); + + plane = igt_output_get_plane(output, plane_type); + igt_require(igt_plane_supports_rotation(plane)); + + if (plane_type == IGT_PLANE_PRIMARY || plane_type ==
IGT_PLANE_CURSOR) {tests/kms_rotation_crc.c +15
-0+igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + + mode =igt_output_get_mode (output); + w = mode->hdisplay; + h = mode->vdisplay; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ; + + gem_handle =gem_create (fd, size); + ret = __gem_set_tiling(fd, gem_handle, I915_TILING_Y,stride);
tests/kms_rotation_crc.c +16
-0+igt_assert (ret ==0 ); + +do_or_die (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data->fb.fb_id)); + data->fb.width = w; + data->fb.height = h; + data->fb.gem_handle = gem_handle; + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +igt_plane_set_fb (plane, &data->fb); + +for (i =0 ; i < num_fences +1 ; i++) { + igt_plane_set_rotation(plane, toggle ?
IGT_ROTATION_0:IGT_ROTATION_90);tests/kms_rotation_crc.c +1
-0+ drmModeObjectSetProperty(fd,
plane->drm_plane->plane_id,tests/kms_rotation_crc.c +7
-0+DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); +igt_assert (ret ==0 ); + + igt_plane_set_rotation(plane, toggle ?
IGT_ROTATION_90:IGT_ROTATION_0);tests/kms_rotation_crc.c +1
-0+ drmModeObjectSetProperty(fd,
plane->drm_plane->plane_id,tests/kms_rotation_crc.c +2
-0+DRM_MODE_OBJECT_PLANE , + plane->rotation_property,
Quoted 8 lines
tests/kms_rotation_crc.c static void test_plane_rotation(data_t *data, enum igt_plane plane_type) · line 335
Quoted 4 lines
tests/kms_rotation_crc.c +4
-0+ plane->rotation); + ret =igt_display_try_commit2 (display, commit); +igt_assert (ret ==0 ); + }It manages to exhaust the fences with only one object? I was expecting that multiple objects will be required since if it is only one how come it allocates more than one fence register?
Before I sent out this version, I did try with two objects to see if it triggers any WARNs but it didn't. I am not sure if I did it right though, I'll take a look at it again. However, when I tried this version, that is, single-object-multiple-views, it did trigger the following WARNS:
WARN_ON(!ggtt_vma || dev_priv->fence_regs[obj->fence_reg].pin_count > ggtt_vma->pin_count)
if (WARN_ON(fence->pin_count))
I tested these with v3 of my i915 driver patch. Of-course, with v4, I don't seen any WARNs. I'll take a closer look at triggering any WARNs with 2 or more objects. However, one thing that was not clear to me was when you said unpin both (in your previous comment), I was wondering how I can do that from the test. Did you mean something like this:
igt_plane_set_fb(plane, NULL);igt_display_commit(display);
Thanks and Regards,
Vivek
Quoted 4 lines
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] igt/kms_rotation_crc: Add a subtest to validate Y-tiled obj + Y fb modifier (v5)
Quoted 135 lines · Vivek Kasireddy
Hi Tvrtko,
Quoted 115 lines · On Fri, 30 Oct 2015 10:22:08 +0000 Tvrtko Ursulin…
Quoted 113 lines · Vivek Kasireddy
The main goal of this subtest is to trigger the following warning in the function
i915_gem_object_get_fence():if (WARN_ON(!obj->map_and_fenceable))To trigger this warning, the subtest first creates a Y-tiled object and an associated framebuffer with the Y-fb modifier. Furthermore, to prevent the
map_and_fenceablefrom being set, we make sure that the object does not have a normal VMA by refraining from rendering to the object and by setting the rotation property upfront before calling commit.v2: Do not call
paint_squaresand just use one output.v3: Convert an if condition to
igt_requireand move the plane rotation requirement further up before the fb allocation.v4: After setting rotation to 90 and committing, change the rotation to 0 and commit once more. This is to test if the i915 driver hits any warnings while pinning and unpinning an object that has both normal and rotated views.
v5:
- Add another subtest to toggle the order of rotation
- Exhaustively test the i915 driver's pinning and unpinning code paths for any fence leaks by iterating until MAX available fences.Cc Tvrtko Ursulin <[email protected]>Signed-off-by Vivek Kasireddy <[email protected]>--- tests/kms_rotation_crc.c | 84++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+)
tests/kms_rotation_crc.c +0
-0@@ -264,6 +264,80 @@ static void test_plane_rotation(data_t *data,enum
igt_planeplane_type)igt_require_f(valid_tests, "no valid crtc/connector combinations found\n"); }+static void test_plane_rotation_ytiled_obj(data_t *data, enum
igt_planeplane_type,tests/kms_rotation_crc.c +22
-0+ int toggle) +{ + igt_display_t *display = &data->display; + uint64_t tiling = LOCAL_I915_FORMAT_MOD_Y_TILED; + uint32_t format = DRM_FORMAT_XRGB8888; + int bpp = igt_drm_format_to_bpp(format); + enum igt_commit_style commit = COMMIT_LEGACY; + int fd = data->gfx_fd; + igt_output_t *output = &display->outputs[0]; + igt_plane_t *plane; + drmModeModeInfo *mode; + unsigned int stride, size, w, h; + uint32_t gem_handle; + int num_fences = gem_available_fences(fd); + int i, ret; + + igt_require(output != NULL && output->valid == true); + + plane = igt_output_get_plane(output, plane_type); + igt_require(igt_plane_supports_rotation(plane)); + + if (plane_type == IGT_PLANE_PRIMARY || plane_type ==
IGT_PLANE_CURSOR) {tests/kms_rotation_crc.c +15
-0+igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + + mode =igt_output_get_mode (output); + w = mode->hdisplay; + h = mode->vdisplay; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ; + + gem_handle =gem_create (fd, size); + ret = __gem_set_tiling(fd, gem_handle, I915_TILING_Y,stride);
tests/kms_rotation_crc.c +16
-0+igt_assert (ret ==0 ); + +do_or_die (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data->fb.fb_id)); + data->fb.width = w; + data->fb.height = h; + data->fb.gem_handle = gem_handle; + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +igt_plane_set_fb (plane, &data->fb); + +for (i =0 ; i < num_fences +1 ; i++) { + igt_plane_set_rotation(plane, toggle ?
IGT_ROTATION_0:IGT_ROTATION_90);tests/kms_rotation_crc.c +1
-0+ drmModeObjectSetProperty(fd,
plane->drm_plane->plane_id,tests/kms_rotation_crc.c +7
-0+DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); +igt_assert (ret ==0 ); + + igt_plane_set_rotation(plane, toggle ?
IGT_ROTATION_90:IGT_ROTATION_0);tests/kms_rotation_crc.c +1
-0+ drmModeObjectSetProperty(fd,
plane->drm_plane->plane_id,tests/kms_rotation_crc.c +2
-0+DRM_MODE_OBJECT_PLANE , + plane->rotation_property,Quoted 8 lines
tests/kms_rotation_crc.c static void test_plane_rotation(data_t *data, enum igt_plane plane_type) · line 335
Quoted 4 lines
tests/kms_rotation_crc.c +4
-0+ plane->rotation); + ret =igt_display_try_commit2 (display, commit); +igt_assert (ret ==0 ); + }It manages to exhaust the fences with only one object? I was expecting that multiple objects will be required since if it is only one how come it allocates more than one fence register?
Before I sent out this version, I did try with two objects to see if it triggers any WARNs but it didn't. I am not sure if I did it right though, I'll take a look at it again. However, when I tried this version, that is, single-object-multiple-views, it did trigger the following WARNS:
Quoted 8 lines
WARN_ON(!ggtt_vma || dev_priv->fence_regs[obj->fence_reg].pin_count > ggtt_vma->pin_count)if (
WARN_ON(fence->pin_count))I tested these with v3 of my i915 driver patch. Of-course, with v4, I don't seen any WARNs. I'll take a closer look at triggering any WARNs with 2 or more objects. However, one thing that was not clear
I thought you would need number of framebuffers / objects > num_fences and display all of them to trigger the running out of fences ref leak.
Quoted 6 lines
to me was when you said unpin both (in your previous comment), I was wondering how I can do that from the test. Did you mean something like this:
igt_plane_set_fb(plane, NULL);igt_display_commit(display);
Couldn't find in this thread where I said "unpin both" so don't know.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] igt/kms_rotation_crc: Add a subtest to validate Y-tiled obj + Y fb modifier (v3)
In reply to Tvrtko UrsulinQuoted 130 lines · Tvrtko Ursulin
Quoted 128 lines · Daniel Vetter
Quoted 124 lines · Tvrtko Ursulin
Hi,
Quoted 115 lines · Vivek Kasireddy
The main goal of this subtest is to trigger the following warning in the function
i915_gem_object_get_fence():if (WARN_ON(!obj->map_and_fenceable))To trigger this warning, the subtest first creates a Y-tiled object and an associated framebuffer with the Y-fb modifier. Furthermore, to prevent the
map_and_fenceablefrom being set, we make sure that the object does not have a normal VMA by refraining from rendering to the
object and by setting the rotation property upfront before calling commit.v2: Do not call
paint_squaresand just use one output.v3: Convert an if condition to
igt_requireand move the plane rotation requirement further up before the fb allocation.Cc Tvrtko Ursulin <[email protected]>Signed-off-by Vivek Kasireddy <[email protected]>--- tests/kms_rotation_crc.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+)tests/kms_rotation_crc.c +21
-0@@ -264,6 +264,68 @@ static void test_plane_rotation(data_t *data, enum igt_plane plane_type) igt_require_f(valid_tests, "no valid crtc/connector combinations found\n"); } +static void test_plane_rotation_ytiled_obj(data_t *data, enum igt_plane plane_type) +{ + igt_display_t *display = &data->display; + uint64_t tiling = LOCAL_I915_FORMAT_MOD_Y_TILED; + uint32_t format = DRM_FORMAT_XRGB8888; + int bpp = igt_drm_format_to_bpp(format); + enum igt_commit_style commit = COMMIT_LEGACY; + int fd = data->gfx_fd; + igt_output_t *output = &display->outputs[0]; + igt_plane_t *plane; + drmModeModeInfo *mode; + unsigned int stride, size, w, h; + uint32_t gem_handle; + int ret; + + igt_require(output != NULL && output->valid == true); + + plane = igt_output_get_plane(output, plane_type); + igt_require(igt_plane_supports_rotation(plane)); + + if (plane_type == IGT_PLANE_PRIMARY || plane_type ==
IGT_PLANE_CURSOR) {tests/kms_rotation_crc.c +47
-0+igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + + mode =igt_output_get_mode (output); + w = mode->hdisplay; + h = mode->vdisplay; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ; + + gem_handle =gem_create (fd, size); + ret =__gem_set_tiling (fd, gem_handle,I915_TILING_Y , stride); +igt_assert (ret ==0 ); + +do_or_die (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data->fb.fb_id)); + data->fb.width = w; + data->fb.height = h; + data->fb.gem_handle = gem_handle; + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +igt_plane_set_rotation (plane, data->rotation); +igt_plane_set_fb (plane, &data->fb); + +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); + +kmstest_restore_vt_mode (); +igt_remove_fb (fd, &data->fb); +igt_assert (ret ==0 ); +} + igt_main {data_t data = {};@@ -345,6 +407,12 @@ igt_maintest_plane_rotation (&data,IGT_PLANE_PRIMARY ); } + igt_subtest_f("primary-rotation-90-Y-tiled") { +igt_require (gen >=9 ); + data.rotation =IGT_ROTATION_90 ; +test_plane_rotation_ytiled_obj (&data,IGT_PLANE_PRIMARY ); + } + igt_fixture {igt_display_fini (&data.display);Quoted 2 lines
}Reviewed-by Tvrtko Ursulin <[email protected]>
Quoted 4 lines
Quoted 1 line
Applied, thanks.
Hasn't hit the repo yet.
Daniel has now pushed this patch (v3), so the further changes that have been made will need to be split into new patches.
Quoted 9 lines
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 igt/kms_rotation_crc: Add a new subtest to exhaustively test for fence leaks
In this subtest, as a first step, MAX_FENCES+1 number of framebuffers are created backed up by objects that have multiple GGTT views (normal and rotated). Next, we have the i915 driver instantiate a normal view followed by a rotated view. We continue doing the above MAX_FENCES + 1 times.
--- tests/kms_rotation_crc.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+)
tests/kms_rotation_crc.c +79 -0
@@ -25,6 +25,7 @@#include "igt.h" #include <math.h> +#define MAX_FENCES 32 typedef struct { int gfx_fd;
@@ -376,6 +377,78 @@ static void test_plane_rotation_ytiled_obj(data_t *data, enum igt_plane plane_tyigt_assert (ret ==0 ); } +static void test_plane_rotation_exhaust_fences (data_t *data,data_t *data2, +enum igt_plane plane_type) +{ +igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd; +igt_output_t *output = &display->outputs[0 ]; +igt_plane_t *plane; +drmModeModeInfo *mode; +unsigned int stride, size, w, h; +uint32_t gem_handle; +int i, ret; + +igt_require (output !=NULL && output->valid == true); + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane)); + +if (plane_type ==IGT_PLANE_PRIMARY || plane_type ==IGT_PLANE_CURSOR ) { +igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + + mode =igt_output_get_mode (output); + w = mode->hdisplay; + h = mode->vdisplay; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ; + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +for (i =0 ; i <MAX_FENCES +1 ; i++) { + gem_handle =gem_create (fd, size); + ret =__gem_set_tiling (fd, gem_handle,I915_TILING_Y , stride); +igt_assert (ret ==0 ); + +do_or_die (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data2[i].fb.fb_id)); + data2[i].fb.width = w; + data2[i].fb.height = h; + data2[i].fb.gem_handle = gem_handle; + +igt_plane_set_fb (plane, &data2[i].fb); +igt_plane_set_rotation (plane,IGT_ROTATION_0 ); + + ret =igt_display_try_commit2 (display, commit); +igt_assert (ret ==0 ); + +igt_plane_set_rotation (plane,IGT_ROTATION_90 ); + +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); +igt_assert (ret ==0 ); + } + +kmstest_restore_vt_mode (); + +for (i =0 ; i <MAX_FENCES +1 ; i++) +igt_remove_fb (fd, &data2[i].fb); +} + igt_main {data_t data = {};
@@ -471,6 +544,12 @@ igt_maintest_plane_rotation_ytiled_obj (&data,IGT_PLANE_PRIMARY ); } + igt_subtest_f("exhaust-fences") { +data_t data2[MAX_FENCES +1 ] = {}; +igt_require (gen >=9 ); +test_plane_rotation_exhaust_fences (&data, data2,IGT_PLANE_PRIMARY ); + } + igt_fixture {igt_display_fini (&data.display); }
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] igt/kms_rotation_crc: Add a new subtest to exhaustively test for fence leaks
Hi,
Quoted 51 lines · Vivek Kasireddy
In this subtest, as a first step, MAX_FENCES+1 number of framebuffers are created backed up by objects that have multiple GGTT views (normal and rotated). Next, we have the i915 driver instantiate a normal view followed by a rotated view. We continue doing the above
MAX_FENCES+ 1 times.Cc Tvrtko Ursulin <[email protected]>Signed-off-by Vivek Kasireddy <[email protected]>--- tests/kms_rotation_crc.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+)tests/kms_rotation_crc.c +25
-0@@ -25,6 +25,7 @@#include "igt.h" #include <math.h> +#define MAX_FENCES 32 typedef struct { int gfx_fd;@@ -376,6 +377,78 @@ static void test_plane_rotation_ytiled_obj(data_t *data, enum igt_plane plane_tyigt_assert (ret ==0 ); } +static void test_plane_rotation_exhaust_fences (data_t *data,data_t *data2, +enum igt_plane plane_type) +{ +igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd; +igt_output_t *output = &display->outputs[0 ]; +igt_plane_t *plane; +drmModeModeInfo *mode; +unsigned int stride, size, w, h; +uint32_t gem_handle; +int i, ret; + +igt_require (output !=NULL && output->valid == true); + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane)); + +if (plane_type ==IGT_PLANE_PRIMARY || plane_type ==IGT_PLANE_CURSOR ) { +igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ;
tests/kms_rotation_crc.c static void test_plane_rotation_ytiled_obj(data_t *data, enum igt_plane plane_ty · line 413
Quoted 10 lines
tests/kms_rotation_crc.c +10
-0+ } + + mode =igt_output_get_mode (output); + w = mode->hdisplay; + h = mode->vdisplay; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ;
Looking good, just two minor comments:
I think a good addition would be to verify that we have enough GTT space for size * MAX_FENCES objects. Because if we don't then the test can't test what it is trying to test I think. So something like:
igt_require(size * MAX_FENCES < gem_total_aperture()) or whatever it is called. Maybe fudge down by a percentage to allow for other stuff, 10% or so.
Quoted 41 lines
tests/kms_rotation_crc.c +37
-0+igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +for (i =0 ; i <MAX_FENCES +1 ; i++) { + gem_handle =gem_create (fd, size); + ret =__gem_set_tiling (fd, gem_handle,I915_TILING_Y , stride); +igt_assert (ret ==0 ); + +do_or_die (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data2[i].fb.fb_id)); + data2[i].fb.width = w; + data2[i].fb.height = h; + data2[i].fb.gem_handle = gem_handle; + +igt_plane_set_fb (plane, &data2[i].fb); +igt_plane_set_rotation (plane,IGT_ROTATION_0 ); + + ret =igt_display_try_commit2 (display, commit); +igt_assert (ret ==0 ); + +igt_plane_set_rotation (plane,IGT_ROTATION_90 ); + +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); +igt_assert (ret ==0 ); + } + +kmstest_restore_vt_mode (); + +for (i =0 ; i <MAX_FENCES +1 ; i++) +igt_remove_fb (fd, &data2[i].fb); +} + igt_main {data_t data = {};
tests/kms_rotation_crc.c igt_main · line 550
Quoted 7 lines
tests/kms_rotation_crc.c +4
-0@@ -471,6 +544,12 @@ igt_maintest_plane_rotation_ytiled_obj (&data,IGT_PLANE_PRIMARY ); } + igt_subtest_f("exhaust-fences") { +data_t data2[MAX_FENCES +1 ] = {}; +igt_require (gen >=9 ); +test_plane_rotation_exhaust_fences (&data, data2,IGT_PLANE_PRIMARY );
Second minor comment is that data2 could be local to test_plane_rotation_exhaust_fences just as well and would probably be cleaner like that.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 igt/kms_rotation_crc: Add a new subtest to exhaustively test for fence leaks (v2)
In this subtest, as a first step, MAX_FENCES+1 number of framebuffers are created backed up by objects that have multiple GGTT views (normal and rotated). Next, we have the i915 driver instantiate a normal view followed by a rotated view. We continue doing the above MAX_FENCES + 1 times.
v2:
- Add a igt_require() to check if there is enough GTT space left for MAX_FENCES+1 framebuffers. (Tvrtko)
- Make data2 local to test_plane_rotation_exhaust_fences(). (Tvrtko)
- If there is a failure, deallocate all the previously allocated framebuffers before asserting.
--- tests/kms_rotation_crc.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+)
tests/kms_rotation_crc.c +106 -0
@@ -25,6 +25,7 @@#include "igt.h" #include <math.h> +#define MAX_FENCES 32 typedef struct { int gfx_fd;
@@ -376,6 +377,106 @@ static void test_plane_rotation_ytiled_obj(data_t *data, enum igt_plane plane_tyigt_assert (ret ==0 ); } +static void test_plane_rotation_exhaust_fences (data_t *data,enum igt_plane plane_type) +{ +igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd; +igt_output_t *output = &display->outputs[0 ]; +igt_plane_t *plane; +drmModeModeInfo *mode; +data_t data2[MAX_FENCES +1 ] = {}; +unsigned int stride, size, w, h; +uint32_t gem_handle; +uint64_t total_aperture_size, total_fbs_size; +int i, ret; + +igt_require (output !=NULL && output->valid == true); + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane)); + +if (plane_type ==IGT_PLANE_PRIMARY || plane_type ==IGT_PLANE_CURSOR ) { +igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + + mode =igt_output_get_mode (output); + w = mode->hdisplay; + h = mode->vdisplay; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ; + +/* +* Make sure there is atleast 90% of the available GTT space left +* for creating (MAX_FENCES+1) framebuffers. +*/ + total_fbs_size = size * (MAX_FENCES +1 ); + total_aperture_size =gem_available_aperture_size (fd); +igt_require (total_fbs_size < total_aperture_size *0.9 ); + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +for (i =0 ; i <MAX_FENCES +1 ; i++) { + gem_handle =gem_create (fd, size); + ret =__gem_set_tiling (fd, gem_handle,I915_TILING_Y , stride); +if (ret) { +igt_warn ("failed to set tiling\n" ); + goto err_alloc; + } + + ret = (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data2[i].fb.fb_id)); +if (ret) { +igt_warn ("failed to create framebuffer\n" ); + goto err_alloc; + } + + data2[i].fb.width = w; + data2[i].fb.height = h; + data2[i].fb.gem_handle = gem_handle; + +igt_plane_set_fb (plane, &data2[i].fb); +igt_plane_set_rotation (plane,IGT_ROTATION_0 ); + + ret =igt_display_try_commit2 (display, commit); +if (ret) { +igt_warn ("failed to commit unrotated fb\n" ); + goto err_commit; + } + +igt_plane_set_rotation (plane,IGT_ROTATION_90 ); + +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); +if (ret) { +igt_warn ("failed to commit hardware rotated fb\n" ); + goto err_commit; + } + } + +err_alloc: + i--; +err_commit: +kmstest_restore_vt_mode (); + +for (; i >=0 ; i--) +igt_remove_fb (fd, &data2[i].fb); + +igt_assert (ret ==0 ); +} + igt_main {data_t data = {};
@@ -471,6 +572,11 @@ igt_maintest_plane_rotation_ytiled_obj (&data,IGT_PLANE_PRIMARY ); } + igt_subtest_f("exhaust-fences") { +igt_require (gen >=9 ); +test_plane_rotation_exhaust_fences (&data,IGT_PLANE_PRIMARY ); + } + igt_fixture {igt_display_fini (&data.display); }
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] igt/kms_rotation_crc: Add a new subtest to exhaustively test for fence leaks (v2)
Quoted 77 lines · Vivek Kasireddy
In this subtest, as a first step, MAX_FENCES+1 number of framebuffers are created backed up by objects that have multiple GGTT views (normal and rotated). Next, we have the i915 driver instantiate a normal view followed by a rotated view. We continue doing the above
MAX_FENCES+ 1 times.v2:
- Add aigt_require()to check if there is enough GTT space left for MAX_FENCES+1 framebuffers. (Tvrtko)
- Make data2 local totest_plane_rotation_exhaust_fences(). (Tvrtko)
- If there is a failure, deallocate all the previously allocated framebuffers before asserting.Cc Tvrtko Ursulin <[email protected]>Signed-off-by Vivek Kasireddy <[email protected]>--- tests/kms_rotation_crc.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+)tests/kms_rotation_crc.c +44
-0@@ -25,6 +25,7 @@#include "igt.h" #include <math.h> +#define MAX_FENCES 32 typedef struct { int gfx_fd;@@ -376,6 +377,106 @@ static void test_plane_rotation_ytiled_obj(data_t *data, enum igt_plane plane_tyigt_assert (ret ==0 ); } +static void test_plane_rotation_exhaust_fences (data_t *data,enum igt_plane plane_type) +{ +igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd; +igt_output_t *output = &display->outputs[0 ]; +igt_plane_t *plane; +drmModeModeInfo *mode; +data_t data2[MAX_FENCES +1 ] = {}; +unsigned int stride, size, w, h; +uint32_t gem_handle; +uint64_t total_aperture_size, total_fbs_size; +int i, ret; + +igt_require (output !=NULL && output->valid == true); + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane)); + +if (plane_type ==IGT_PLANE_PRIMARY || plane_type ==IGT_PLANE_CURSOR ) { +igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + + mode =igt_output_get_mode (output); + w = mode->hdisplay; + h = mode->vdisplay; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ; + +/* +* Make sure there is atleast 90% of the available GTT space left +* for creating (MAX_FENCES+1) framebuffers. +*/ + total_fbs_size = size * (MAX_FENCES +1 ); + total_aperture_size =gem_available_aperture_size (fd); +igt_require (total_fbs_size < total_aperture_size *0.9 );
tests/kms_rotation_crc.c static void test_plane_rotation_ytiled_obj(data_t *data, enum igt_plane plane_ty · line 432
Quoted 10 lines
tests/kms_rotation_crc.c +10
-0+ +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +for (i =0 ; i <MAX_FENCES +1 ; i++) { + gem_handle =gem_create (fd, size); + ret =__gem_set_tiling (fd, gem_handle,I915_TILING_Y , stride); +if (ret) { +igt_warn ("failed to set tiling\n" ); + goto err_alloc;
If it hits this path it leaks the gem_handle I think.
tests/kms_rotation_crc.c static void test_plane_rotation_ytiled_obj(data_t *data, enum igt_plane plane_ty · line 440
Quoted 8 lines
tests/kms_rotation_crc.c +8
-0+ } + + ret = (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data2[i].fb.fb_id)); +if (ret) { +igt_warn ("failed to create framebuffer\n" ); + goto err_alloc;
And here.
Quoted 45 lines
tests/kms_rotation_crc.c +39
-0+ } + + data2[i].fb.width = w; + data2[i].fb.height = h; + data2[i].fb.gem_handle = gem_handle; + +igt_plane_set_fb (plane, &data2[i].fb); +igt_plane_set_rotation (plane,IGT_ROTATION_0 ); + + ret =igt_display_try_commit2 (display, commit); +if (ret) { +igt_warn ("failed to commit unrotated fb\n" ); + goto err_commit; + } + +igt_plane_set_rotation (plane,IGT_ROTATION_90 ); + +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); +if (ret) { +igt_warn ("failed to commit hardware rotated fb\n" ); + goto err_commit; + } + } + +err_alloc: + i--; +err_commit: +kmstest_restore_vt_mode (); + +for (; i >=0 ; i--) +igt_remove_fb (fd, &data2[i].fb); + +igt_assert (ret ==0 ); +} + igt_main {data_t data = {};@@ -471,6 +572,11 @@ igt_maintest_plane_rotation_ytiled_obj (&data,IGT_PLANE_PRIMARY );
tests/kms_rotation_crc.c igt_main · line 582
Quoted 10 lines
tests/kms_rotation_crc.c +5
-0} + igt_subtest_f("exhaust-fences") { +igt_require (gen >=9 ); +test_plane_rotation_exhaust_fences (&data,IGT_PLANE_PRIMARY ); + } + igt_fixture {igt_display_fini (&data.display); }
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 igt/kms_rotation_crc: Add a new subtest to exhaustively test for fence leaks (v3)
In this subtest, as a first step, MAX_FENCES+1 number of framebuffers are created backed up by objects that have multiple GGTT views (normal and rotated). Next, we have the i915 driver instantiate a normal view followed by a rotated view. We continue doing the above MAX_FENCES + 1 times.
v2:
- Add a igt_require() to check if there is enough GTT space left for MAX_FENCES+1 framebuffers. (Tvrtko)
- Make data2 local to test_plane_rotation_exhaust_fences(). (Tvrtko)
- If there is a failure, deallocate all the previously allocated framebuffers before asserting.
v3: Close the gem handle if set_tiling or addfb fails. (Tvrtko)
--- tests/kms_rotation_crc.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+)
tests/kms_rotation_crc.c +108 -0
@@ -25,6 +25,7 @@#include "igt.h" #include <math.h> +#define MAX_FENCES 32 typedef struct { int gfx_fd;
@@ -376,6 +377,108 @@ static void test_plane_rotation_ytiled_obj(data_t *data, enum igt_plane plane_tyigt_assert (ret ==0 ); } +static void test_plane_rotation_exhaust_fences (data_t *data,enum igt_plane plane_type) +{ +igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd; +igt_output_t *output = &display->outputs[0 ]; +igt_plane_t *plane; +drmModeModeInfo *mode; +data_t data2[MAX_FENCES +1 ] = {}; +unsigned int stride, size, w, h; +uint32_t gem_handle; +uint64_t total_aperture_size, total_fbs_size; +int i, ret; + +igt_require (output !=NULL && output->valid == true); + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane)); + +if (plane_type ==IGT_PLANE_PRIMARY || plane_type ==IGT_PLANE_CURSOR ) { +igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + + mode =igt_output_get_mode (output); + w = mode->hdisplay; + h = mode->vdisplay; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ; + +/* +* Make sure there is atleast 90% of the available GTT space left +* for creating (MAX_FENCES+1) framebuffers. +*/ + total_fbs_size = size * (MAX_FENCES +1 ); + total_aperture_size =gem_available_aperture_size (fd); +igt_require (total_fbs_size < total_aperture_size *0.9 ); + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +for (i =0 ; i <MAX_FENCES +1 ; i++) { + gem_handle =gem_create (fd, size); + ret =__gem_set_tiling (fd, gem_handle,I915_TILING_Y , stride); +if (ret) { +igt_warn ("failed to set tiling\n" ); + goto err_alloc; + } + + ret = (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data2[i].fb.fb_id)); +if (ret) { +igt_warn ("failed to create framebuffer\n" ); + goto err_alloc; + } + + data2[i].fb.width = w; + data2[i].fb.height = h; + data2[i].fb.gem_handle = gem_handle; + +igt_plane_set_fb (plane, &data2[i].fb); +igt_plane_set_rotation (plane,IGT_ROTATION_0 ); + + ret =igt_display_try_commit2 (display, commit); +if (ret) { +igt_warn ("failed to commit unrotated fb\n" ); + goto err_commit; + } + +igt_plane_set_rotation (plane,IGT_ROTATION_90 ); + +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); +if (ret) { +igt_warn ("failed to commit hardware rotated fb\n" ); + goto err_commit; + } + } + +err_alloc: +if (ret) +gem_close (fd, gem_handle); + + i--; +err_commit: +for (; i >=0 ; i--) +igt_remove_fb (fd, &data2[i].fb); + +kmstest_restore_vt_mode (); +igt_assert (ret ==0 ); +} + igt_main {data_t data = {};
@@ -471,6 +574,11 @@ igt_maintest_plane_rotation_ytiled_obj (&data,IGT_PLANE_PRIMARY ); } + igt_subtest_f("exhaust-fences") { +igt_require (gen >=9 ); +test_plane_rotation_exhaust_fences (&data,IGT_PLANE_PRIMARY ); + } + igt_fixture {igt_display_fini (&data.display); }
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] igt/kms_rotation_crc: Add a new subtest to exhaustively test for fence leaks (v3)
Quoted 144 lines · Vivek Kasireddy
In this subtest, as a first step, MAX_FENCES+1 number of framebuffers are created backed up by objects that have multiple GGTT views (normal and rotated). Next, we have the i915 driver instantiate a normal view followed by a rotated view. We continue doing the above
MAX_FENCES+ 1 times.v2:
- Add aigt_require()to check if there is enough GTT space left for MAX_FENCES+1 framebuffers. (Tvrtko)
- Make data2 local totest_plane_rotation_exhaust_fences(). (Tvrtko)
- If there is a failure, deallocate all the previously allocated framebuffers before asserting.v3: Close the gem handle if
set_tilingor addfb fails. (Tvrtko)Cc Tvrtko Ursulin <[email protected]>Signed-off-by Vivek Kasireddy <[email protected]>--- tests/kms_rotation_crc.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+)tests/kms_rotation_crc.c +103
-0@@ -25,6 +25,7 @@#include "igt.h" #include <math.h> +#define MAX_FENCES 32 typedef struct { int gfx_fd;@@ -376,6 +377,108 @@ static void test_plane_rotation_ytiled_obj(data_t *data, enum igt_plane plane_tyigt_assert (ret ==0 ); } +static void test_plane_rotation_exhaust_fences (data_t *data,enum igt_plane plane_type) +{ +igt_display_t *display = &data->display; +uint64_t tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +uint32_t format =DRM_FORMAT_XRGB8888 ; +int bpp =igt_drm_format_to_bpp (format); +enum igt_commit_style commit =COMMIT_LEGACY ; +int fd = data->gfx_fd; +igt_output_t *output = &display->outputs[0 ]; +igt_plane_t *plane; +drmModeModeInfo *mode; +data_t data2[MAX_FENCES +1 ] = {}; +unsigned int stride, size, w, h; +uint32_t gem_handle; +uint64_t total_aperture_size, total_fbs_size; +int i, ret; + +igt_require (output !=NULL && output->valid == true); + + plane =igt_output_get_plane (output, plane_type); +igt_require (igt_plane_supports_rotation (plane)); + +if (plane_type ==IGT_PLANE_PRIMARY || plane_type ==IGT_PLANE_CURSOR ) { +igt_require (data->display.has_universal_planes); + commit =COMMIT_UNIVERSAL ; + } + + mode =igt_output_get_mode (output); + w = mode->hdisplay; + h = mode->vdisplay; + +for (stride =512 ; stride < (w * bpp /8 ); stride *=2 ) + ; +for (size =1024 *1024 ; size < stride * h; size *=2 ) + ; + +/* +* Make sure there is atleast 90% of the available GTT space left +* for creating (MAX_FENCES+1) framebuffers. +*/ + total_fbs_size = size * (MAX_FENCES +1 ); + total_aperture_size =gem_available_aperture_size (fd); +igt_require (total_fbs_size < total_aperture_size *0.9 ); + +igt_plane_set_fb (plane,NULL ); +igt_display_commit (display); + +for (i =0 ; i <MAX_FENCES +1 ; i++) { + gem_handle =gem_create (fd, size); + ret =__gem_set_tiling (fd, gem_handle,I915_TILING_Y , stride); +if (ret) { +igt_warn ("failed to set tiling\n" ); + goto err_alloc; + } + + ret = (__kms_addfb (fd, gem_handle, w, h, stride, + format, tiling,LOCAL_DRM_MODE_FB_MODIFIERS , + &data2[i].fb.fb_id)); +if (ret) { +igt_warn ("failed to create framebuffer\n" ); + goto err_alloc; + } + + data2[i].fb.width = w; + data2[i].fb.height = h; + data2[i].fb.gem_handle = gem_handle; + +igt_plane_set_fb (plane, &data2[i].fb); +igt_plane_set_rotation (plane,IGT_ROTATION_0 ); + + ret =igt_display_try_commit2 (display, commit); +if (ret) { +igt_warn ("failed to commit unrotated fb\n" ); + goto err_commit; + } + +igt_plane_set_rotation (plane,IGT_ROTATION_90 ); + +drmModeObjectSetProperty (fd, plane->drm_plane->plane_id, +DRM_MODE_OBJECT_PLANE , + plane->rotation_property, + plane->rotation); + ret =igt_display_try_commit2 (display, commit); +if (ret) { +igt_warn ("failed to commit hardware rotated fb\n" ); + goto err_commit; + } + } + +err_alloc: +if (ret) +gem_close (fd, gem_handle); + + i--; +err_commit: +for (; i >=0 ; i--) +igt_remove_fb (fd, &data2[i].fb); + +kmstest_restore_vt_mode (); +igt_assert (ret ==0 ); +} + igt_main {data_t data = {};@@ -471,6 +574,11 @@ igt_maintest_plane_rotation_ytiled_obj (&data,IGT_PLANE_PRIMARY );
tests/kms_rotation_crc.c igt_main · line 584
Quoted 10 lines
tests/kms_rotation_crc.c +5
-0} + igt_subtest_f("exhaust-fences") { +igt_require (gen >=9 ); +test_plane_rotation_exhaust_fences (&data,IGT_PLANE_PRIMARY ); + } + igt_fixture {igt_display_fini (&data.display); }
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx