lib: Add stride and size calculation for amdgpu + tiling
PATCH 1/2 lib: Add stride and size calculation for amdgpu + tiling
For amdgpu, we need to calculate the stride and size of framebuffer correctly during non-linear tiling mode
--- lib/igt_fb.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
lib/igt_fb.c +11 -0
@@ -670,6 +670,11 @@ static uint32_t calc_plane_stride(struct igt_fb *fb, int plane)* so the easiest way is to align the luma stride to 256. */ return ALIGN (min_stride,256 ); + }else if (fb->modifier !=LOCAL_DRM_FORMAT_MOD_NONE &&is_amdgpu_device (fb->fd)) { +/* +* For amdgpu device with tiling mode +*/ +return ALIGN (min_stride,512 ); }else if (is_gen12_ccs_cc_plane (fb, plane)) {/* clear color always fixed to 64 bytes */ return 64 ;
@@ -710,6 +715,12 @@ static uint64_t calc_plane_size(struct igt_fb *fb, int plane) size =roundup_power_of_two (size);return size; + }else if (fb->modifier !=LOCAL_DRM_FORMAT_MOD_NONE &&is_amdgpu_device (fb->fd)) { +/* +* For amdgpu device with tiling mode +*/ +return (uint64_t ) fb->strides[plane] * +ALIGN (fb->plane_height[plane],512 ); }else if (is_gen12_ccs_plane (fb, plane)) {/* The AUX CCS surface must be page aligned */ return (uint64_t)fb->strides[plane] *
Signature · 6 lines
2.25.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH 2/2 kms_rotation_crc:Add HW rotation test case for amdgpu
Added Hw rotation case specifically for amdgpu. Currently, kms_rotation_crc tests intel gpus. Added conditions to bypass all the requirements needed for intel when testing amdgpu.
--- tests/kms_rotation_crc.c | 247 +++++++++++++++++++++++---------------- 1 file changed, 149 insertions(+), 98 deletions(-)
tests/kms_rotation_crc.c +149 -98
@@ -183,6 +183,12 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe,/* create the pipe_crc object for this pipe */ igt_pipe_crc_free (data->pipe_crc); +if (is_amdgpu_device (data->gfx_fd)) { +igt_fb_t fb_temp; + +igt_create_fb (data->gfx_fd,1280 ,800 ,DRM_FORMAT_XRGB8888 ,0 , &fb_temp); +igt_plane_set_fb (plane, &fb_temp); + }igt_display_commit2 (display,COMMIT_ATOMIC ); data->pipe_crc =igt_pipe_crc_new (data->gfx_fd, pipe,INTEL_PIPE_CRC_SOURCE_AUTO );
@@ -207,6 +213,8 @@ static void prepare_fbs(data_t *data, igt_output_t *output,uint64_t tiling = data->override_tiling ?:LOCAL_DRM_FORMAT_MOD_NONE ;uint32_t pixel_format = data->override_fmt ?:DRM_FORMAT_XRGB8888 ;const float flip_opacity =0.75 ; +bool amd_gpu =is_amdgpu_device (data->gfx_fd); +bool intel_gpu =is_i915_device (data->gfx_fd);remove_fbs (data);
@@ -214,16 +222,21 @@ static void prepare_fbs(data_t *data, igt_output_t *output, mode =igt_output_get_mode (output);if (plane->type !=DRM_PLANE_TYPE_CURSOR ) { -if (data->use_native_resolution) { +if (amd_gpu) { w = mode->hdisplay; h = mode->vdisplay; - }else { - w =min (TEST_MAX_WIDTH , mode->hdisplay); - h =min (TEST_MAX_HEIGHT , mode->vdisplay); - } + }else if (intel_gpu) { +if (data->use_native_resolution) { + w = mode->hdisplay; + h = mode->vdisplay; + }else { + w =min (TEST_MAX_WIDTH , mode->hdisplay); + h =min (TEST_MAX_HEIGHT , mode->vdisplay); + } - min_w =256 ; - min_h =256 ; + min_w =256 ; + min_h =256 ; + } }else { pixel_format = data->override_fmt ?:DRM_FORMAT_ARGB8888 ;
@@ -255,7 +268,8 @@ static void prepare_fbs(data_t *data, igt_output_t *output,* frame can fit in */ if (data->rotation & (IGT_ROTATION_90 |IGT_ROTATION_270 )) { - tiling = data->override_tiling ?:LOCAL_I915_FORMAT_MOD_Y_TILED ; +if (intel_gpu) + tiling = data->override_tiling ?:LOCAL_I915_FORMAT_MOD_Y_TILED ;igt_swap (w, h); }
@@ -266,34 +280,40 @@ static void prepare_fbs(data_t *data, igt_output_t *output,*/ igt_require (igt_display_has_format_mod (display, pixel_format, tiling)); -/* -* Create a reference software rotated flip framebuffer. -*/ -igt_create_fb (data->gfx_fd, ref_w, ref_h, pixel_format, tiling, - &data->fb_flip); -paint_squares (data, data->rotation, &data->fb_flip, - flip_opacity); -igt_plane_set_fb (plane, &data->fb_flip); -if (plane->type !=DRM_PLANE_TYPE_CURSOR ) -igt_plane_set_position (plane, data->pos_x, data->pos_y); -igt_display_commit2 (display,COMMIT_ATOMIC ); +if (intel_gpu) { +/* +* Create a reference software rotated flip framebuffer. +*/ +igt_create_fb (data->gfx_fd, ref_w, ref_h, pixel_format, tiling, + &data->fb_flip); +paint_squares (data, data->rotation, &data->fb_flip, + flip_opacity); +igt_plane_set_fb (plane, &data->fb_flip); +if (plane->type !=DRM_PLANE_TYPE_CURSOR ) +igt_plane_set_position (plane, data->pos_x, data->pos_y); +igt_display_commit2 (display,COMMIT_ATOMIC ); -igt_pipe_crc_get_current (display->drm_fd, data->pipe_crc, &data->flip_crc); +igt_pipe_crc_get_current (display->drm_fd, data->pipe_crc, &data->flip_crc); -/* -* Prepare the non-rotated flip fb. -*/ -igt_remove_fb (data->gfx_fd, &data->fb_flip); -igt_create_fb (data->gfx_fd, w, h, pixel_format, tiling, - &data->fb_flip); -paint_squares (data,IGT_ROTATION_0 , &data->fb_flip, - flip_opacity); +/* +* Prepare the non-rotated flip fb. +*/ +igt_remove_fb (data->gfx_fd, &data->fb_flip); +igt_create_fb (data->gfx_fd, w, h, pixel_format, tiling, + &data->fb_flip); +paint_squares (data,IGT_ROTATION_0 , &data->fb_flip, + flip_opacity); -/* -* Create a reference CRC for a software-rotated fb. -*/ -igt_create_fb (data->gfx_fd, ref_w, ref_h, pixel_format, - data->override_tiling ?:LOCAL_DRM_FORMAT_MOD_NONE , &data->fb_reference); +/* +* Create a reference CRC for a software-rotated fb. +*/ +igt_create_fb (data->gfx_fd, ref_w, ref_h, pixel_format, + data->override_tiling ?:LOCAL_DRM_FORMAT_MOD_NONE , &data->fb_reference); + }else if (amd_gpu) { + tiling =0x1900 ; +igt_create_fb (data->gfx_fd, ref_w, ref_h, pixel_format, + tiling, &data->fb_reference); + }paint_squares (data, data->rotation, &data->fb_reference,1.0 );igt_plane_set_fb (plane, &data->fb_reference);
@@ -301,7 +321,10 @@ static void prepare_fbs(data_t *data, igt_output_t *output,igt_plane_set_position (plane, data->pos_x, data->pos_y);igt_display_commit2 (display,COMMIT_ATOMIC ); -igt_pipe_crc_get_current (display->drm_fd, data->pipe_crc, &data->ref_crc); +if (intel_gpu) +igt_pipe_crc_get_current (display->drm_fd, data->pipe_crc, &data->ref_crc); +else if (amd_gpu) +igt_pipe_crc_collect_crc (data->pipe_crc, &data->ref_crc);/* * Prepare the plane with an non-rotated fb let the hw rotate it.
@@ -339,33 +362,37 @@ static void test_single_case(data_t *data, enum pipe pipe,/* Verify commit was ok. */ igt_assert_eq (ret,0 ); -/* Check CRC */ -igt_pipe_crc_get_current (display->drm_fd, data->pipe_crc, &crc_output); -igt_assert_crc_equal (&data->ref_crc, &crc_output); +if (is_i915_device (data->gfx_fd)) { +/* Check CRC */ +igt_pipe_crc_get_current (display->drm_fd, data->pipe_crc, &crc_output); +igt_assert_crc_equal (&data->ref_crc, &crc_output); -/* -* If flips are requested flip to a different fb and -* check CRC against that one as well. -*/ -if (data->fb_flip.fb_id) { -igt_plane_set_fb (plane, &data->fb_flip); -if (data->rotation ==IGT_ROTATION_90 || data->rotation ==IGT_ROTATION_270 ) -igt_plane_set_size (plane, data->fb.height, data->fb.width); - -if (plane->type !=DRM_PLANE_TYPE_PRIMARY ) { -igt_display_commit_atomic (display,DRM_MODE_PAGE_FLIP_EVENT |DRM_MODE_ATOMIC_NONBLOCK ,NULL ); - }else { - ret =drmModePageFlip (data->gfx_fd, - output->config.crtc->crtc_id, - data->fb_flip.fb_id, -DRM_MODE_PAGE_FLIP_EVENT , -NULL ); -igt_assert_eq (ret,0 ); +/* +* If flips are requested flip to a different fb and +* check CRC against that one as well. +*/ +if (data->fb_flip.fb_id) { +igt_plane_set_fb (plane, &data->fb_flip); +if (data->rotation ==IGT_ROTATION_90 || data->rotation ==IGT_ROTATION_270 ) +igt_plane_set_size (plane, data->fb.height, data->fb.width); + +if (plane->type !=DRM_PLANE_TYPE_PRIMARY ) { +igt_display_commit_atomic (display,DRM_MODE_PAGE_FLIP_EVENT |DRM_MODE_ATOMIC_NONBLOCK ,NULL ); + }else { + ret =drmModePageFlip (data->gfx_fd, + output->config.crtc->crtc_id, + data->fb_flip.fb_id, +DRM_MODE_PAGE_FLIP_EVENT , +NULL ); +igt_assert_eq (ret,0 ); + } +kmstest_wait_for_pageflip (data->gfx_fd); +igt_pipe_crc_get_current (display->drm_fd, data->pipe_crc, &crc_output); +igt_assert_crc_equal (&data->flip_crc, + &crc_output); } -kmstest_wait_for_pageflip (data->gfx_fd); -igt_pipe_crc_get_current (display->drm_fd, data->pipe_crc, &crc_output); -igt_assert_crc_equal (&data->flip_crc, - &crc_output); + }else if (is_amdgpu_device (data->gfx_fd)) { +igt_pipe_crc_collect_crc (data->pipe_crc, &crc_output); } }
@@ -406,54 +433,74 @@ static void test_plane_rotation(data_t *data, int plane_type, bool test_bad_formigt_plane_t *plane;int i, j; -if (IS_CHERRYVIEW (data->devid) && pipe !=PIPE_B ) -continue ; - -igt_output_set_pipe (output, pipe); +if (is_i915_device (data->gfx_fd)) { +if (IS_CHERRYVIEW (data->devid) && pipe !=PIPE_B ) +continue ; - plane =igt_output_get_plane_type (output, plane_type); -igt_require (igt_plane_has_prop (plane,IGT_PLANE_ROTATION )); +igt_output_set_pipe (output, pipe); -prepare_crtc (data, output, pipe, plane, true); + plane =igt_output_get_plane_type (output, plane_type); +igt_require (igt_plane_has_prop (plane,IGT_PLANE_ROTATION )); -for (i =0 ; i < num_rectangle_types; i++) { -/* Unsupported on i915 */ -if (plane_type ==DRM_PLANE_TYPE_CURSOR && - i != square) -continue ; +prepare_crtc (data, output, pipe, plane, true); -/* Only support partial covering primary plane on gen9+ */ -if (plane_type ==DRM_PLANE_TYPE_PRIMARY && -intel_gen (intel_get_drm_devid (data->gfx_fd)) <9 ) { -if (i != rectangle) +for (i =0 ; i < num_rectangle_types; i++) { +/* Unsupported on i915 */ +if (plane_type ==DRM_PLANE_TYPE_CURSOR && + i != square)continue ; -else - data->use_native_resolution = true; - }else { - data->use_native_resolution = false; - } -if (!data->override_fmt) { -struct igt_vec tested_formats; +/* Only support partial covering primary plane on gen9+ */ +if (plane_type ==DRM_PLANE_TYPE_PRIMARY && +intel_gen (intel_get_drm_devid (data->gfx_fd)) <9 ) { +if (i != rectangle) +continue ; +else + data->use_native_resolution = true; + }else { + data->use_native_resolution = false; + } -igt_vec_init (&tested_formats,sizeof (uint32_t )); +if (!data->override_fmt) { +struct igt_vec tested_formats; -for (j =0 ; j < plane->drm_plane->count_formats; j++) { -uint32_t format = plane->drm_plane->formats[j]; +igt_vec_init (&tested_formats,sizeof (uint32_t )); -if (!test_format (data, &tested_formats, format)) -continue ; +for (j =0 ; j < plane->drm_plane->count_formats; j++) { +uint32_t format = plane->drm_plane->formats[j]; +if (!test_format (data, &tested_formats, format)) +continue ; + +test_single_case (data, pipe, output, plane, i, + format, test_bad_format); + } + +igt_vec_fini (&tested_formats); + }else {test_single_case (data, pipe, output, plane, i, - format, test_bad_format); + data->override_fmt, test_bad_format); } + } + }else if (is_amdgpu_device (data->gfx_fd)) { +uint32_t format =DRM_FORMAT_XRGB8888 ; -igt_vec_fini (&tested_formats); - }else { -test_single_case (data, pipe, output, plane, i, - data->override_fmt, test_bad_format); +igt_output_set_pipe (output, pipe); + + plane =igt_output_get_plane_type (output,DRM_PLANE_TYPE_PRIMARY ); +igt_require (igt_plane_has_prop (plane,IGT_PLANE_ROTATION )); + +prepare_crtc (data, output, pipe, plane, false); + +if (plane_type !=DRM_PLANE_TYPE_PRIMARY ) { + plane =igt_output_get_plane_type (output, plane_type); +igt_require (igt_plane_has_prop (plane,IGT_PLANE_ROTATION )); } + +test_single_case (data, pipe, output, plane, + rectangle, format, test_bad_format); } +igt_pipe_crc_stop (data->pipe_crc); } }
@@ -832,9 +879,11 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)int gen =0 ; igt_fixture { - data.gfx_fd =drm_open_driver_master (DRIVER_INTEL ); - data.devid =intel_get_drm_devid (data.gfx_fd); - gen =intel_gen (data.devid); + data.gfx_fd =drm_open_driver_master (DRIVER_INTEL |DRIVER_AMDGPU ); +if (is_i915_device (data.gfx_fd)) { + data.devid =intel_get_drm_devid (data.gfx_fd); + gen =intel_gen (data.devid); + }kmstest_set_vt_graphics_mode ();
@@ -848,9 +897,11 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)igt_subtest_f ("%s-rotation-%s" ,plane_test_str (subtest->plane), rot_test_str(subtest->rot)) { -igt_require (!(subtest->rot & - (IGT_ROTATION_90 |IGT_ROTATION_270 )) || - gen >=9 ); +if (is_i915_device (data.gfx_fd)) { +igt_require (!(subtest->rot & + (IGT_ROTATION_90 |IGT_ROTATION_270 )) || + gen >=9 ); + } data.rotation = subtest->rot;test_plane_rotation (&data, subtest->plane, false); }
Signature · 6 lines
2.25.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
Re: [igt-dev] [PATCH 2/2] kms_rotation_crc:Add HW rotation test case for amdgpu
Quoted 12 lines · Sung Joon Kim
Added Hw rotation case specifically for amdgpu. Currently,
kms_rotation_crctests intel gpus. Added conditions to bypass all the requirements needed for intel when testing amdgpu.Signed-off-by Sung Joon Kim <[email protected]>--- tests/kms_rotation_crc.c | 247 +++++++++++++++++++++++---------------- 1 file changed, 149 insertions(+), 98 deletions(-)tests/kms_rotation_crc.c +0
-0
tests/kms_rotation_crc.c static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe, · line 191
Quoted 9 lines
tests/kms_rotation_crc.c +6
-0@@ -183,6 +183,12 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe,/* create the pipe_crc object for this pipe */ igt_pipe_crc_free (data->pipe_crc); +if (is_amdgpu_device (data->gfx_fd)) { +igt_fb_t fb_temp; + +igt_create_fb (data->gfx_fd,1280 ,800 ,DRM_FORMAT_XRGB8888 ,0 , &fb_temp); +igt_plane_set_fb (plane, &fb_temp); + }
This framebuffer never gets freed.
I guess the issue you have here is that we can't start CRC capture when the CRTC is disabled and no planes are enabled because it ticks off of the vblank handler in kernel.
This has been a problem in a few IGT tests so I see two approaches here:
1) Switch CRC capture to use igt_pipe_crc_collect_crc instead of start/stop CRC in the test
2) Don't fail CRC enablement in the kernel if there's no stream for the CRTC - leave configuring/enabling the CRC capture until CRTC enablement.
I prefer 2) since this is how I assume i915 works as well and it prevents having to fix other tests down the line.
Quoted 28 lines
tests/kms_rotation_crc.c +7
-5igt_display_commit2 (display,COMMIT_ATOMIC ); data->pipe_crc =igt_pipe_crc_new (data->gfx_fd, pipe,INTEL_PIPE_CRC_SOURCE_AUTO );@@ -207,6 +213,8 @@ static void prepare_fbs(data_t *data, igt_output_t *output,uint64_t tiling = data->override_tiling ?:LOCAL_DRM_FORMAT_MOD_NONE ;uint32_t pixel_format = data->override_fmt ?:DRM_FORMAT_XRGB8888 ;const float flip_opacity =0.75 ; +bool amd_gpu =is_amdgpu_device (data->gfx_fd); +bool intel_gpu =is_i915_device (data->gfx_fd);remove_fbs (data);@@ -214,16 +222,21 @@ static void prepare_fbs(data_t *data, igt_output_t *output, mode =igt_output_get_mode (output);if (plane->type !=DRM_PLANE_TYPE_CURSOR ) { -if (data->use_native_resolution) { +if (amd_gpu) { w = mode->hdisplay; h = mode->vdisplay; - }else { - w =min (TEST_MAX_WIDTH , mode->hdisplay); - h =min (TEST_MAX_HEIGHT , mode->vdisplay); - } + }else if (intel_gpu) { +if (data->use_native_resolution) { + w = mode->hdisplay; + h = mode->vdisplay;
tests/kms_rotation_crc.c static void prepare_fbs(data_t *data, igt_output_t *output, · line 239
Quoted 10 lines
tests/kms_rotation_crc.c +7
-2+ }else { + w =min (TEST_MAX_WIDTH , mode->hdisplay); + h =min (TEST_MAX_HEIGHT , mode->vdisplay); + } - min_w =256 ; - min_h =256 ; + min_w =256 ; + min_h =256 ; + }
Don't need to modify this logic above: just add an is_amdgpu_device() check into test_plane_rotation to force use_native_resolution=true.
Quoted 30 lines
tests/kms_rotation_crc.c +4
-12}else { pixel_format = data->override_fmt ?:DRM_FORMAT_ARGB8888 ;@@ -255,7 +268,8 @@ static void prepare_fbs(data_t *data, igt_output_t *output,* frame can fit in */ if (data->rotation & (IGT_ROTATION_90 |IGT_ROTATION_270 )) { - tiling = data->override_tiling ?:LOCAL_I915_FORMAT_MOD_Y_TILED ; +if (intel_gpu) + tiling = data->override_tiling ?:LOCAL_I915_FORMAT_MOD_Y_TILED ;igt_swap (w, h); }@@ -266,34 +280,40 @@ static void prepare_fbs(data_t *data, igt_output_t *output,*/ igt_require (igt_display_has_format_mod (display, pixel_format, tiling)); -/* -* Create a reference software rotated flip framebuffer. -*/ -igt_create_fb (data->gfx_fd, ref_w, ref_h, pixel_format, tiling, - &data->fb_flip); -paint_squares (data, data->rotation, &data->fb_flip, - flip_opacity); -igt_plane_set_fb (plane, &data->fb_flip); -if (plane->type !=DRM_PLANE_TYPE_CURSOR ) -igt_plane_set_position (plane, data->pos_x, data->pos_y); -igt_display_commit2 (display,COMMIT_ATOMIC ); +if (intel_gpu) { +/*
tests/kms_rotation_crc.c static void prepare_fbs(data_t *data, igt_output_t *output, · line 294
Quoted 10 lines
tests/kms_rotation_crc.c +10
-0+* Create a reference software rotated flip framebuffer. +*/ +igt_create_fb (data->gfx_fd, ref_w, ref_h, pixel_format, tiling, + &data->fb_flip); +paint_squares (data, data->rotation, &data->fb_flip, + flip_opacity); +igt_plane_set_fb (plane, &data->fb_flip); +if (plane->type !=DRM_PLANE_TYPE_CURSOR ) +igt_plane_set_position (plane, data->pos_x, data->pos_y); + igt_display_commit2(display, COMMIT_ATOMIC);'
This shouldn't be i915 specific - what are you trying to workaround here?
Quoted 23 lines
tests/kms_rotation_crc.c +9
-11-igt_pipe_crc_get_current (display->drm_fd, data->pipe_crc, &data->flip_crc); +igt_pipe_crc_get_current (display->drm_fd, data->pipe_crc, &data->flip_crc); -/* -* Prepare the non-rotated flip fb. -*/ -igt_remove_fb (data->gfx_fd, &data->fb_flip); -igt_create_fb (data->gfx_fd, w, h, pixel_format, tiling, - &data->fb_flip); -paint_squares (data,IGT_ROTATION_0 , &data->fb_flip, - flip_opacity); +/* +* Prepare the non-rotated flip fb. +*/ +igt_remove_fb (data->gfx_fd, &data->fb_flip); +igt_create_fb (data->gfx_fd, w, h, pixel_format, tiling, + &data->fb_flip); +paint_squares (data,IGT_ROTATION_0 , &data->fb_flip, + flip_opacity); -/* -* Create a reference CRC for a software-rotated fb.
tests/kms_rotation_crc.c static void prepare_fbs(data_t *data, igt_output_t *output, · line 313
Quoted 10 lines
tests/kms_rotation_crc.c +7
-3-*/ -igt_create_fb (data->gfx_fd, ref_w, ref_h, pixel_format, - data->override_tiling ?:LOCAL_DRM_FORMAT_MOD_NONE , &data->fb_reference); +/* +* Create a reference CRC for a software-rotated fb. +*/ +igt_create_fb (data->gfx_fd, ref_w, ref_h, pixel_format, + data->override_tiling ?:LOCAL_DRM_FORMAT_MOD_NONE , &data->fb_reference); + }else if (amd_gpu) { + tiling =0x1900 ;
Not sure what this magic constant is - if the tiling modifiers aren't in the included DRM headers in the igt repo then we should be updating and using those new constants.
The reference probably also shouldn't be tiled here.
Quoted 19 lines
tests/kms_rotation_crc.c +7
-1+igt_create_fb (data->gfx_fd, ref_w, ref_h, pixel_format, + tiling, &data->fb_reference); + }paint_squares (data, data->rotation, &data->fb_reference,1.0 );igt_plane_set_fb (plane, &data->fb_reference);@@ -301,7 +321,10 @@ static void prepare_fbs(data_t *data, igt_output_t *output,igt_plane_set_position (plane, data->pos_x, data->pos_y);igt_display_commit2 (display,COMMIT_ATOMIC ); -igt_pipe_crc_get_current (display->drm_fd, data->pipe_crc, &data->ref_crc); +if (intel_gpu) +igt_pipe_crc_get_current (display->drm_fd, data->pipe_crc, &data->ref_crc); +else if (amd_gpu) +igt_pipe_crc_collect_crc (data->pipe_crc, &data->ref_crc);/* * Prepare the plane with an non-rotated fb let the hw rotate it.
tests/kms_rotation_crc.c static void test_single_case(data_t *data, enum pipe pipe, · line 368
Quoted 10 lines
tests/kms_rotation_crc.c +4
-3@@ -339,33 +362,37 @@ static void test_single_case(data_t *data, enum pipe pipe,/* Verify commit was ok. */ igt_assert_eq (ret,0 ); -/* Check CRC */ -igt_pipe_crc_get_current (display->drm_fd, data->pipe_crc, &crc_output); -igt_assert_crc_equal (&data->ref_crc, &crc_output); +if (is_i915_device (data->gfx_fd)) { +/* Check CRC */ +igt_pipe_crc_get_current (display->drm_fd, data->pipe_crc, &crc_output); +igt_assert_crc_equal (&data->ref_crc, &crc_output);
This should be driver generic, not i915 specific. This is basically bypassing the test, is it not?
Quoted 53 lines
tests/kms_rotation_crc.c +25
-22-/* -* If flips are requested flip to a different fb and -* check CRC against that one as well. -*/ -if (data->fb_flip.fb_id) { -igt_plane_set_fb (plane, &data->fb_flip); -if (data->rotation ==IGT_ROTATION_90 || data->rotation ==IGT_ROTATION_270 ) -igt_plane_set_size (plane, data->fb.height, data->fb.width); - -if (plane->type !=DRM_PLANE_TYPE_PRIMARY ) { -igt_display_commit_atomic (display,DRM_MODE_PAGE_FLIP_EVENT |DRM_MODE_ATOMIC_NONBLOCK ,NULL ); - }else { - ret =drmModePageFlip (data->gfx_fd, - output->config.crtc->crtc_id, - data->fb_flip.fb_id, -DRM_MODE_PAGE_FLIP_EVENT , -NULL ); -igt_assert_eq (ret,0 ); +/* +* If flips are requested flip to a different fb and +* check CRC against that one as well. +*/ +if (data->fb_flip.fb_id) { +igt_plane_set_fb (plane, &data->fb_flip); +if (data->rotation ==IGT_ROTATION_90 || data->rotation ==IGT_ROTATION_270 ) +igt_plane_set_size (plane, data->fb.height, data->fb.width); + +if (plane->type !=DRM_PLANE_TYPE_PRIMARY ) { +igt_display_commit_atomic (display,DRM_MODE_PAGE_FLIP_EVENT |DRM_MODE_ATOMIC_NONBLOCK ,NULL ); + }else { + ret =drmModePageFlip (data->gfx_fd, + output->config.crtc->crtc_id, + data->fb_flip.fb_id, +DRM_MODE_PAGE_FLIP_EVENT , +NULL ); +igt_assert_eq (ret,0 ); + } +kmstest_wait_for_pageflip (data->gfx_fd); +igt_pipe_crc_get_current (display->drm_fd, data->pipe_crc, &crc_output); +igt_assert_crc_equal (&data->flip_crc, + &crc_output); } -kmstest_wait_for_pageflip (data->gfx_fd); -igt_pipe_crc_get_current (display->drm_fd, data->pipe_crc, &crc_output); -igt_assert_crc_equal (&data->flip_crc, - &crc_output); + }else if (is_amdgpu_device (data->gfx_fd)) { +igt_pipe_crc_collect_crc (data->pipe_crc, &crc_output); } }
tests/kms_rotation_crc.c static void test_plane_rotation(data_t *data, int plane_type, bool test_bad_form · line 438
Quoted 10 lines
tests/kms_rotation_crc.c +3
-4@@ -406,54 +433,74 @@ static void test_plane_rotation(data_t *data, int plane_type, bool test_bad_formigt_plane_t *plane;int i, j; -if (IS_CHERRYVIEW (data->devid) && pipe !=PIPE_B ) -continue ; - -igt_output_set_pipe (output, pipe); +if (is_i915_device (data->gfx_fd)) { +if (IS_CHERRYVIEW (data->devid) && pipe !=PIPE_B ) +continue ;
I think we can combine this check into just is_i915_device(...) && IS_CEHRRYVIEW(...).
The rest can stay.
Quoted 84 lines
tests/kms_rotation_crc.c +42
-29- plane =igt_output_get_plane_type (output, plane_type); -igt_require (igt_plane_has_prop (plane,IGT_PLANE_ROTATION )); +igt_output_set_pipe (output, pipe); -prepare_crtc (data, output, pipe, plane, true); + plane =igt_output_get_plane_type (output, plane_type); +igt_require (igt_plane_has_prop (plane,IGT_PLANE_ROTATION )); -for (i =0 ; i < num_rectangle_types; i++) { -/* Unsupported on i915 */ -if (plane_type ==DRM_PLANE_TYPE_CURSOR && - i != square) -continue ; +prepare_crtc (data, output, pipe, plane, true); -/* Only support partial covering primary plane on gen9+ */ -if (plane_type ==DRM_PLANE_TYPE_PRIMARY && -intel_gen (intel_get_drm_devid (data->gfx_fd)) <9 ) { -if (i != rectangle) +for (i =0 ; i < num_rectangle_types; i++) { +/* Unsupported on i915 */ +if (plane_type ==DRM_PLANE_TYPE_CURSOR && + i != square)continue ; -else - data->use_native_resolution = true; - }else { - data->use_native_resolution = false; - } -if (!data->override_fmt) { -struct igt_vec tested_formats; +/* Only support partial covering primary plane on gen9+ */ +if (plane_type ==DRM_PLANE_TYPE_PRIMARY && +intel_gen (intel_get_drm_devid (data->gfx_fd)) <9 ) { +if (i != rectangle) +continue ; +else + data->use_native_resolution = true; + }else { + data->use_native_resolution = false; + } -igt_vec_init (&tested_formats,sizeof (uint32_t )); +if (!data->override_fmt) { +struct igt_vec tested_formats; -for (j =0 ; j < plane->drm_plane->count_formats; j++) { -uint32_t format = plane->drm_plane->formats[j]; +igt_vec_init (&tested_formats,sizeof (uint32_t )); -if (!test_format (data, &tested_formats, format)) -continue ; +for (j =0 ; j < plane->drm_plane->count_formats; j++) { +uint32_t format = plane->drm_plane->formats[j]; +if (!test_format (data, &tested_formats, format)) +continue ; + +test_single_case (data, pipe, output, plane, i, + format, test_bad_format); + } + +igt_vec_fini (&tested_formats); + }else {test_single_case (data, pipe, output, plane, i, - format, test_bad_format); + data->override_fmt, test_bad_format); } + } + }else if (is_amdgpu_device (data->gfx_fd)) { +uint32_t format =DRM_FORMAT_XRGB8888 ; -igt_vec_fini (&tested_formats); - }else { -test_single_case (data, pipe, output, plane, i, - data->override_fmt, test_bad_format); +igt_output_set_pipe (output, pipe); + + plane =igt_output_get_plane_type (output,DRM_PLANE_TYPE_PRIMARY ); +igt_require (igt_plane_has_prop (plane,IGT_PLANE_ROTATION )); + +prepare_crtc (data, output, pipe, plane, false);
tests/kms_rotation_crc.c static void test_plane_rotation(data_t *data, int plane_type, bool test_bad_form · line 503
Quoted 10 lines
tests/kms_rotation_crc.c +8
-0+ +if (plane_type !=DRM_PLANE_TYPE_PRIMARY ) { + plane =igt_output_get_plane_type (output, plane_type); +igt_require (igt_plane_has_prop (plane,IGT_PLANE_ROTATION )); } + +test_single_case (data, pipe, output, plane, + rectangle, format, test_bad_format); } +
Is this to just avoid testing all the formats? Can you modify test_format() instead to return false for anything that's not XRGB8888/ARGB8888 for amdgpu?
Quoted 20 lines
tests/kms_rotation_crc.c +5
-3igt_pipe_crc_stop (data->pipe_crc); } }@@ -832,9 +879,11 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)int gen =0 ; igt_fixture { - data.gfx_fd =drm_open_driver_master (DRIVER_INTEL ); - data.devid =intel_get_drm_devid (data.gfx_fd); - gen =intel_gen (data.devid); + data.gfx_fd =drm_open_driver_master (DRIVER_INTEL |DRIVER_AMDGPU ); +if (is_i915_device (data.gfx_fd)) { + data.devid =intel_get_drm_devid (data.gfx_fd); + gen =intel_gen (data.devid); + }kmstest_set_vt_graphics_mode ();@@ -848,9 +897,11 @@ igt_main_args("", long_opts, help_str, opt_handler, &data) igt_subtest_f("%s-rotation-%s",
tests/kms_rotation_crc.c igt_main_args("", long_opts, help_str, opt_handler, &data) · line 904
Quoted 10 lines
tests/kms_rotation_crc.c +5
-3plane_test_str(subtest->plane), rot_test_str(subtest->rot)) { -igt_require (!(subtest->rot & - (IGT_ROTATION_90 |IGT_ROTATION_270 )) || - gen >=9 ); +if (is_i915_device (data.gfx_fd)) { +igt_require (!(subtest->rot & + (IGT_ROTATION_90 |IGT_ROTATION_270 )) || + gen >=9 ); + }
Can simplify this check by merging the two conditions into the require.
Regards,
Nicholas Kazlauskas
tests/kms_rotation_crc.c igt_main_args("", long_opts, help_str, opt_handler, &data) · line 907
Quoted 4 lines
tests/kms_rotation_crc.c +0
-0data.rotation = subtest->rot;test_plane_rotation (&data, subtest->plane, false); }
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✓ Fi.CI.BAT: success for series starting with [1/2] lib: Add stride and size calculation for amdgpu + tiling
In reply to Sung Joon Kim== Series Details ==
== Series Details ==
Series: series starting with [1/2] lib: Add stride and size calculation for amdgpu + tiling
URL : https://patchwork.freedesktop.org/series/85020/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9495 -> IGTPW_5303
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/index.html
Known issues
------------
Here are the changes found in IGTPW_5303 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@gt_heartbeat:
- fi-glk-dsi: [PASS][1] -> [DMESG-FAIL][2] ([i915#2291] / [i915#541])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/fi-glk-dsi/igt@i915_selftest@live@gt_heartbeat.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/fi-glk-dsi/igt@i915_selftest@live@gt_heartbeat.html
[i915#2291]: https://gitlab.freedesktop.org/drm/intel/issues/2291
[i915#541]: https://gitlab.freedesktop.org/drm/intel/issues/541
Participating hosts (42 -> 37)
------------------------------
Missing (5): fi-hsw-4200u fi-bsw-cyan fi-dg1-1 fi-tgl-y fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5905 -> IGTPW_5303
CI-20190529: 20190529
CI_DRM_9495: 2960e86fd8fd7659400d05f40a1e06d3a97b6987 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_5303: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/index.html
IGT_5905: 3d0934900bddeb7a68f1abab4cd05077f0609e32 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/index.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✓ Fi.CI.IGT: success for series starting with [1/2] lib: Add stride and size calculation for amdgpu + tiling
In reply to Sung Joon Kim== Series Details ==
== Series Details ==
Series: series starting with [1/2] lib: Add stride and size calculation for amdgpu + tiling
URL : https://patchwork.freedesktop.org/series/85020/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9495_full -> IGTPW_5303_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/index.html
New tests
---------
New tests have been introduced between CI_DRM_9495_full and IGTPW_5303_full:
### New IGT tests (4) ###
* igt@kms_atomic_transition@modeset-transition:
- Statuses :
- Exec time: [None] s
* igt@kms_atomic_transition@modeset-transition-fencing:
- Statuses :
- Exec time: [None] s
* igt@kms_atomic_transition@modeset-transition-nonblocking:
- Statuses :
- Exec time: [None] s
* igt@kms_atomic_transition@modeset-transition-nonblocking-fencing:
- Statuses :
- Exec time: [None] s
Known issues
------------
Here are the changes found in IGTPW_5303_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@feature_discovery@psr2:
- shard-iclb: [PASS][1] -> [SKIP][2] ([i915#658])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-iclb2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-iclb8/igt@[email protected]
* igt@gem_exec_fence@basic-wait@bcs0:
- shard-glk: NOTRUN -> [SKIP][3] ([fdo#109271]) +9 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-glk5/igt@gem_exec_fence@[email protected]
* igt@gem_exec_params@secure-non-master:
- shard-tglb: NOTRUN -> [SKIP][4] ([fdo#112283])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-tglb1/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][5] ([fdo#112283])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-iclb1/igt@[email protected]
* igt@gem_exec_reloc@basic-many-active@vcs1:
- shard-iclb: NOTRUN -> [FAIL][6] ([i915#2389])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-iclb4/igt@gem_exec_reloc@[email protected]
* igt@gen7_exec_parse@basic-allowed:
- shard-tglb: NOTRUN -> [SKIP][7] ([fdo#109289]) +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-tglb7/igt@[email protected]
* igt@gen9_exec_parse@secure-batches:
- shard-tglb: NOTRUN -> [SKIP][8] ([fdo#112306])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-tglb3/igt@[email protected]
* igt@i915_pm_rpm@i2c:
- shard-tglb: NOTRUN -> [SKIP][9] ([i915#579])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-tglb7/igt@[email protected]
- shard-glk: [PASS][10] -> [SKIP][11] ([fdo#109271])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-glk9/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-glk7/igt@[email protected]
- shard-hsw: [PASS][12] -> [SKIP][13] ([fdo#109271])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-hsw1/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-hsw6/igt@[email protected]
- shard-iclb: [PASS][14] -> [SKIP][15] ([i915#579])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-iclb1/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-iclb3/igt@[email protected]
* igt@kms_async_flips@test-time-stamp:
- shard-tglb: [PASS][16] -> [FAIL][17] ([i915#2574])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-tglb3/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-tglb6/igt@[email protected]
* igt@kms_big_fb@linear-16bpp-rotate-90:
- shard-apl: NOTRUN -> [SKIP][18] ([fdo#109271]) +34 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-apl7/igt@[email protected]
- shard-tglb: NOTRUN -> [SKIP][19] ([fdo#111614])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-tglb8/igt@[email protected]
* igt@kms_big_fb@yf-tiled-64bpp-rotate-270:
- shard-tglb: NOTRUN -> [SKIP][20] ([fdo#111615]) +1 similar issue
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-tglb8/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][21] ([fdo#110723])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-iclb3/igt@[email protected]
* igt@kms_chamelium@dp-audio-edid:
- shard-tglb: NOTRUN -> [SKIP][22] ([fdo#109284] / [fdo#111827])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-tglb8/igt@[email protected]
* igt@kms_chamelium@vga-hpd-enable-disable-mode:
- shard-apl: NOTRUN -> [SKIP][23] ([fdo#109271] / [fdo#111827]) +1 similar issue
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-apl2/igt@[email protected]
- shard-kbl: NOTRUN -> [SKIP][24] ([fdo#109271] / [fdo#111827]) +1 similar issue
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-kbl6/igt@[email protected]
* igt@kms_content_protection@legacy:
- shard-kbl: NOTRUN -> [TIMEOUT][25] ([i915#1319])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-kbl1/igt@[email protected]
- shard-tglb: NOTRUN -> [SKIP][26] ([fdo#111828])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-tglb1/igt@[email protected]
- shard-apl: NOTRUN -> [TIMEOUT][27] ([i915#1319])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-apl6/igt@[email protected]
* igt@kms_cursor_crc@pipe-d-cursor-suspend:
- shard-kbl: NOTRUN -> [SKIP][28] ([fdo#109271]) +33 similar issues
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-kbl1/igt@[email protected]
* igt@kms_cursor_legacy@pipe-d-torture-bo:
- shard-kbl: NOTRUN -> [SKIP][29] ([fdo#109271] / [i915#533]) +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-kbl1/igt@[email protected]
- shard-apl: NOTRUN -> [SKIP][30] ([fdo#109271] / [i915#533]) +1 similar issue
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-apl1/igt@[email protected]
* igt@kms_flip@2x-flip-vs-modeset-vs-hang:
- shard-iclb: NOTRUN -> [SKIP][31] ([fdo#109274]) +2 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-iclb7/igt@[email protected]
* igt@kms_flip@flip-vs-blocking-wf-vblank@a-edp1:
- shard-tglb: [PASS][32] -> [FAIL][33] ([i915#2122])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-tglb6/igt@kms_flip@[email protected]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-tglb5/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-cur-indfb-onoff:
- shard-tglb: NOTRUN -> [SKIP][34] ([fdo#111825]) +8 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-tglb2/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][35] ([fdo#109280])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-iclb6/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-msflip-blt:
- shard-hsw: NOTRUN -> [SKIP][36] ([fdo#109271]) +3 similar issues
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-hsw8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-msflip-blt.html
* igt@kms_hdr@static-toggle-dpms:
- shard-tglb: NOTRUN -> [SKIP][37] ([i915#1187])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-tglb8/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][38] ([i915#1187])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-iclb3/igt@[email protected]
* igt@kms_psr@psr2_sprite_plane_onoff:
- shard-iclb: [PASS][39] -> [SKIP][40] ([fdo#109441])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-iclb2/igt@kms_psr@psr2_sprite_plane_onoff.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-iclb5/igt@kms_psr@psr2_sprite_plane_onoff.html
* igt@kms_vblank@pipe-c-ts-continuation-suspend:
- shard-glk: [PASS][41] -> [DMESG-WARN][42] ([i915#1602] / [i915#2635])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-glk9/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-glk7/igt@[email protected]
- shard-tglb: [PASS][43] -> [INCOMPLETE][44] ([i915#1436] / [i915#1798] / [i915#1982] / [i915#456])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-tglb1/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-tglb7/igt@[email protected]
- shard-apl: [PASS][45] -> [DMESG-WARN][46] ([i915#1602] / [i915#2635])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-apl2/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-apl3/igt@[email protected]
- shard-kbl: [PASS][47] -> [DMESG-WARN][48] ([i915#1602])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-kbl1/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-kbl2/igt@[email protected]
- shard-hsw: [PASS][49] -> [DMESG-WARN][50] ([i915#2637])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-hsw8/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-hsw6/igt@[email protected]
- shard-iclb: [PASS][51] -> [DMESG-WARN][52] ([i915#1602])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-iclb3/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-iclb3/igt@[email protected]
* igt@prime_nv_api@i915_nv_import_twice_check_flink_name:
- shard-tglb: NOTRUN -> [SKIP][53] ([fdo#109291])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-tglb8/igt@prime_nv_api@i915_nv_import_twice_check_flink_name.html
#### Possible fixes ####
* igt@gem_exec_reloc@basic-many-active@rcs0:
- shard-glk: [FAIL][54] ([i915#2389]) -> [PASS][55]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-glk5/igt@gem_exec_reloc@[email protected]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-glk8/igt@gem_exec_reloc@[email protected]
* {igt@gem_exec_schedule@u-fairslice@rcs0}:
- shard-kbl: [DMESG-WARN][56] ([i915#1610]) -> [PASS][57]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-kbl7/igt@gem_exec_schedule@[email protected]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-kbl6/igt@gem_exec_schedule@[email protected]
- shard-apl: [DMESG-WARN][58] ([i915#1610]) -> [PASS][59]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-apl1/igt@gem_exec_schedule@[email protected]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-apl2/igt@gem_exec_schedule@[email protected]
* igt@kms_concurrent@pipe-b:
- shard-kbl: [DMESG-WARN][60] ([i915#180] / [i915#78]) -> [PASS][61]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-kbl2/igt@[email protected]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-kbl4/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-apl: [DMESG-WARN][62] ([i915#2635]) -> [PASS][63]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-apl7/igt@[email protected]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-apl4/igt@[email protected]
- shard-iclb: [DMESG-WARN][64] -> [PASS][65]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-iclb5/igt@[email protected]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-iclb5/igt@[email protected]
- shard-glk: [DMESG-WARN][66] ([i915#2635]) -> [PASS][67]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-glk7/igt@[email protected]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-glk9/igt@[email protected]
- shard-hsw: [DMESG-WARN][68] ([i915#2637]) -> [PASS][69]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-hsw2/igt@[email protected]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-hsw7/igt@[email protected]
- shard-kbl: [DMESG-WARN][70] -> [PASS][71]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-kbl3/igt@[email protected]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-kbl7/igt@[email protected]
- shard-tglb: [INCOMPLETE][72] ([i915#1436] / [i915#1798] / [i915#1982] / [i915#456]) -> [PASS][73]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-tglb7/igt@[email protected]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-tglb3/igt@[email protected]
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
- shard-hsw: [FAIL][74] ([i915#96]) -> [PASS][75]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-hsw1/igt@[email protected]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-hsw4/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1:
- shard-tglb: [FAIL][76] ([i915#2598]) -> [PASS][77]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-tglb7/igt@kms_flip@[email protected]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-tglb5/igt@kms_flip@[email protected]
* igt@kms_psr@psr2_sprite_blt:
- shard-iclb: [SKIP][78] ([fdo#109441]) -> [PASS][79]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-iclb3/igt@kms_psr@psr2_sprite_blt.html
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-iclb2/igt@kms_psr@psr2_sprite_blt.html
* igt@kms_vblank@pipe-b-ts-continuation-dpms-rpm:
- shard-hsw: [SKIP][80] ([fdo#109271]) -> [PASS][81]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-hsw8/igt@[email protected]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-hsw2/igt@[email protected]
#### Warnings ####
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][82] ([i915#588]) -> [SKIP][83] ([i915#658])
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-iclb2/igt@[email protected]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-iclb1/igt@[email protected]
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-iclb: [WARN][84] ([i915#1804] / [i915#2684]) -> [WARN][85] ([i915#2681] / [i915#2684])
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-iclb6/igt@[email protected]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-iclb8/igt@[email protected]
* igt@i915_pm_rpm@gem-execbuf-stress-pc8:
- shard-iclb: [SKIP][86] ([i915#579]) -> [SKIP][87] ([fdo#109293] / [fdo#109506])
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-iclb8/igt@[email protected]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-iclb2/igt@[email protected]
- shard-tglb: [SKIP][88] ([i915#579]) -> [SKIP][89] ([fdo#109506] / [i915#2411])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-tglb6/igt@[email protected]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-tglb6/igt@[email protected]
* igt@runner@aborted:
- shard-kbl: ([FAIL][90], [FAIL][91], [FAIL][92]) ([i915#1814] / [i915#2295] / [i915#2426] / [i915#2722] / [i915#483]) -> ([FAIL][93], [FAIL][94]) ([i915#1814] / [i915#2295] / [i915#2722] / [i915#483] / [i915#602])
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-kbl2/igt@[email protected]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-kbl7/igt@[email protected]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-kbl3/igt@[email protected]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-kbl1/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-kbl2/igt@[email protected]
- shard-iclb: ([FAIL][95], [FAIL][96]) ([i915#1814] / [i915#2295] / [i915#2722] / [i915#2724] / [i915#483]) -> ([FAIL][97], [FAIL][98], [FAIL][99]) ([i915#1814] / [i915#2295] / [i915#2426] / [i915#2722] / [i915#2724])
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-iclb8/igt@[email protected]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-iclb5/igt@[email protected]
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-iclb3/igt@[email protected]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-iclb3/igt@[email protected]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-iclb4/igt@[email protected]
- shard-apl: ([FAIL][100], [FAIL][101], [FAIL][102]) ([i915#1610] / [i915#1814] / [i915#2295] / [i915#2426] / [i915#2722]) -> ([FAIL][103], [FAIL][104]) ([i915#1814] / [i915#2295] / [i915#2722])
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-apl6/igt@[email protected]
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-apl7/igt@[email protected]
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-apl1/igt@[email protected]
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-apl3/igt@[email protected]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-apl1/igt@[email protected]
- shard-tglb: ([FAIL][105], [FAIL][106], [FAIL][107]) ([i915#1602] / [i915#1764] / [i915#2295] / [i915#2426] / [i915#2722]) -> ([FAIL][108], [FAIL][109], [FAIL][110]) ([i915#1602] / [i915#2295] / [i915#2426] / [i915#2722])
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-tglb7/igt@[email protected]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-tglb6/igt@[email protected]
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9495/shard-tglb3/igt@[email protected]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-tglb1/igt@[email protected]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-tglb7/igt@[email protected]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/shard-tglb8/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109293]: https://bugs.freedesktop.org/show_bug.cgi?id=109293
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#111828]: https://bugs.freedesktop.org/show_bug.cgi?id=111828
[fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283
[fdo#112306]: https://bugs.freedesktop.org/show_bug.cgi?id=112306
[i915#1187]: https://gitlab.freedesktop.org/drm/intel/issues/1187
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1602]: https://gitlab.freedesktop.org/drm/intel/issues/1602
[i915#1610]: https://gitlab.freedesktop.org/drm/intel/issues/1610
[i915#1764]: https://gitlab.freedesktop.org/drm/intel/issues/1764
[i915#1798]: https://gitlab.freedesktop.org/drm/intel/issues/1798
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1804]: https://gitlab.freedesktop.org/drm/intel/issues/1804
[i915#1814]: https://gitlab.freedesktop.org/drm/intel/issues/1814
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2295]: https://gitlab.freedesktop.org/drm/intel/issues/2295
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2574]: https://gitlab.freedesktop.org/drm/intel/issues/2574
[i915#2598]: https://gitlab.freedesktop.org/drm/intel/issues/2598
[i915#2635]: https://gitlab.freedesktop.org/drm/intel/issues/2635
[i915#2637]: https://gitlab.freedesktop.org/drm/intel/issues/2637
[i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#2684]: https://gitlab.freedesktop.org/drm/intel/issues/2684
[i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
[i915#2724]: https://gitlab.freedesktop.org/drm/intel/issues/2724
[i915#2803]: https://gitlab.freedesktop.org/drm/intel/issues/2803
[i915#456]: https://gitlab.freedesktop.org/drm/intel/issues/456
[i915#483]: https://gitlab.freedesktop.org/drm/intel/issues/483
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#579]: https://gitlab.freedesktop.org/drm/intel/issues/579
[i915#588]: https://gitlab.freedesktop.org/drm/intel/issues/588
[i915#602]: https://gitlab.freedesktop.org/drm/intel/issues/602
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#78]: https://gitlab.freedesktop.org/drm/intel/issues/78
[i915#96]: https://gitlab.freedesktop.org/drm/intel/issues/96
Participating hosts (10 -> 8)
------------------------------
Missing (2): pig-skl-6260u pig-glk-j5005
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5905 -> IGTPW_5303
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_9495: 2960e86fd8fd7659400d05f40a1e06d3a97b6987 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_5303: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/index.html
IGT_5905: 3d0934900bddeb7a68f1abab4cd05077f0609e32 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5303/index.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Quoted 24 lines · Sung Joon Kim
For amdgpu, we need to calculate the stride and size of framebuffer correctly during non-linear tiling mode
Signed-off-by Sung Joon Kim <[email protected]>--- lib/igt_fb.c | 11 +++++++++++ 1 file changed, 11 insertions(+)lib/igt_fb.c +5
-0@@ -670,6 +670,11 @@ static uint32_t calc_plane_stride(struct igt_fb *fb, int plane)* so the easiest way is to align the luma stride to 256. */ return ALIGN (min_stride,256 ); + }else if (fb->modifier !=LOCAL_DRM_FORMAT_MOD_NONE &&is_amdgpu_device (fb->fd)) { +/* +* For amdgpu device with tiling mode +*/ +return ALIGN (min_stride,512 ); }else if (is_gen12_ccs_cc_plane (fb, plane)) {/* clear color always fixed to 64 bytes */ return 64 ;
lib/igt_fb.c static uint64_t calc_plane_size(struct igt_fb *fb, int plane) · line 723
Quoted 9 lines
lib/igt_fb.c +6
-0@@ -710,6 +715,12 @@ static uint64_t calc_plane_size(struct igt_fb *fb, int plane) size =roundup_power_of_two (size);return size; + }else if (fb->modifier !=LOCAL_DRM_FORMAT_MOD_NONE &&is_amdgpu_device (fb->fd)) { +/* +* For amdgpu device with tiling mode +*/ +return (uint64_t ) fb->strides[plane] * +ALIGN (fb->plane_height[plane],512 );
Is the requirement that only the stride be aligned to 512? Are you sure we need to bypass the regular plane size calculation here?
Regards,
Nicholas Kazlauskas
lib/igt_fb.c static uint64_t calc_plane_size(struct igt_fb *fb, int plane) · line 726
Quoted 4 lines
lib/igt_fb.c +0
-0}else if (is_gen12_ccs_plane (fb, plane)) {/* The AUX CCS surface must be page aligned */ return (uint64_t)fb->strides[plane] *
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev