Add Y-tiling support into IGTs
v2 cover Add Y-tiling support into IGTs
This series adds Y-tiled buffer creation support into IGT libraries and goes on to use this capability to add support into FBC tests to use Y-tiled buffers.
Akash Goel (1):
lib/igt_draw: Add Y-tiling support for IGT_DRAW_BLT method
Paulo Zanoni (1):
tests/kms_draw_crc: add support for Y tiling
Praveen Paneri (5):
lib/igt_fb: Let others use igt_get_fb_tile_size lib/igt_fb: Add helper function for tile_to_mod lib/igt_draw: Add Y-tiling support igt/kms_frontbuffer_tracking: Add Y-tiling support igt/kms_fbc_crc.c : Add Y-tile tests
lib/igt_draw.c | 165 ++++++++++++++++++++++++++++----------- lib/igt_fb.c | 41 +++++++++- lib/igt_fb.h | 4 +- tests/kms_draw_crc.c | 58 ++++++++++---- tests/kms_fbc_crc.c | 71 +++++++++-------- tests/kms_frontbuffer_tracking.c | 48 +++++++----- 6 files changed, 273 insertions(+), 114 deletions(-)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/7 lib/igt_fb: Let others use igt_get_fb_tile_size
This function can be used by igt_draw to get accurate tile dimensions for all tile formats.
v2: Added comments to function igt_get_fb_tile_size (Daniel)
--- lib/igt_fb.c | 16 +++++++++++++--- lib/igt_fb.h | 3 ++- 2 files changed, 15 insertions(+), 4 deletions(-)
lib/igt_fb.c +13 -3
@@ -73,9 +73,19 @@ static struct format_desc_struct {#define for_each_format (f) \ for (f = format_desc; f - format_desc < ARRAY_SIZE(format_desc); f++) - -static void igt_get_fb_tile_size (int fd,uint64_t tiling,int fb_bpp, -unsigned *width_ret,unsigned *height_ret) +/** +* igt_get_fb_tile_size: +* @fd: The DRM file descriptor +* @tiling: Tiling layout of the framebuffer (as framebuffer modifier) +* @fb_bpp: Bytes per pixel of the framebuffer +* @width_ret: Width of the tile in pixels +* @height_ret: Height of the tile in pixels +* +* This function returns width and height of a tile based on the given tiling +* format. +*/ +void igt_get_fb_tile_size (int fd,uint64_t tiling,int fb_bpp, +unsigned *width_ret,unsigned *height_ret) {switch (tiling) {case LOCAL_DRM_FORMAT_MOD_NONE :
lib/igt_fb.h +2 -1
@@ -94,7 +94,8 @@ enum igt_text_align { align_vcenter =0x04 , align_hcenter = 0x08, }; - +void igt_get_fb_tile_size (int fd,uint64_t tiling,int fb_bpp, +unsigned *width_ret,unsigned *height_ret);void igt_calc_fb_size (int fd,int width,int height,int bpp,uint64_t tiling,unsigned *size_ret,unsigned *stride_ret);unsigned int
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 1/7] lib/igt_fb: Let others use igt_get_fb_tile_size
Em Sex, 2017-04-28 às 20:07 +0530, Praveen Paneri escreveu:
Quoted 16 lines
This function can be used by
igt_drawto get accurate tile dimensions for all tile formats.v2: Added comments to function
igt_get_fb_tile_size(Daniel)Signed-off-by Praveen Paneri <[email protected]>---
lib/igt_fb.c | 16 +++++++++++++---
lib/igt_fb.h | 3 ++-2 files changed, 15 insertions(+), 4 deletions(-)lib/igt_fb.c +0
-0@@ -73,9 +73,19 @@ static struct format_desc_struct {
Quoted 5 lines
#definefor_each_format(f)\
for (f =format_desc; f -format_desc<ARRAY_SIZE(format_desc); f++)
-
Please don't remove the blank line above.
Quoted 10 lines
-static void igt_get_fb_tile_size(int fd,
uint64_ttiling, intfb_bpp,lib/igt_fb.c +0
-1- unsigned *width_ret, unsigned
*height_ret)
+/**
+ *igt_get_fb_tile_size:
+ * @fd: The DRM file descriptor
+ * @tiling: Tiling layout of the framebuffer (as framebuffer modifier)
+ * @fb_bpp: Bytes per pixel of the framebuffer
Bits, not bytes.
Quoted 1 line
+ * @width_ret: Width of the tile in pixels
I think this is in bytes, not pixels.
Quoted 1 line
+ * @height_ret: Height of the tile in pixels
I think saying "lines" instead of pixels would be more appropriate here.
Oh, and since we're already going to have to change some other things, here's an OCD bikeshed: the rest of the file seems to use:
* @param: description
instead of:
* @param: Description
so you may opt to use the current standard.
Quoted 15 lines
+ *
+ * This function returns width and height of a tile based on the given tiling
+ * format.
+ */lib/igt_fb.c +2
-0+void igt_get_fb_tile_size (int fd,uint64_t tiling,int fb_bpp, + unsigned *width_ret, unsigned *height_ret){
switch (tiling) {
caseLOCAL_DRM_FORMAT_MOD_NONE:lib/igt_fb.h +0
-0
lib/igt_fb.h enum igt_text_align { · line 98
Quoted 5 lines
lib/igt_fb.h +0
-1@@ -94,7 +94,8 @@ enum igt_text_align { align_vcenter = 0x04, align_hcenter = 0x08, }; -
Please don't remove the blank line above.
Thanks,
Paulo
Quoted 7 lines
lib/igt_fb.h +2
-0+void igt_get_fb_tile_size (int fd,uint64_t tiling,int fb_bpp, + unsigned *width_ret, unsigned *height_ret); void igt_calc_fb_size(int fd, int width, int height, int bpp,
uint64_ttiling,
unsigned*size_ret, unsigned*stride_ret); unsigned int
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/7 lib/igt_fb: Add helper function for tile_to_mod
In reply to Praveen Paneriigt_get_fb_tile_size function takes modifer as an argument This helper function will let users to convert tiling to modifier and use igt_get_fb_tile_size()
--- lib/igt_fb.c | 26 ++++++++++++++++++++++++++ lib/igt_fb.h | 1 + 2 files changed, 27 insertions(+)
lib/igt_fb.c +26 -0
@@ -216,6 +216,32 @@ uint64_t igt_fb_mod_to_tiling(uint64_t modifier) } } +/** +* igt_fb_tiling_to_mod: +* @tiling: DRM framebuffer tiling +* +* This function converts a DRM framebuffer tiling to its corresponding +* modifier constant. +* +* Returns: +* A tiling constant +*/ +uint64_t igt_fb_tiling_to_mod (uint64_t tiling) +{ +switch (tiling) { +case I915_TILING_NONE : +return LOCAL_DRM_FORMAT_MOD_NONE ; +case I915_TILING_X : +return LOCAL_I915_FORMAT_MOD_X_TILED ; +case I915_TILING_Y : +return LOCAL_I915_FORMAT_MOD_Y_TILED ; +case I915_TILING_Yf: +return LOCAL_I915_FORMAT_MOD_Yf_TILED; +default : +igt_assert (0 ); + } +} +/* helpers to create nice-looking framebuffers */ static int create_bo_for_fb(int fd, int width, int height, uint32_t format, uint64_t tiling, unsigned size, unsigned stride,
lib/igt_fb.h +1 -0
@@ -131,6 +131,7 @@ int igt_create_bo_with_dimensions(int fd, int width, int height, uint32_t format bool *is_dumb);uint64_t igt_fb_mod_to_tiling (uint64_t modifier); +uint64_t igt_fb_tiling_to_mod (uint64_t tiling);/* cairo-based painting */ cairo_t *igt_get_cairo_ctx (int fd,struct igt_fb *fb);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/7] lib/igt_fb: Add helper function for tile_to_mod
Em Sex, 2017-04-28 às 20:07 +0530, Praveen Paneri escreveu:
Quoted 20 lines
igt_get_fb_tile_sizefunction takes modifer as an argument This helper function will let users to convert tiling to modifier and useigt_get_fb_tile_size()Signed-off-by Praveen Paneri <[email protected]>---
lib/igt_fb.c | 26 ++++++++++++++++++++++++++
lib/igt_fb.h | 1 +2 files changed, 27 insertions(+)lib/igt_fb.c +0
-0@@ -216,6 +216,32 @@ uint64_t igt_fb_mod_to_tiling(uint64_t modifier) } }
+/**
+ *igt_fb_tiling_to_mod:
Quoted 8 lines
+ * @tiling: DRM framebuffer tiling
+ *
+ * This function converts a DRM framebuffer tiling to its corresponding
+ * modifier constant.
+ *
+ * Returns:
+ * A tiling constant
A modifier constant.
Besides this, the patch looks good.
Quoted 27 lines
+ */
lib/igt_fb.c +16
-0+uint64_t igt_fb_tiling_to_mod (uint64_t tiling) +{ +switch (tiling) { +case I915_TILING_NONE : +return LOCAL_DRM_FORMAT_MOD_NONE ; +case I915_TILING_X : +return LOCAL_I915_FORMAT_MOD_X_TILED ; +case I915_TILING_Y : +return LOCAL_I915_FORMAT_MOD_Y_TILED ; +case I915_TILING_Yf: +return LOCAL_I915_FORMAT_MOD_Yf_TILED; +default : +igt_assert (0 ); + } +} +/* helpers to create nice-looking framebuffers */
static int create_bo_for_fb(int fd, int width, int height,uint32_tformat,
uint64_t tiling, unsigned size, unsigned stride,lib/igt_fb.h +0
-0@@ -131,6 +131,7 @@ int igt_create_bo_with_dimensions(int fd, int
Quoted 8 lines
width, int height,
uint32_tformat
bool*is_dumb);
uint64_tigt_fb_mod_to_tiling(uint64_t modifier); +uint64_tigt_fb_tiling_to_mod(uint64_t tiling);
/* cairo-based painting */
cairo_t *igt_get_cairo_ctx(int fd, structigt_fb*fb);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/7 lib/igt_draw: Add Y-tiling support
In reply to Praveen PaneriThis patch adds Y-tiling support for igt_draw_rect function.
v2:
Use helper function to get tile sizes (Ville)
--- lib/igt_draw.c | 132 +++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 87 insertions(+), 45 deletions(-)
lib/igt_draw.c +87 -45
@@ -136,32 +136,47 @@ static int swizzle_addr(int addr, int swizzle)/* It's all in "pixel coordinates", so make sure you multiply/divide by the bpp * if you need to. */ -static int linear_x_y_to_tiled_pos (int x,int y,uint32_t stride,int swizzle, -int bpp) +static int linear_x_y_to_tiled_pos (int fd,int x,int y,uint32_t stride,int swizzle, +int bpp,int tiling) { -int x_tile_size, y_tile_size; -int x_tile_n, y_tile_n, x_tile_off, y_tile_off; -int line_size, tile_size; +uint32_t tile_width, tile_height, tile_size; +int tile_x, tile_y;/* Co-ordinates of the tile holding the pixel */ +int tile_x_off, tile_y_off;/* pixel position inside the tile */ int tile_n, tile_off; -int tiled_pos, tiles_per_line; +int line_size, tiles_per_line; +int tiled_pos;int pixel_size = bpp /8 ; +igt_get_fb_tile_size (fd, (uint64_t )igt_fb_tiling_to_mod (tiling), bpp, + &tile_width, &tile_height); + line_size = stride; - x_tile_size =512 ; - y_tile_size =8 ; - tile_size = x_tile_size * y_tile_size; - tiles_per_line = line_size / x_tile_size; + tile_size = tile_width * tile_height; + tiles_per_line = line_size / tile_width; - y_tile_n = y / y_tile_size; - y_tile_off = y % y_tile_size; + tile_y = y / tile_height; + tile_y_off = y % tile_height; - x_tile_n = (x * pixel_size) / x_tile_size; - x_tile_off = (x * pixel_size) % x_tile_size; + tile_x = (x * pixel_size) / tile_width; + tile_x_off = (x * pixel_size) % tile_width; - tile_n = y_tile_n * tiles_per_line + x_tile_n; - tile_off = y_tile_off * x_tile_size + x_tile_off; - tiled_pos = tile_n * tile_size + tile_off; + tile_n = tile_y * tiles_per_line + tile_x; + +if (tiling ==I915_TILING_X ) { + tile_off = tile_y_off * tile_width + tile_x_off; + }else {/* (tiling == I915_TILING_Y ) */ +int x_oword_n, x_oword_off; +int oword_size =16 ; + +/* computation inside the tile */ + x_oword_n = tile_x_off / oword_size; + x_oword_off = tile_x_off % oword_size; + tile_off = x_oword_n * tile_height * oword_size + + tile_y_off * oword_size + + x_oword_off; + } + tiled_pos = tile_n * tile_size + tile_off; tiled_pos =swizzle_addr (tiled_pos, swizzle);return tiled_pos / pixel_size;
@@ -169,34 +184,49 @@ static int linear_x_y_to_tiled_pos(int x, int y, uint32_t stride, int swizzle,/* It's all in "pixel coordinates", so make sure you multiply/divide by the bpp * if you need to. */ -static void tiled_pos_to_x_y_linear (int tiled_pos,uint32_t stride, -int swizzle,int bpp,int *x,int *y) +static void tiled_pos_to_x_y_linear (int fd,int tiled_pos,uint32_t stride, +int swizzle,int bpp,int *x,int *y, +int tiling) { -int tile_n, tile_off, tiles_per_line, line_size; -int x_tile_off, y_tile_off; -int x_tile_n, y_tile_n; -int x_tile_size, y_tile_size, tile_size; +uint32_t tile_width, tile_height, tile_size; +int tile_x, tile_y;/* Co-ordinates of the tile holding the pixel */ +int tile_x_off, tile_y_off;/* pixel position inside the tile */ +int tile_n, tile_off; +int line_size, tiles_per_line;int pixel_size = bpp /8 ; +igt_get_fb_tile_size (fd, (uint64_t )igt_fb_tiling_to_mod (tiling), bpp, + &tile_width, &tile_height); tiled_pos =swizzle_addr (tiled_pos, swizzle); line_size = stride; - x_tile_size =512 ; - y_tile_size =8 ; - tile_size = x_tile_size * y_tile_size; - tiles_per_line = line_size / x_tile_size; + tile_size = tile_width * tile_height; + tiles_per_line = line_size / tile_width; tile_n = tiled_pos / tile_size; tile_off = tiled_pos % tile_size; - y_tile_off = tile_off / x_tile_size; - x_tile_off = tile_off % x_tile_size; + tile_x = tile_n % tiles_per_line; + tile_y = tile_n / tiles_per_line; - x_tile_n = tile_n % tiles_per_line; - y_tile_n = tile_n / tiles_per_line; +if (tiling ==I915_TILING_X ) { - *x = (x_tile_n * x_tile_size + x_tile_off) / pixel_size; - *y = y_tile_n * y_tile_size + y_tile_off; + tile_y_off = tile_off / tile_width; + tile_x_off = tile_off % tile_width; + }else { +int x_oword_n, x_oword_off; +int oword_size =16 ; + + x_oword_n = tile_off / (oword_size * tile_height); + x_oword_off = tile_off % oword_size; + + tile_x_off = x_oword_n * oword_size + x_oword_off; + tile_y_off = (tile_off - x_oword_n * oword_size * tile_height) + / oword_size; + } + + *x = (tile_x * tile_width + tile_x_off) / pixel_size; + *y = tile_y * tile_height + tile_y_off; }static void set_pixel (void *_ptr,int index,uint32_t color,int bpp)
@@ -224,15 +254,16 @@ static void draw_rect_ptr_linear(void *ptr, uint32_t stride, } } -static void draw_rect_ptr_tiled (void *ptr,uint32_t stride,int swizzle, -struct rect *rect,uint32_t color,int bpp) +static void draw_rect_ptr_tiled (int fd,void *ptr,uint32_t stride,int swizzle, +struct rect *rect,uint32_t color,int bpp, +int tiling) {int x, y, pos;for (y = rect->y; y < rect->y + rect->h; y++) {for (x = rect->x; x < rect->x + rect->w; x++) { - pos =linear_x_y_to_tiled_pos (x, y, stride, swizzle, - bpp); + pos =linear_x_y_to_tiled_pos (fd, x, y, stride, swizzle, + bpp, tiling);set_pixel (ptr, pos, color, bpp); } }
@@ -259,8 +290,12 @@ static void draw_rect_mmap_cpu(int fd, struct buf_data *buf, struct rect *rect,draw_rect_ptr_linear (ptr, buf->stride, rect, color, buf->bpp);break ;case I915_TILING_X : -draw_rect_ptr_tiled (ptr, buf->stride, swizzle, rect, color, - buf->bpp); +draw_rect_ptr_tiled (fd, ptr, buf->stride, swizzle, rect, color, + buf->bpp, tiling); +break ; +case I915_TILING_Y : +draw_rect_ptr_tiled (fd, ptr, buf->stride, swizzle, rect, color, + buf->bpp, tiling);break ;default :igt_assert (false);
@@ -309,8 +344,12 @@ static void draw_rect_mmap_wc(int fd, struct buf_data *buf, struct rect *rect,draw_rect_ptr_linear (ptr, buf->stride, rect, color, buf->bpp);break ;case I915_TILING_X : -draw_rect_ptr_tiled (ptr, buf->stride, swizzle, rect, color, - buf->bpp); +draw_rect_ptr_tiled (fd, ptr, buf->stride, swizzle, rect, color, + buf->bpp, tiling); +break ; +case I915_TILING_Y : +draw_rect_ptr_tiled (fd, ptr, buf->stride, swizzle, rect, color, + buf->bpp, tiling);break ;default :igt_assert (false);
@@ -338,7 +377,7 @@ static void draw_rect_pwrite_untiled(int fd, struct buf_data *buf,static void draw_rect_pwrite_tiled (int fd,struct buf_data *buf,struct rect *rect,uint32_t color, -uint32_t swizzle) +uint32_t swizzle,int tiling) {int i;int tiled_pos, x, y, pixel_size;
@@ -361,8 +400,8 @@ static void draw_rect_pwrite_tiled(int fd, struct buf_data *buf,set_pixel (tmp, i, color, buf->bpp);for (tiled_pos =0 ; tiled_pos < buf->size; tiled_pos += pixel_size) { -tiled_pos_to_x_y_linear (tiled_pos, buf->stride, swizzle, - buf->bpp, &x, &y); +tiled_pos_to_x_y_linear (fd, tiled_pos, buf->stride, swizzle, + buf->bpp, &x, &y, tiling);if (x >= rect->x && x < rect->x + rect->w && y >= rect->y && y < rect->y + rect->h) {
@@ -399,7 +438,10 @@ static void draw_rect_pwrite(int fd, struct buf_data *buf,draw_rect_pwrite_untiled (fd, buf, rect, color);break ;case I915_TILING_X : -draw_rect_pwrite_tiled (fd, buf, rect, color, swizzle); +draw_rect_pwrite_tiled (fd, buf, rect, color, swizzle, tiling); +break ; +case I915_TILING_Y : +draw_rect_pwrite_tiled (fd, buf, rect, color, swizzle, tiling);break ;default :igt_assert (false);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 lib/igt_draw: Add Y-tiling support
This patch adds Y-tiling support for igt_draw_rect function.
v2: Use helper function to get tile sizes (Ville)
v3: Moved igt_get_fb_tile_size() out of the for loop
for better performance (Paulo)
--- lib/igt_draw.c | 139 ++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 94 insertions(+), 45 deletions(-)
lib/igt_draw.c +94 -45
@@ -136,32 +136,45 @@ static int swizzle_addr(int addr, int swizzle)/* It's all in "pixel coordinates", so make sure you multiply/divide by the bpp * if you need to. */ -static int linear_x_y_to_tiled_pos (int x,int y,uint32_t stride,int swizzle, -int bpp) +static int linear_x_y_to_tiled_pos (int fd,int x,int y,uint32_t stride,int swizzle, +int bpp,int tiling,uint32_t tile_width, +uint32_t tile_height) { -int x_tile_size, y_tile_size; -int x_tile_n, y_tile_n, x_tile_off, y_tile_off; -int line_size, tile_size; +uint32_t tile_size; +int tile_x, tile_y;/* Co-ordinates of the tile holding the pixel */ +int tile_x_off, tile_y_off;/* pixel position inside the tile */ int tile_n, tile_off; -int tiled_pos, tiles_per_line; +int line_size, tiles_per_line; +int tiled_pos;int pixel_size = bpp /8 ; line_size = stride; - x_tile_size =512 ; - y_tile_size =8 ; - tile_size = x_tile_size * y_tile_size; - tiles_per_line = line_size / x_tile_size; + tile_size = tile_width * tile_height; + tiles_per_line = line_size / tile_width; - y_tile_n = y / y_tile_size; - y_tile_off = y % y_tile_size; + tile_y = y / tile_height; + tile_y_off = y % tile_height; - x_tile_n = (x * pixel_size) / x_tile_size; - x_tile_off = (x * pixel_size) % x_tile_size; + tile_x = (x * pixel_size) / tile_width; + tile_x_off = (x * pixel_size) % tile_width; - tile_n = y_tile_n * tiles_per_line + x_tile_n; - tile_off = y_tile_off * x_tile_size + x_tile_off; - tiled_pos = tile_n * tile_size + tile_off; + tile_n = tile_y * tiles_per_line + tile_x; + +if (tiling ==I915_TILING_X ) { + tile_off = tile_y_off * tile_width + tile_x_off; + }else {/* (tiling == I915_TILING_Y ) */ +int x_oword_n, x_oword_off; +int oword_size =16 ; + +/* computation inside the tile */ + x_oword_n = tile_x_off / oword_size; + x_oword_off = tile_x_off % oword_size; + tile_off = x_oword_n * tile_height * oword_size + + tile_y_off * oword_size + + x_oword_off; + } + tiled_pos = tile_n * tile_size + tile_off; tiled_pos =swizzle_addr (tiled_pos, swizzle);return tiled_pos / pixel_size;
@@ -169,34 +182,48 @@ static int linear_x_y_to_tiled_pos(int x, int y, uint32_t stride, int swizzle,/* It's all in "pixel coordinates", so make sure you multiply/divide by the bpp * if you need to. */ -static void tiled_pos_to_x_y_linear (int tiled_pos,uint32_t stride, -int swizzle,int bpp,int *x,int *y) +static void tiled_pos_to_x_y_linear (int fd,int tiled_pos,uint32_t stride, +int swizzle,int bpp,int *x,int *y, +int tiling,uint32_t tile_width, +uint32_t tile_height) { -int tile_n, tile_off, tiles_per_line, line_size; -int x_tile_off, y_tile_off; -int x_tile_n, y_tile_n; -int x_tile_size, y_tile_size, tile_size; +uint32_t tile_size; +int tile_x, tile_y;/* Co-ordinates of the tile holding the pixel */ +int tile_x_off, tile_y_off;/* pixel position inside the tile */ +int tile_n, tile_off; +int line_size, tiles_per_line;int pixel_size = bpp /8 ; tiled_pos =swizzle_addr (tiled_pos, swizzle); line_size = stride; - x_tile_size =512 ; - y_tile_size =8 ; - tile_size = x_tile_size * y_tile_size; - tiles_per_line = line_size / x_tile_size; + tile_size = tile_width * tile_height; + tiles_per_line = line_size / tile_width; tile_n = tiled_pos / tile_size; tile_off = tiled_pos % tile_size; - y_tile_off = tile_off / x_tile_size; - x_tile_off = tile_off % x_tile_size; + tile_x = tile_n % tiles_per_line; + tile_y = tile_n / tiles_per_line; + +if (tiling ==I915_TILING_X ) { + + tile_y_off = tile_off / tile_width; + tile_x_off = tile_off % tile_width; + }else { +int x_oword_n, x_oword_off; +int oword_size =16 ; + + x_oword_n = tile_off / (oword_size * tile_height); + x_oword_off = tile_off % oword_size; - x_tile_n = tile_n % tiles_per_line; - y_tile_n = tile_n / tiles_per_line; + tile_x_off = x_oword_n * oword_size + x_oword_off; + tile_y_off = (tile_off - x_oword_n * oword_size * tile_height) + / oword_size; + } - *x = (x_tile_n * x_tile_size + x_tile_off) / pixel_size; - *y = y_tile_n * y_tile_size + y_tile_off; + *x = (tile_x * tile_width + tile_x_off) / pixel_size; + *y = tile_y * tile_height + tile_y_off; }static void set_pixel (void *_ptr,int index,uint32_t color,int bpp)
@@ -224,15 +251,21 @@ static void draw_rect_ptr_linear(void *ptr, uint32_t stride, } } -static void draw_rect_ptr_tiled (void *ptr,uint32_t stride,int swizzle, -struct rect *rect,uint32_t color,int bpp) +static void draw_rect_ptr_tiled (int fd,void *ptr,uint32_t stride,int swizzle, +struct rect *rect,uint32_t color,int bpp, +int tiling) {int x, y, pos; +uint32_t tile_width, tile_height; + +igt_get_fb_tile_size (fd, (uint64_t )igt_fb_tiling_to_mod (tiling), bpp, + &tile_width, &tile_height);for (y = rect->y; y < rect->y + rect->h; y++) {for (x = rect->x; x < rect->x + rect->w; x++) { - pos =linear_x_y_to_tiled_pos (x, y, stride, swizzle, - bpp); + pos =linear_x_y_to_tiled_pos (fd, x, y, stride, swizzle, + bpp, tiling, tile_width, + tile_height);set_pixel (ptr, pos, color, bpp); } }
@@ -259,8 +292,12 @@ static void draw_rect_mmap_cpu(int fd, struct buf_data *buf, struct rect *rect,draw_rect_ptr_linear (ptr, buf->stride, rect, color, buf->bpp);break ;case I915_TILING_X : -draw_rect_ptr_tiled (ptr, buf->stride, swizzle, rect, color, - buf->bpp); +draw_rect_ptr_tiled (fd, ptr, buf->stride, swizzle, rect, color, + buf->bpp, tiling); +break ; +case I915_TILING_Y : +draw_rect_ptr_tiled (fd, ptr, buf->stride, swizzle, rect, color, + buf->bpp, tiling);break ;default :igt_assert (false);
@@ -309,8 +346,12 @@ static void draw_rect_mmap_wc(int fd, struct buf_data *buf, struct rect *rect,draw_rect_ptr_linear (ptr, buf->stride, rect, color, buf->bpp);break ;case I915_TILING_X : -draw_rect_ptr_tiled (ptr, buf->stride, swizzle, rect, color, - buf->bpp); +draw_rect_ptr_tiled (fd, ptr, buf->stride, swizzle, rect, color, + buf->bpp, tiling); +break ; +case I915_TILING_Y : +draw_rect_ptr_tiled (fd, ptr, buf->stride, swizzle, rect, color, + buf->bpp, tiling);break ;default :igt_assert (false);
@@ -338,7 +379,7 @@ static void draw_rect_pwrite_untiled(int fd, struct buf_data *buf,static void draw_rect_pwrite_tiled (int fd,struct buf_data *buf,struct rect *rect,uint32_t color, -uint32_t swizzle) +uint32_t swizzle,int tiling) {int i;int tiled_pos, x, y, pixel_size;
@@ -347,6 +388,7 @@ static void draw_rect_pwrite_tiled(int fd, struct buf_data *buf,bool flush_tmp = false;int tmp_start_pos =0 ;int pixels_written =0 ; +uint32_t tile_width, tile_height;/* We didn't implement suport for the older tiling methods yet. */ igt_require (intel_gen (intel_get_drm_devid (fd)) >=5 );
@@ -360,9 +402,13 @@ static void draw_rect_pwrite_tiled(int fd, struct buf_data *buf,for (i =0 ; i < tmp_size; i++)set_pixel (tmp, i, color, buf->bpp); +igt_get_fb_tile_size (fd, (uint64_t )igt_fb_tiling_to_mod (tiling), + buf->bpp, &tile_width, &tile_height); +for (tiled_pos =0 ; tiled_pos < buf->size; tiled_pos += pixel_size) { -tiled_pos_to_x_y_linear (tiled_pos, buf->stride, swizzle, - buf->bpp, &x, &y); +tiled_pos_to_x_y_linear (fd, tiled_pos, buf->stride, swizzle, + buf->bpp, &x, &y, tiling, tile_width, + tile_height);if (x >= rect->x && x < rect->x + rect->w && y >= rect->y && y < rect->y + rect->h) {
@@ -399,7 +445,10 @@ static void draw_rect_pwrite(int fd, struct buf_data *buf,draw_rect_pwrite_untiled (fd, buf, rect, color);break ;case I915_TILING_X : -draw_rect_pwrite_tiled (fd, buf, rect, color, swizzle); +draw_rect_pwrite_tiled (fd, buf, rect, color, swizzle, tiling); +break ; +case I915_TILING_Y : +draw_rect_pwrite_tiled (fd, buf, rect, color, swizzle, tiling);break ;default :igt_assert (false);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] lib/igt_draw: Add Y-tiling support
Hi Paulo,
Could you plz review this patch in context of this series.
https://patchwork.freedesktop.org/series/21467/
It should fix the issue that you highlighted.
Thanks,
Praveen
Quoted 236 lines · Praveen Paneri
This patch adds Y-tiling support for
igt_draw_rectfunction.v2: Use helper function to get tile sizes (Ville)
v3: Moved
igt_get_fb_tile_size()out of the for loop
for better performance (Paulo)Signed-off-by Praveen Paneri <[email protected]>--- lib/igt_draw.c | 139 ++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 94 insertions(+), 45 deletions(-)lib/igt_draw.c +90
-44@@ -136,32 +136,45 @@ static int swizzle_addr(int addr, int swizzle)/* It's all in "pixel coordinates", so make sure you multiply/divide by the bpp * if you need to. */ -static int linear_x_y_to_tiled_pos (int x,int y,uint32_t stride,int swizzle, -int bpp) +static int linear_x_y_to_tiled_pos (int fd,int x,int y,uint32_t stride,int swizzle, +int bpp,int tiling,uint32_t tile_width, +uint32_t tile_height) { -int x_tile_size, y_tile_size; -int x_tile_n, y_tile_n, x_tile_off, y_tile_off; -int line_size, tile_size; +uint32_t tile_size; +int tile_x, tile_y;/* Co-ordinates of the tile holding the pixel */ +int tile_x_off, tile_y_off;/* pixel position inside the tile */ int tile_n, tile_off; -int tiled_pos, tiles_per_line; +int line_size, tiles_per_line; +int tiled_pos;int pixel_size = bpp /8 ; line_size = stride; - x_tile_size =512 ; - y_tile_size =8 ; - tile_size = x_tile_size * y_tile_size; - tiles_per_line = line_size / x_tile_size; + tile_size = tile_width * tile_height; + tiles_per_line = line_size / tile_width; - y_tile_n = y / y_tile_size; - y_tile_off = y % y_tile_size; + tile_y = y / tile_height; + tile_y_off = y % tile_height; - x_tile_n = (x * pixel_size) / x_tile_size; - x_tile_off = (x * pixel_size) % x_tile_size; + tile_x = (x * pixel_size) / tile_width; + tile_x_off = (x * pixel_size) % tile_width; - tile_n = y_tile_n * tiles_per_line + x_tile_n; - tile_off = y_tile_off * x_tile_size + x_tile_off; - tiled_pos = tile_n * tile_size + tile_off; + tile_n = tile_y * tiles_per_line + tile_x; + +if (tiling ==I915_TILING_X ) { + tile_off = tile_y_off * tile_width + tile_x_off; + }else {/* (tiling == I915_TILING_Y ) */ +int x_oword_n, x_oword_off; +int oword_size =16 ; + +/* computation inside the tile */ + x_oword_n = tile_x_off / oword_size; + x_oword_off = tile_x_off % oword_size; + tile_off = x_oword_n * tile_height * oword_size + + tile_y_off * oword_size + + x_oword_off; + } + tiled_pos = tile_n * tile_size + tile_off; tiled_pos =swizzle_addr (tiled_pos, swizzle);return tiled_pos / pixel_size;@@ -169,34 +182,48 @@ static int linear_x_y_to_tiled_pos(int x, int y, uint32_t stride, int swizzle,/* It's all in "pixel coordinates", so make sure you multiply/divide by the bpp * if you need to. */ -static void tiled_pos_to_x_y_linear (int tiled_pos,uint32_t stride, -int swizzle,int bpp,int *x,int *y) +static void tiled_pos_to_x_y_linear (int fd,int tiled_pos,uint32_t stride, +int swizzle,int bpp,int *x,int *y, +int tiling,uint32_t tile_width, +uint32_t tile_height) { -int tile_n, tile_off, tiles_per_line, line_size; -int x_tile_off, y_tile_off; -int x_tile_n, y_tile_n; -int x_tile_size, y_tile_size, tile_size; +uint32_t tile_size; +int tile_x, tile_y;/* Co-ordinates of the tile holding the pixel */ +int tile_x_off, tile_y_off;/* pixel position inside the tile */ +int tile_n, tile_off; +int line_size, tiles_per_line;int pixel_size = bpp /8 ; tiled_pos =swizzle_addr (tiled_pos, swizzle); line_size = stride; - x_tile_size =512 ; - y_tile_size =8 ; - tile_size = x_tile_size * y_tile_size; - tiles_per_line = line_size / x_tile_size; + tile_size = tile_width * tile_height; + tiles_per_line = line_size / tile_width; tile_n = tiled_pos / tile_size; tile_off = tiled_pos % tile_size; - y_tile_off = tile_off / x_tile_size; - x_tile_off = tile_off % x_tile_size; + tile_x = tile_n % tiles_per_line; + tile_y = tile_n / tiles_per_line; + +if (tiling ==I915_TILING_X ) { + + tile_y_off = tile_off / tile_width; + tile_x_off = tile_off % tile_width; + }else { +int x_oword_n, x_oword_off; +int oword_size =16 ; + + x_oword_n = tile_off / (oword_size * tile_height); + x_oword_off = tile_off % oword_size; - x_tile_n = tile_n % tiles_per_line; - y_tile_n = tile_n / tiles_per_line; + tile_x_off = x_oword_n * oword_size + x_oword_off; + tile_y_off = (tile_off - x_oword_n * oword_size * tile_height) + / oword_size; + } - *x = (x_tile_n * x_tile_size + x_tile_off) / pixel_size; - *y = y_tile_n * y_tile_size + y_tile_off; + *x = (tile_x * tile_width + tile_x_off) / pixel_size; + *y = tile_y * tile_height + tile_y_off; }static void set_pixel (void *_ptr,int index,uint32_t color,int bpp)@@ -224,15 +251,21 @@ static void draw_rect_ptr_linear(void *ptr, uint32_t stride, } } -static void draw_rect_ptr_tiled (void *ptr,uint32_t stride,int swizzle, -struct rect *rect,uint32_t color,int bpp) +static void draw_rect_ptr_tiled (int fd,void *ptr,uint32_t stride,int swizzle, +struct rect *rect,uint32_t color,int bpp, +int tiling) {int x, y, pos; +uint32_t tile_width, tile_height; + +igt_get_fb_tile_size (fd, (uint64_t )igt_fb_tiling_to_mod (tiling), bpp, + &tile_width, &tile_height);for (y = rect->y; y < rect->y + rect->h; y++) {for (x = rect->x; x < rect->x + rect->w; x++) { - pos =linear_x_y_to_tiled_pos (x, y, stride, swizzle, - bpp); + pos =linear_x_y_to_tiled_pos (fd, x, y, stride, swizzle, + bpp, tiling, tile_width, + tile_height);set_pixel (ptr, pos, color, bpp); } }@@ -259,8 +292,12 @@ static void draw_rect_mmap_cpu(int fd, struct buf_data *buf, struct rect *rect,draw_rect_ptr_linear (ptr, buf->stride, rect, color, buf->bpp);break ;case I915_TILING_X : -draw_rect_ptr_tiled (ptr, buf->stride, swizzle, rect, color, - buf->bpp); +draw_rect_ptr_tiled (fd, ptr, buf->stride, swizzle, rect, color, + buf->bpp, tiling); +break ; +case I915_TILING_Y : +draw_rect_ptr_tiled (fd, ptr, buf->stride, swizzle, rect, color, + buf->bpp, tiling);break ;default :igt_assert (false);@@ -309,8 +346,12 @@ static void draw_rect_mmap_wc(int fd, struct buf_data *buf, struct rect *rect,draw_rect_ptr_linear (ptr, buf->stride, rect, color, buf->bpp);break ;case I915_TILING_X : -draw_rect_ptr_tiled (ptr, buf->stride, swizzle, rect, color, - buf->bpp); +draw_rect_ptr_tiled (fd, ptr, buf->stride, swizzle, rect, color, + buf->bpp, tiling); +break ; +case I915_TILING_Y : +draw_rect_ptr_tiled (fd, ptr, buf->stride, swizzle, rect, color, + buf->bpp, tiling);break ;default :igt_assert (false);@@ -338,7 +379,7 @@ static void draw_rect_pwrite_untiled(int fd, struct buf_data *buf,static void draw_rect_pwrite_tiled (int fd,struct buf_data *buf,struct rect *rect,uint32_t color, -uint32_t swizzle) +uint32_t swizzle,int tiling) {int i;int tiled_pos, x, y, pixel_size;@@ -347,6 +388,7 @@ static void draw_rect_pwrite_tiled(int fd, struct buf_data *buf,bool flush_tmp = false;int tmp_start_pos =0 ;int pixels_written =0 ; +uint32_t tile_width, tile_height;/* We didn't implement suport for the older tiling methods yet. */ igt_require (intel_gen (intel_get_drm_devid (fd)) >=5 );@@ -360,9 +402,13 @@ static void draw_rect_pwrite_tiled(int fd, struct buf_data *buf,for (i =0 ; i < tmp_size; i++)set_pixel (tmp, i, color, buf->bpp); +igt_get_fb_tile_size (fd, (uint64_t )igt_fb_tiling_to_mod (tiling), + buf->bpp, &tile_width, &tile_height); +for (tiled_pos =0 ; tiled_pos < buf->size; tiled_pos += pixel_size) { -tiled_pos_to_x_y_linear (tiled_pos, buf->stride, swizzle, - buf->bpp, &x, &y); +tiled_pos_to_x_y_linear (fd, tiled_pos, buf->stride, swizzle, + buf->bpp, &x, &y, tiling, tile_width, + tile_height);if (x >= rect->x && x < rect->x + rect->w && y >= rect->y && y < rect->y + rect->h) {@@ -399,7 +445,10 @@ static void draw_rect_pwrite(int fd, struct buf_data *buf,draw_rect_pwrite_untiled (fd, buf, rect, color);
lib/igt_draw.c static void draw_rect_pwrite(int fd, struct buf_data *buf, · line 454
Quoted 10 lines
lib/igt_draw.c +4
-1break ;case I915_TILING_X : -draw_rect_pwrite_tiled (fd, buf, rect, color, swizzle); +draw_rect_pwrite_tiled (fd, buf, rect, color, swizzle, tiling); +break ; +case I915_TILING_Y : +draw_rect_pwrite_tiled (fd, buf, rect, color, swizzle, tiling);break ;default :igt_assert (false);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] lib/igt_draw: Add Y-tiling support
In reply to Praveen PaneriEm Sex, 2017-06-09 às 15:48 +0530, Praveen Paneri escreveu:
Quoted 6 lines
This patch adds Y-tiling support for
igt_draw_rectfunction.v2: Use helper function to get tile sizes (Ville)
v3: Moved
igt_get_fb_tile_size()out of the for loop for better performance (Paulo)
For some reason I thought this series was using my original patch, but I realized it's not:
https://patchwork.freedesktop.org/patch/72039/
Now that I read our past emails, I wonder that maybe I didn't send you this specific patch of that series. I'm sorry for that. Obviously I'm biased towards my version. Which one do you think is better? Would you be willing to give my version a r-b, in case you think it's better?
Thanks,
Paulo
Quoted 284 lines
Signed-off-by Praveen Paneri <[email protected]>---
lib/igt_draw.c | 139 ++++++++++++++++++++++++++++++++++++++---------
----------1 file changed, 94 insertions(+), 45 deletions(-)lib/igt_draw.c +0
-0@@ -136,32 +136,45 @@ static int swizzle_addr(int addr, int swizzle)
/* It's all in "pixel coordinates", so make sure you multiply/divide by the bpp
* if you need to. */
-static int linear_x_y_to_tiled_pos(int x, int y,uint32_tstride, int swizzle,lib/igt_draw.c +1
-1- int bpp) +static int linear_x_y_to_tiled_pos(int fd, int x, int y, uint32_tstride, int swizzle,
lib/igt_draw.c +1
-0+ int bpp, int tiling, uint32_t
tile_width,lib/igt_draw.c +1
-0+ uint32_t tile_height){
lib/igt_draw.c +2
-3-int x_tile_size, y_tile_size; -int x_tile_n, y_tile_n, x_tile_off, y_tile_off; -int line_size, tile_size; +uint32_t tile_size; +int tile_x, tile_y;/* Co-ordinates of the tile holding the pixel */
lib/igt_draw.c +1
-0+int tile_x_off, tile_y_off;/* pixel position inside the tile */
inttile_n,tile_off;lib/igt_draw.c +2
-1-int tiled_pos, tiles_per_line; +int line_size, tiles_per_line; +int tiled_pos;int
pixel_size= bpp / 8;
line_size= stride;lib/igt_draw.c +2
-4- x_tile_size =512 ; - y_tile_size =8 ; - tile_size = x_tile_size * y_tile_size; - tiles_per_line = line_size / x_tile_size; + tile_size = tile_width * tile_height; + tiles_per_line = line_size / tile_width;lib/igt_draw.c +2
-2- y_tile_n = y / y_tile_size; - y_tile_off = y % y_tile_size; + tile_y = y / tile_height; + tile_y_off = y % tile_height;lib/igt_draw.c +2
-2- x_tile_n = (x * pixel_size) / x_tile_size; - x_tile_off = (x * pixel_size) % x_tile_size; + tile_x = (x * pixel_size) / tile_width; + tile_x_off = (x * pixel_size) % tile_width;lib/igt_draw.c +15
-3- tile_n = y_tile_n * tiles_per_line + x_tile_n; - tile_off = y_tile_off * x_tile_size + x_tile_off; - tiled_pos = tile_n * tile_size + tile_off; + tile_n = tile_y * tiles_per_line + tile_x; + +if (tiling ==I915_TILING_X ) { + tile_off = tile_y_off * tile_width + tile_x_off; + }else {/* (tiling == I915_TILING_Y ) */ +int x_oword_n, x_oword_off; +int oword_size =16 ; + +/* computation inside the tile */ + x_oword_n = tile_x_off / oword_size; + x_oword_off = tile_x_off % oword_size; + tile_off = x_oword_n * tile_height * oword_size + + tile_y_off * oword_size + + x_oword_off; + }lib/igt_draw.c +1
-0+ tiled_pos = tile_n * tile_size + tile_off;
tiled_pos=swizzle_addr(tiled_pos, swizzle);
returntiled_pos/pixel_size;lib/igt_draw.c +0
-0@@ -169,34 +182,48 @@ static int linear_x_y_to_tiled_pos(int x, int y, uint32_t stride, int swizzle,
/* It's all in "pixel coordinates", so make sure you multiply/divide by the bpp
* if you need to. */lib/igt_draw.c +0
-2-static void tiled_pos_to_x_y_linear(int tiled_pos, uint32_t stride, - int swizzle, int bpp, int *x,int *y)
+static void tiled_pos_to_x_y_linear(int fd, inttiled_pos,uint32_tstride,lib/igt_draw.c +1
-0+ int swizzle, int bpp, int *x,int *y,
lib/igt_draw.c +2
-0+ int tiling, uint32_t tile_width, + uint32_t tile_height){
lib/igt_draw.c +2
-4-int tile_n, tile_off, tiles_per_line, line_size; -int x_tile_off, y_tile_off; -int x_tile_n, y_tile_n; -int x_tile_size, y_tile_size, tile_size; +uint32_t tile_size; +int tile_x, tile_y;/* Co-ordinates of the tile holding the pixel */
lib/igt_draw.c +1
-0+int tile_x_off, tile_y_off;/* pixel position inside the tile */
lib/igt_draw.c +2
-0+int tile_n, tile_off; +int line_size, tiles_per_line;int
pixel_size= bpp / 8;
tiled_pos=swizzle_addr(tiled_pos, swizzle);
line_size= stride;lib/igt_draw.c +2
-4- x_tile_size =512 ; - y_tile_size =8 ; - tile_size = x_tile_size * y_tile_size; - tiles_per_line = line_size / x_tile_size; + tile_size = tile_width * tile_height; + tiles_per_line = line_size / tile_width;
tile_n=tiled_pos/tile_size;
tile_off=tiled_pos%tile_size;lib/igt_draw.c +13
-2- y_tile_off = tile_off / x_tile_size; - x_tile_off = tile_off % x_tile_size; + tile_x = tile_n % tiles_per_line; + tile_y = tile_n / tiles_per_line; + +if (tiling ==I915_TILING_X ) { + + tile_y_off = tile_off / tile_width; + tile_x_off = tile_off % tile_width; + }else { +int x_oword_n, x_oword_off; +int oword_size =16 ; + + x_oword_n = tile_off / (oword_size * tile_height); + x_oword_off = tile_off % oword_size;lib/igt_draw.c +2
-2- x_tile_n = tile_n % tiles_per_line; - y_tile_n = tile_n / tiles_per_line; + tile_x_off = x_oword_n * oword_size + x_oword_off; + tile_y_off = (tile_off - x_oword_n * oword_size *
tile_height)lib/igt_draw.c +2
-0+ / oword_size; + }lib/igt_draw.c +2
-2- *x = (x_tile_n * x_tile_size + x_tile_off) / pixel_size; - *y = y_tile_n * y_tile_size + y_tile_off; + *x = (tile_x * tile_width + tile_x_off) / pixel_size; + *y = tile_y * tile_height + tile_y_off;}
static voidset_pixel(void *_ptr, int index, uint32_t color, int bpp)lib/igt_draw.c +0
-0@@ -224,15 +251,21 @@ static void draw_rect_ptr_linear(void *ptr, uint32_t stride, } }
-static void draw_rect_ptr_tiled(void *ptr,uint32_tstride, int swizzle,lib/igt_draw.c +0
-1- struct rect *rect, uint32_t color,int bpp)
+static void draw_rect_ptr_tiled(int fd, void *ptr,uint32_tstride, int swizzle,lib/igt_draw.c +1
-0+ struct rect *rect, uint32_t color,int bpp,
lib/igt_draw.c +1
-0+ int tiling){
int x, y, pos;lib/igt_draw.c +3
-0+uint32_t tile_width, tile_height; + + igt_get_fb_tile_size(fd,(uint64_t)igt_fb_tiling_to_mod(tiling), bpp,
lib/igt_draw.c +1
-0+ &tile_width, &tile_height);
for (y =rect->y; y <rect->y+rect->h; y++) { for (x =rect->x; x <rect->x+rect->w; x++) {lib/igt_draw.c +0
-1- pos = linear_x_y_to_tiled_pos(x, y, stride,swizzle,
lib/igt_draw.c +1
-1- bpp); + pos = linear_x_y_to_tiled_pos(fd, x, y,stride, swizzle,
lib/igt_draw.c +1
-0+ bpp, tiling,
tile_width,lib/igt_draw.c +1
-0+ tile_height);
set_pixel(ptr, pos, color, bpp); }
}lib/igt_draw.c +0
-0@@ -259,8 +292,12 @@ static void draw_rect_mmap_cpu(int fd, struct buf_data *buf, struct rect *rect, draw_rect_ptr_linear(ptr, buf->stride, rect, color, buf->bpp); break;case
I915_TILING_X:lib/igt_draw.c +0
-1- draw_rect_ptr_tiled(ptr, buf->stride, swizzle, rect,color,
lib/igt_draw.c +1
-1- buf->bpp); + draw_rect_ptr_tiled(fd, ptr, buf->stride, swizzle,rect, color,
lib/igt_draw.c +4
-0+ buf->bpp, tiling); +break ; +case I915_TILING_Y : + draw_rect_ptr_tiled(fd, ptr, buf->stride, swizzle,rect, color,
lib/igt_draw.c +1
-0+ buf->bpp, tiling);break;
default:
igt_assert(false);lib/igt_draw.c +0
-0@@ -309,8 +346,12 @@ static void draw_rect_mmap_wc(int fd, struct buf_data *buf, struct rect *rect, draw_rect_ptr_linear(ptr, buf->stride, rect, color, buf->bpp); break;case
I915_TILING_X:lib/igt_draw.c +0
-1- draw_rect_ptr_tiled(ptr, buf->stride, swizzle, rect,color,
lib/igt_draw.c +1
-1- buf->bpp); + draw_rect_ptr_tiled(fd, ptr, buf->stride, swizzle,rect, color,
lib/igt_draw.c +4
-0+ buf->bpp, tiling); +break ; +case I915_TILING_Y : + draw_rect_ptr_tiled(fd, ptr, buf->stride, swizzle,rect, color,
lib/igt_draw.c +1
-0+ buf->bpp, tiling);break;
default:
igt_assert(false);lib/igt_draw.c +0
-0@@ -338,7 +379,7 @@ static void draw_rect_pwrite_untiled(int fd, struct buf_data *buf,
static void draw_rect_pwrite_tiled(int fd, structbuf_data*buf, struct rect *rect,uint32_tcolor,lib/igt_draw.c +1
-1- uint32_t swizzle) + uint32_t swizzle, int tiling){
int i;
inttiled_pos, x, y,pixel_size;lib/igt_draw.c +1
-0@@ -347,6 +388,7 @@ static void draw_rect_pwrite_tiled(int fd, structbuf_data *buf, bool flush_tmp = false; int tmp_start_pos = 0; int pixels_written = 0; +uint32_t tile_width, tile_height;
/* We didn't implement suport for the older tiling methods yet. */
igt_require(intel_gen(intel_get_drm_devid(fd)) >= 5);lib/igt_draw.c +0
-0@@ -360,9 +402,13 @@ static void draw_rect_pwrite_tiled(int fd, struct buf_data *buf, for (i = 0; i < tmp_size; i++) set_pixel(tmp, i, color, buf->bpp);lib/igt_draw.c +1
-0+ igt_get_fb_tile_size(fd,(uint64_t)igt_fb_tiling_to_mod(tiling),
lib/igt_draw.c +2
-0+ buf->bpp, &tile_width, &tile_height); +for (
tiled_pos= 0;tiled_pos<buf->size;tiled_pos+=pixel_size) {lib/igt_draw.c +0
-1- tiled_pos_to_x_y_linear(tiled_pos, buf->stride,swizzle,
lib/igt_draw.c +1
-1- buf->bpp, &x, &y); + tiled_pos_to_x_y_linear(fd, tiled_pos, buf->stride,swizzle,
lib/igt_draw.c +1
-0+ buf->bpp, &x, &y, tiling,
tile_width,lib/igt_draw.c +1
-0+ tile_height);
if (x >=rect->x&& x <rect->x+rect->w&& y >=rect->y&& y <rect->y+rect->h) {lib/igt_draw.c +0
-0@@ -399,7 +445,10 @@ static void draw_rect_pwrite(int fd, structbuf_data *buf, draw_rect_pwrite_untiled(fd, buf, rect, color); break;case
I915_TILING_X:lib/igt_draw.c +0
-1- draw_rect_pwrite_tiled(fd, buf, rect, color,swizzle);
lib/igt_draw.c +1
-0+ draw_rect_pwrite_tiled(fd, buf, rect, color,swizzle, tiling);
lib/igt_draw.c +3
-0+break ; +case I915_TILING_Y : + draw_rect_pwrite_tiled(fd, buf, rect, color,
Quoted 4 lines
swizzle, tiling);
break;
default:
igt_assert(false);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] lib/igt_draw: Add Y-tiling support
Quoted 11 lines · Paulo Zanoni
Em Sex, 2017-06-09 às 15:48 +0530, Praveen Paneri escreveu:
Quoted 6 lines
This patch adds Y-tiling support for
igt_draw_rectfunction.v2: Use helper function to get tile sizes (Ville)
v3: Moved
igt_get_fb_tile_size()out of the for loop
for better performance (Paulo)For some reason I thought this series was using my original patch, but I realized it's not:
Quoted 6 lines
https://patchwork.freedesktop.org/patch/72039/
Now that I read our past emails, I wonder that maybe I didn't send you this specific patch of that series. I'm sorry for that. Obviously I'm biased towards my version. Which one do you think is better? Would you be willing to give my version a r-b, in case you think it's better?
Your version looks better. I will add my r-b and post it Thanks
Praveen
Quoted 285 lines
Thanks,
PauloQuoted 280 lines
Signed-off-by Praveen Paneri <[email protected]>--- lib/igt_draw.c | 139 ++++++++++++++++++++++++++++++++++++++--------- ---------- 1 file changed, 94 insertions(+), 45 deletions(-)lib/igt_draw.c +0
-0@@ -136,32 +136,45 @@ static int swizzle_addr(int addr, int swizzle)/* It's all in "pixel coordinates", so make sure you multiply/divide by the bpp
* if you need to. */
-static int linear_x_y_to_tiled_pos(int x, int y,uint32_tstride, int swizzle,lib/igt_draw.c +1
-1- int bpp) +static int linear_x_y_to_tiled_pos(int fd, int x, int y, uint32_tstride, int swizzle,
lib/igt_draw.c +1
-0+ int bpp, int tiling, uint32_t
tile_width,lib/igt_draw.c +3
-3+ uint32_t tile_height) { -int x_tile_size, y_tile_size; -int x_tile_n, y_tile_n, x_tile_off, y_tile_off; -int line_size, tile_size; +uint32_t tile_size; +int tile_x, tile_y;/* Co-ordinates of the tile holding the pixel */
lib/igt_draw.c +1
-0+int tile_x_off, tile_y_off;/* pixel position inside the tile */
lib/igt_draw.c +24
-12int tile_n, tile_off; -int tiled_pos, tiles_per_line; +int line_size, tiles_per_line; +int tiled_pos;int pixel_size = bpp /8 ; line_size = stride; - x_tile_size =512 ; - y_tile_size =8 ; - tile_size = x_tile_size * y_tile_size; - tiles_per_line = line_size / x_tile_size; + tile_size = tile_width * tile_height; + tiles_per_line = line_size / tile_width; - y_tile_n = y / y_tile_size; - y_tile_off = y % y_tile_size; + tile_y = y / tile_height; + tile_y_off = y % tile_height; - x_tile_n = (x * pixel_size) / x_tile_size; - x_tile_off = (x * pixel_size) % x_tile_size; + tile_x = (x * pixel_size) / tile_width; + tile_x_off = (x * pixel_size) % tile_width; - tile_n = y_tile_n * tiles_per_line + x_tile_n; - tile_off = y_tile_off * x_tile_size + x_tile_off; - tiled_pos = tile_n * tile_size + tile_off; + tile_n = tile_y * tiles_per_line + tile_x; + +if (tiling ==I915_TILING_X ) { + tile_off = tile_y_off * tile_width + tile_x_off; + }else {/* (tiling == I915_TILING_Y ) */ +int x_oword_n, x_oword_off; +int oword_size =16 ; + +/* computation inside the tile */ + x_oword_n = tile_x_off / oword_size; + x_oword_off = tile_x_off % oword_size; + tile_off = x_oword_n * tile_height * oword_size + + tile_y_off * oword_size + + x_oword_off; + } + tiled_pos = tile_n * tile_size + tile_off; tiled_pos =swizzle_addr (tiled_pos, swizzle);return tiled_pos / pixel_size;@@ -169,34 +182,48 @@ static int linear_x_y_to_tiled_pos(int x, int y, uint32_t stride, int swizzle,/* It's all in "pixel coordinates", so make sure you multiply/divide by the bpp
* if you need to. */lib/igt_draw.c +0
-2-static void tiled_pos_to_x_y_linear(int tiled_pos, uint32_t stride, - int swizzle, int bpp, int *x,int *y)
+static void tiled_pos_to_x_y_linear(int fd, inttiled_pos,uint32_tstride,lib/igt_draw.c +1
-0+ int swizzle, int bpp, int *x,int *y,
lib/igt_draw.c +4
-4+ int tiling, uint32_t tile_width, + uint32_t tile_height) { -int tile_n, tile_off, tiles_per_line, line_size; -int x_tile_off, y_tile_off; -int x_tile_n, y_tile_n; -int x_tile_size, y_tile_size, tile_size; + uint32_t tile_size; +int tile_x, tile_y;/* Co-ordinates of the tile holding the pixel */
lib/igt_draw.c +1
-0+int tile_x_off, tile_y_off;/* pixel position inside the tile */
lib/igt_draw.c +19
-8+int tile_n, tile_off; +int line_size, tiles_per_line;int pixel_size = bpp /8 ; tiled_pos =swizzle_addr (tiled_pos, swizzle); line_size = stride; - x_tile_size =512 ; - y_tile_size =8 ; - tile_size = x_tile_size * y_tile_size; - tiles_per_line = line_size / x_tile_size; + tile_size = tile_width * tile_height; + tiles_per_line = line_size / tile_width; tile_n = tiled_pos / tile_size; tile_off = tiled_pos % tile_size; - y_tile_off = tile_off / x_tile_size; - x_tile_off = tile_off % x_tile_size; + tile_x = tile_n % tiles_per_line; + tile_y = tile_n / tiles_per_line; + +if (tiling ==I915_TILING_X ) { + + tile_y_off = tile_off / tile_width; + tile_x_off = tile_off % tile_width; + } else { + int x_oword_n, x_oword_off; + int oword_size = 16; + + x_oword_n = tile_off / (oword_size * tile_height); + x_oword_off = tile_off % oword_size; - x_tile_n = tile_n % tiles_per_line; - y_tile_n = tile_n / tiles_per_line; + tile_x_off = x_oword_n * oword_size + x_oword_off; + tile_y_off = (tile_off - x_oword_n * oword_size *
tile_height)lib/igt_draw.c +4
-2+ / oword_size; + } - *x = (x_tile_n * x_tile_size + x_tile_off) / pixel_size; - *y = y_tile_n * y_tile_size + y_tile_off; + *x = (tile_x * tile_width + tile_x_off) / pixel_size; + *y = tile_y * tile_height + tile_y_off; } static void set_pixel(void *_ptr, int index, uint32_t color, intbpp)
lib/igt_draw.c +7
-3@@ -224,15 +251,21 @@ static void draw_rect_ptr_linear(void *ptr,uint32_t stride, } } -static void draw_rect_ptr_tiled (void *ptr,uint32_t stride,int swizzle, -struct rect *rect,uint32_t color, int bpp) +static void draw_rect_ptr_tiled(int fd, void *ptr, uint32_t stride, int swizzle, + struct rect *rect, uint32_t color, int bpp, + int tiling) { int x, y, pos; +uint32_t tile_width, tile_height; + +igt_get_fb_tile_size (fd, (uint64_t )igt_fb_tiling_to_mod (tiling), bpp, + &tile_width, &tile_height);for (y = rect->y; y < rect->y + rect->h; y++) {for (x = rect->x; x < rect->x + rect->w; x++) { - pos = linear_x_y_to_tiled_pos(x, y, stride,swizzle,
lib/igt_draw.c +1
-1- bpp); + pos = linear_x_y_to_tiled_pos(fd, x, y,stride, swizzle,
lib/igt_draw.c +1
-0+ bpp, tiling,
tile_width,lib/igt_draw.c +2
-2+ tile_height);set_pixel (ptr, pos, color, bpp); } }@@ -259,8 +292,12 @@ static void draw_rect_mmap_cpu(int fd, struct buf_data *buf, struct rect *rect, draw_rect_ptr_linear(ptr, buf->stride, rect, color, buf->bpp);break ;case I915_TILING_X : -draw_rect_ptr_tiled (ptr, buf->stride, swizzle, rect, color, - buf->bpp); + draw_rect_ptr_tiled(fd, ptr, buf->stride, swizzle,rect, color,
lib/igt_draw.c +4
-0+ buf->bpp, tiling); +break ; +case I915_TILING_Y : + draw_rect_ptr_tiled(fd, ptr, buf->stride, swizzle,rect, color,
lib/igt_draw.c +2
-2+ buf->bpp, tiling);break ;default :igt_assert (false);@@ -309,8 +346,12 @@ static void draw_rect_mmap_wc(int fd, struct buf_data *buf, struct rect *rect, draw_rect_ptr_linear(ptr, buf->stride, rect, color, buf->bpp);break ;case I915_TILING_X : -draw_rect_ptr_tiled (ptr, buf->stride, swizzle, rect, color, - buf->bpp); + draw_rect_ptr_tiled(fd, ptr, buf->stride, swizzle,rect, color,
lib/igt_draw.c +4
-0+ buf->bpp, tiling); +break ; +case I915_TILING_Y : + draw_rect_ptr_tiled(fd, ptr, buf->stride, swizzle,rect, color,
lib/igt_draw.c +2
-1+ buf->bpp, tiling);break ;default :igt_assert (false);@@ -338,7 +379,7 @@ static void draw_rect_pwrite_untiled(int fd, struct buf_data *buf, static void draw_rect_pwrite_tiled(int fd, struct buf_data *buf, struct rect *rect, uint32_t color, - uint32_t swizzle) + uint32_t swizzle, int tiling) {lib/igt_draw.c +1
-0int i;int tiled_pos, x, y, pixel_size;@@ -347,6 +388,7 @@ static void draw_rect_pwrite_tiled(int fd, structbuf_data *buf, bool flush_tmp = false;int tmp_start_pos =0 ;int pixels_written =0 ; +uint32_t tile_width, tile_height;/* We didn't implement suport for the older tiling methods yet. */
lib/igt_draw.c +4
-2igt_require (intel_gen (intel_get_drm_devid (fd)) >=5 );@@ -360,9 +402,13 @@ static void draw_rect_pwrite_tiled(int fd,struct buf_data *buf, for (i = 0; i < tmp_size; i++)set_pixel (tmp, i, color, buf->bpp); +igt_get_fb_tile_size (fd, (uint64_t )igt_fb_tiling_to_mod (tiling), + buf->bpp, &tile_width, &tile_height); +for (tiled_pos =0 ; tiled_pos < buf->size; tiled_pos += pixel_size) { -tiled_pos_to_x_y_linear (tiled_pos, buf->stride, swizzle, - buf->bpp, &x, &y); + tiled_pos_to_x_y_linear(fd, tiled_pos, buf->stride,swizzle,
lib/igt_draw.c +1
-0+ buf->bpp, &x, &y, tiling,
tile_width,lib/igt_draw.c +2
-1+ tile_height);if (x >= rect->x && x < rect->x + rect->w && y >= rect->y && y < rect->y + rect->h) {@@ -399,7 +445,10 @@ static void draw_rect_pwrite(int fd, structbuf_data *buf,draw_rect_pwrite_untiled (fd ,buf ,rect ,color );break ;case I915_TILING_X : -draw_rect_pwrite_tiled (fd, buf, rect, color, swizzle); + draw_rect_pwrite_tiled(fd, buf, rect, color,
Quoted 8 lines
lib/igt_draw.c static void draw_rect_mmap_cpu(int fd, struct buf_data *buf, struct rect *rect, · line 303
Quoted 8 lines
lib/igt_draw.c +3
-0swizzle, tiling); +break ; +case I915_TILING_Y : + draw_rect_pwrite_tiled(fd, buf, rect, color,swizzle, tiling);
lib/igt_draw.c +0
-0break ;default :igt_assert (false);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/7 lib/igt_draw: Add Y-tiling support for IGT_DRAW_BLT method
In reply to Praveen PaneriFrom: Akash Goel <[email protected]>
v2: Moved identical code into a single function (Paulo)
--- lib/igt_draw.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
lib/igt_draw.c +33 -0
@@ -31,6 +31,7 @@#include "igt_core.h" #include "igt_fb.h" #include "ioctl_wrappers.h" +#include "i830_reg.h" /** * SECTION:igt_draw
@@ -242,6 +243,34 @@ static void set_pixel(void *_ptr, int index, uint32_t color, int bpp) } } +static void switch_blt_tiling (struct intel_batchbuffer *batch,uint32_t tiling,bool on) +{ +uint32_t bcs_swctrl; + +/* Default is X-tile */ +if (tiling !=I915_TILING_Y ) +return ; + + bcs_swctrl = (0x3 <<16 ) | (on ?0x3 :0x0 ); + +/* To change the tile register, insert an MI_FLUSH_DW followed by an +* MI_LOAD_REGISTER_IMM +*/ +BEGIN_BATCH (4 ,0 ); +OUT_BATCH (MI_FLUSH_DW |2 ); +OUT_BATCH (0x0 ); +OUT_BATCH (0x0 ); +OUT_BATCH (0x0 ); +ADVANCE_BATCH (); + +BEGIN_BATCH (4 ,0 ); +OUT_BATCH (MI_LOAD_REGISTER_IMM ); +OUT_BATCH (0x22200 );/* BCS_SWCTRL */ +OUT_BATCH (bcs_swctrl); +OUT_BATCH (MI_NOOP ); +ADVANCE_BATCH (); +} +static void draw_rect_ptr_linear (void *ptr,uint32_t stride,struct rect *rect,uint32_t color,int bpp) {
@@ -487,6 +516,8 @@ static void draw_rect_blt(int fd, struct cmd_data *cmd_data, blt_cmd_tiling = (tiling) ?XY_COLOR_BLT_TILED :0 ; pitch = (tiling) ? buf->stride /4 : buf->stride; +switch_blt_tiling (batch, tiling, true); +BEGIN_BATCH (6 ,1 );OUT_BATCH (XY_COLOR_BLT_CMD_NOLEN |XY_COLOR_BLT_WRITE_ALPHA |XY_COLOR_BLT_WRITE_RGB | blt_cmd_tiling | blt_cmd_len);
@@ -497,6 +528,8 @@ static void draw_rect_blt(int fd, struct cmd_data *cmd_data,OUT_BATCH (color);ADVANCE_BATCH (); +switch_blt_tiling (batch, tiling, false); +intel_batchbuffer_flush (batch);intel_batchbuffer_free (batch); }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 4/7] lib/igt_draw: Add Y-tiling support for IGT_DRAW_BLT method
Em Sex, 2017-04-28 às 20:07 +0530, Praveen Paneri escreveu:
Quoted 3 lines
From: Akash Goel <[email protected]>
v2: Moved identical code into a single function (Paulo)
My MI-fu is not very strong, but I tried to check this against BSpec and I believe this patch is correct. I also tested it, and it definitely solves the problems with the BLT operations on Y tiling.
There's only a minor nitpick with a line going beyond 80 columns, but I can fix that while applying.
Quoted 77 lines
Signed-off-by Akash Goel <[email protected]>Signed-off-by Praveen Paneri <[email protected]>---
lib/igt_draw.c | 33 +++++++++++++++++++++++++++++++++1 file changed, 33 insertions(+)lib/igt_draw.c +1
-0@@ -31,6 +31,7 @@ #include "igt_core.h" #include "igt_fb.h" #include "ioctl_wrappers.h" +#include "i830_reg.h"
/**
* SECTION:igt_drawlib/igt_draw.c +0
-0@@ -242,6 +243,34 @@ static void set_pixel(void *_ptr, int index, uint32_t color, int bpp) } }
+static voidswitch_blt_tiling(struct intel_batchbuffer *batch, uint32_t tiling, bool on)lib/igt_draw.c +10
-0+{ +uint32_t bcs_swctrl; + +/* Default is X-tile */ +if (tiling !=I915_TILING_Y ) +return ; + + bcs_swctrl = (0x3 <<16 ) | (on ?0x3 :0x0 ); + +/* To change the tile register, insert an MI_FLUSH_DW followed by an
lib/igt_draw.c +17
-0+* MI_LOAD_REGISTER_IMM +*/ +BEGIN_BATCH (4 ,0 ); +OUT_BATCH (MI_FLUSH_DW |2 ); +OUT_BATCH (0x0 ); +OUT_BATCH (0x0 ); +OUT_BATCH (0x0 ); +ADVANCE_BATCH (); + +BEGIN_BATCH (4 ,0 ); +OUT_BATCH (MI_LOAD_REGISTER_IMM ); +OUT_BATCH (0x22200 );/* BCS_SWCTRL */ +OUT_BATCH (bcs_swctrl); +OUT_BATCH (MI_NOOP ); +ADVANCE_BATCH (); +} +static void
draw_rect_ptr_linear(void *ptr, uint32_t stride, struct rect *rect, uint32_t color, int bpp)
{lib/igt_draw.c +0
-0@@ -487,6 +516,8 @@ static void draw_rect_blt(int fd, struct cmd_data *cmd_data, blt_cmd_tiling = (tiling) ? XY_COLOR_BLT_TILED : 0; pitch = (tiling) ? buf->stride / 4 : buf->stride;lib/igt_draw.c +2
-0+switch_blt_tiling (batch, tiling, true); +
BEGIN_BATCH(6, 1); OUT_BATCH(XY_COLOR_BLT_CMD_NOLEN |XY_COLOR_BLT_WRITE_ALPHA|
XY_COLOR_BLT_WRITE_RGB |blt_cmd_tiling|blt_cmd_len);lib/igt_draw.c +0
-0@@ -497,6 +528,8 @@ static void draw_rect_blt(int fd, struct cmd_data *cmd_data, OUT_BATCH(color); ADVANCE_BATCH();lib/igt_draw.c +2
-0+switch_blt_tiling (batch, tiling, false); +
Quoted 3 lines
intel_batchbuffer_flush(batch);
intel_batchbuffer_free(batch);
}
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 4/7] lib/igt_draw: Add Y-tiling support for IGT_DRAW_BLT method
Quoted 5 lines · Paulo Zanoni
Em Sex, 2017-04-28 às 20:07 +0530, Praveen Paneri escreveu:
Quoted 3 lines
From: Akash Goel <[email protected]>
v2: Moved identical code into a single function (Paulo)
Quoted 8 lines
My MI-fu is not very strong, but I tried to check this against BSpec and I believe this patch is correct. I also tested it, and it definitely solves the problems with the BLT operations on Y tiling.
There's only a minor nitpick with a line going beyond 80 columns, but I can fix that while applying.
Reviewed-by Paulo Zanoni <[email protected]>
Thanks
Praveen
Quoted 76 lines
Quoted 76 lines
Signed-off-by Akash Goel <[email protected]>Signed-off-by Praveen Paneri <[email protected]>--- lib/igt_draw.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)lib/igt_draw.c +12
-0@@ -31,6 +31,7 @@#include "igt_core.h" #include "igt_fb.h" #include "ioctl_wrappers.h" +#include "i830_reg.h" /** * SECTION:igt_draw @@ -242,6 +243,34 @@ static void set_pixel(void *_ptr, int index, uint32_t color, int bpp) } } +static void switch_blt_tiling (struct intel_batchbuffer *batch,uint32_t tiling,bool on) +{ +uint32_t bcs_swctrl; + +/* Default is X-tile */ +if (tiling !=I915_TILING_Y ) +return ; + + bcs_swctrl = (0x3 <<16 ) | (on ?0x3 :0x0 ); + +/* To change the tile register, insert an MI_FLUSH_DW followed by an
lib/igt_draw.c +17
-0+* MI_LOAD_REGISTER_IMM +*/ +BEGIN_BATCH (4 ,0 ); +OUT_BATCH (MI_FLUSH_DW |2 ); +OUT_BATCH (0x0 ); +OUT_BATCH (0x0 ); +OUT_BATCH (0x0 ); +ADVANCE_BATCH (); + +BEGIN_BATCH (4 ,0 ); +OUT_BATCH (MI_LOAD_REGISTER_IMM ); +OUT_BATCH (0x22200 );/* BCS_SWCTRL */ +OUT_BATCH (bcs_swctrl); +OUT_BATCH (MI_NOOP ); +ADVANCE_BATCH (); +} + static void draw_rect_ptr_linear(void *ptr, uint32_t stride, struct rect *rect, uint32_t color,int bpp)
{lib/igt_draw.c +2
-0@@ -487,6 +516,8 @@ static void draw_rect_blt(int fd, struct cmd_data *cmd_data, blt_cmd_tiling = (tiling) ?XY_COLOR_BLT_TILED :0 ; pitch = (tiling) ? buf->stride /4 : buf->stride; +switch_blt_tiling (batch, tiling, true); +BEGIN_BATCH (6 ,1 ); OUT_BATCH(XY_COLOR_BLT_CMD_NOLEN | XY_COLOR_BLT_WRITE_ALPHA|
XY_COLOR_BLT_WRITE_RGB|blt_cmd_tiling|blt_cmd_len);lib/igt_draw.c +0
-0@@ -497,6 +528,8 @@ static void draw_rect_blt(int fd, struct cmd_data *cmd_data,OUT_BATCH (color);ADVANCE_BATCH ();
Quoted 5 lines
Quoted 5 lines
lib/igt_draw.c +2
-0+switch_blt_tiling (batch, tiling, false); +intel_batchbuffer_flush (batch);intel_batchbuffer_free (batch);}
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 5/7 tests/kms_draw_crc: add support for Y tiling
In reply to Praveen PaneriFrom: Paulo Zanoni <[email protected]>
This is the program that's supposed to test lib/igt_draw. We just added Y tiling support for the library, so add the tests now.
--- tests/kms_draw_crc.c | 58 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 15 deletions(-)
tests/kms_draw_crc.c +43 -15
@@ -47,6 +47,13 @@ static const uint32_t formats[N_FORMATS] = { DRM_FORMAT_XRGB2101010, }; +#define N_TILING_METHODS 3 +static const uint64_t tilings[N_TILING_METHODS ] = { +LOCAL_DRM_FORMAT_MOD_NONE , +LOCAL_I915_FORMAT_MOD_X_TILED , +LOCAL_I915_FORMAT_MOD_Y_TILED , +}; +struct base_crc {bool set;igt_crc_t crc;
@@ -151,6 +158,11 @@ static void draw_method_subtest(enum igt_draw_method method, {igt_crc_t crc; +if (tiling ==LOCAL_I915_FORMAT_MOD_Y_TILED ) +igt_require (intel_gen (intel_get_drm_devid (drm_fd)) >=9 ); + +kmstest_unset_all_crtcs (drm_fd, drm_res); +/* Use IGT_DRAW_MMAP_GTT on an untiled buffer as the parameter for * comparison. Cache the value so we don't recompute it for every single * subtest. */
@@ -208,6 +220,12 @@ static void fill_fb_subtest(void)get_fill_crc (LOCAL_I915_FORMAT_MOD_X_TILED , &crc);igt_assert_crc_equal (&crc, &base_crc); +if (intel_gen (intel_get_drm_devid (drm_fd)) >=9 ) { +get_fill_crc (LOCAL_I915_FORMAT_MOD_Y_TILED , &crc); +igt_assert_crc_equal (&crc, &base_crc); + } + +kmstest_unset_all_crtcs (drm_fd, drm_res);igt_remove_fb (drm_fd, &fb); }
@@ -265,28 +283,38 @@ static const char *format_str(int format_index) } } +static const char *tiling_str (int tiling_index) +{ +switch (tilings[tiling_index]) { +case LOCAL_DRM_FORMAT_MOD_NONE : +return "untiled" ; +case LOCAL_I915_FORMAT_MOD_X_TILED : +return "xtiled" ; +case LOCAL_I915_FORMAT_MOD_Y_TILED : +return "ytiled" ; +default : +igt_assert (false); + } +} + igt_main {enum igt_draw_method method; -int format_index; +int format_idx, tiling_idx;igt_fixture setup_environment (); -for (format_index =0 ; format_index <N_FORMATS ; format_index++) { -for (method =0 ; method <IGT_DRAW_METHOD_COUNT ; method++) { -igt_subtest_f ("draw-method-%s-%s-untiled" , -format_str (format_index), - igt_draw_get_method_name(method)) -draw_method_subtest (method, format_index, -LOCAL_DRM_FORMAT_MOD_NONE ); -igt_subtest_f ("draw-method-%s-%s-tiled" , -format_str (format_index), - igt_draw_get_method_name(method)) -draw_method_subtest (method, format_index, -LOCAL_I915_FORMAT_MOD_X_TILED ); - } - } +for (format_idx =0 ; format_idx <N_FORMATS ; format_idx++) { +for (method =0 ; method <IGT_DRAW_METHOD_COUNT ; method++) { +for (tiling_idx =0 ; tiling_idx <N_TILING_METHODS ; tiling_idx++) { +igt_subtest_f ("draw-method-%s-%s-%s" , +format_str (format_idx), +igt_draw_get_method_name (method), + tiling_str(tiling_idx)) +draw_method_subtest (method, format_idx, + tilings[tiling_idx]); + } } } igt_subtest("fill-fb")fill_fb_subtest ();
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 5/7] tests/kms_draw_crc: add support for Y tiling
Em Sex, 2017-04-28 às 20:07 +0530, Praveen Paneri escreveu:
Quoted 5 lines
From: Paulo Zanoni <[email protected]>
This is the program that's supposed to test
lib/igt_draw. We just added Y tiling support for the library, so add the tests now.
This is not my original version of the patch, yet there's no changelog mentioning that this is a new version.
https://patchwork.freedesktop.org/patch/72040/
Why were the kmstest_unset_all_crtcs() calls added? My guess is that they ended up here as a rebase artifact, but please clarify if there's an actual reason.
Quoted 114 lines
Signed-off-by Paulo Zanoni <[email protected]>Signed-off-by Praveen Paneri <[email protected]>---
tests/kms_draw_crc.c | 58 ++++++++++++++++++++++++++++++++++++++--
------------1 file changed, 43 insertions(+), 15 deletions(-)tests/kms_draw_crc.c +0
-0@@ -47,6 +47,13 @@ static const uint32_t formats[N_FORMATS] = { DRM_FORMAT_XRGB2101010, };tests/kms_draw_crc.c +7
-0+#define N_TILING_METHODS 3 +static const uint64_t tilings[N_TILING_METHODS ] = { +LOCAL_DRM_FORMAT_MOD_NONE , +LOCAL_I915_FORMAT_MOD_X_TILED , +LOCAL_I915_FORMAT_MOD_Y_TILED , +}; +struct
base_crc{
bool set;
igt_crc_tcrc;tests/kms_draw_crc.c +0
-0@@ -151,6 +158,11 @@ static void draw_method_subtest(enumigt_draw_method method, { igt_crc_t crc;tests/kms_draw_crc.c +2
-0+if (tiling ==LOCAL_I915_FORMAT_MOD_Y_TILED ) + igt_require(intel_gen(intel_get_drm_devid(drm_fd))Quoted 1 line
= 9);
tests/kms_draw_crc.c +3
-0+ +kmstest_unset_all_crtcs (drm_fd, drm_res); +/* Use
IGT_DRAW_MMAP_GTTon an untiled buffer as the parameter for
* comparison. Cache the value so we don't recompute it for every single
* subtest. */tests/kms_draw_crc.c +0
-0@@ -208,6 +220,12 @@ static void fill_fb_subtest(void) get_fill_crc(LOCAL_I915_FORMAT_MOD_X_TILED, &crc); igt_assert_crc_equal(&crc, &base_crc);tests/kms_draw_crc.c +6
-0+if (intel_gen (intel_get_drm_devid (drm_fd)) >=9 ) { +get_fill_crc (LOCAL_I915_FORMAT_MOD_Y_TILED , &crc); +igt_assert_crc_equal (&crc, &base_crc); + } + +kmstest_unset_all_crtcs (drm_fd, drm_res);
igt_remove_fb(drm_fd, &fb);
}tests/kms_draw_crc.c +0
-0@@ -265,28 +283,38 @@ static const char *format_str(int format_index) } }tests/kms_draw_crc.c +14
-0+static const char *tiling_str (int tiling_index) +{ +switch (tilings[tiling_index]) { +case LOCAL_DRM_FORMAT_MOD_NONE : +return "untiled" ; +case LOCAL_I915_FORMAT_MOD_X_TILED : +return "xtiled" ; +case LOCAL_I915_FORMAT_MOD_Y_TILED : +return "ytiled" ; +default : +igt_assert (false); + } +} +igt_main
{
enumigt_draw_methodmethod;tests/kms_draw_crc.c +1
-1-int format_index; +int format_idx, tiling_idx;
igt_fixture
setup_environment();tests/kms_draw_crc.c +0
-1- for (format_index = 0; format_index < N_FORMATS;format_index++) {
tests/kms_draw_crc.c +0
-1- for (method = 0; method < IGT_DRAW_METHOD_COUNT;method++) {
tests/kms_draw_crc.c +0
-3- igt_subtest_f("draw-method-%s-%s-untiled", - format_str(format_index), - igt_draw_get_method_name(method))
tests/kms_draw_crc.c +0
-1- draw_method_subtest(method,
format_index,tests/kms_draw_crc.c +0
-1- LOCAL_DRM_FORMAT
_MOD_NONE);tests/kms_draw_crc.c +0
-3- igt_subtest_f("draw-method-%s-%s-tiled", - format_str(format_index), - igt_draw_get_method_name(method))
tests/kms_draw_crc.c +0
-1- draw_method_subtest(method,
format_index,tests/kms_draw_crc.c +0
-1-LOCAL_I915_FORMAT_MO
D_X_TILED);tests/kms_draw_crc.c +3
-2- } - } +for (format_idx =0 ; format_idx <N_FORMATS ; format_idx++) { +for (method =0 ; method <IGT_DRAW_METHOD_COUNT ; method++) { + for (tiling_idx = 0; tiling_idx < N_TILING_METHODS;tiling_idx++) {
tests/kms_draw_crc.c +7
-0+igt_subtest_f ("draw-method-%s-%s-%s" , + format_str(format_idx), + igt_draw_get_method_name(method), + tiling_str(tiling_idx)) +draw_method_subtest (method, format_idx, + tilings[tiling_idx]); + } } }
Quoted 3 lines
igt_subtest("fill-fb")
fill_fb_subtest();
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 5/7] tests/kms_draw_crc: add support for Y tiling
Hi Paulo,
Quoted 7 lines · Paulo Zanoni
Em Sex, 2017-04-28 às 20:07 +0530, Praveen Paneri escreveu:
Quoted 5 lines
From: Paulo Zanoni <[email protected]>
This is the program that's supposed to test
lib/igt_draw. We just added Y tiling support for the library, so add the tests now.
Quoted 8 lines
This is not my original version of the patch, yet there's no changelog mentioning that this is a new version.
https://patchwork.freedesktop.org/patch/72040/
Why were the
kmstest_unset_all_crtcs()calls added? My guess is that they ended up here as a rebase artifact, but please clarify if there's an actual reason.
Yes this is a rebase artifact and is not actually required. I will fix it.
Thanks,
Praveen
Quoted 117 lines
Quoted 117 lines
Signed-off-by Paulo Zanoni <[email protected]>Signed-off-by Praveen Paneri <[email protected]>--- tests/kms_draw_crc.c | 58 ++++++++++++++++++++++++++++++++++++++-- ------------ 1 file changed, 43 insertions(+), 15 deletions(-)tests/kms_draw_crc.c +12
-0@@ -47,6 +47,13 @@ static const uint32_t formats[N_FORMATS] = { DRM_FORMAT_XRGB2101010, }; +#define N_TILING_METHODS 3 +static const uint64_t tilings[N_TILING_METHODS ] = { +LOCAL_DRM_FORMAT_MOD_NONE , +LOCAL_I915_FORMAT_MOD_X_TILED , +LOCAL_I915_FORMAT_MOD_Y_TILED , +}; +struct base_crc {bool set;igt_crc_t crc;@@ -151,6 +158,11 @@ static void draw_method_subtest(enum igt_draw_method method, {igt_crc_t crc; +if (tiling ==LOCAL_I915_FORMAT_MOD_Y_TILED ) +igt_require (intel_gen (intel_get_drm_devid (drm_fd)) > = 9); + +kmstest_unset_all_crtcs (drm_fd, drm_res); +/* Use IGT_DRAW_MMAP_GTT on an untiled buffer as the parameter for
* comparison. Cache the value so we don't recompute it for
every singletests/kms_draw_crc.c +21
-12* subtest. */ @@ -208,6 +220,12 @@ static void fill_fb_subtest(void)get_fill_crc (LOCAL_I915_FORMAT_MOD_X_TILED , &crc);igt_assert_crc_equal (&crc, &base_crc); +if (intel_gen (intel_get_drm_devid (drm_fd)) >=9 ) { +get_fill_crc (LOCAL_I915_FORMAT_MOD_Y_TILED , &crc); +igt_assert_crc_equal (&crc, &base_crc); + } + +kmstest_unset_all_crtcs (drm_fd, drm_res);igt_remove_fb (drm_fd, &fb); }@@ -265,28 +283,38 @@ static const char *format_str(int format_index) } } +static const char *tiling_str (int tiling_index) +{ +switch (tilings[tiling_index]) { +case LOCAL_DRM_FORMAT_MOD_NONE : +return "untiled" ; +case LOCAL_I915_FORMAT_MOD_X_TILED : +return "xtiled" ; +case LOCAL_I915_FORMAT_MOD_Y_TILED : +return "ytiled" ; +default : +igt_assert (false); + } +} + igt_main {enum igt_draw_method method; -int format_index; +int format_idx, tiling_idx;igt_fixture setup_environment (); -for (format_index =0 ; format_index <N_FORMATS ; format_index++) { -for (method =0 ; method <IGT_DRAW_METHOD_COUNT ; method++) { -igt_subtest_f ("draw-method-%s-%s-untiled" , -format_str (format_index), -igt_draw_get_method_name (metho d)) -draw_method_subtest (method, format_index, -LOCAL_DRM_FORMAT _MOD_NONE); -igt_subtest_f ("draw-method-%s-%s-tiled" , -format_str (format_index), -igt_draw_get_method_name (metho d)) - draw_method_subtest(method,
format_index,tests/kms_draw_crc.c +0
-1-LOCAL_I915_FORMAT_MO
D_X_TILED);tests/kms_draw_crc.c +3
-2- } - } +for (format_idx =0 ; format_idx <N_FORMATS ; format_idx++) { +for (method =0 ; method <IGT_DRAW_METHOD_COUNT ; method++) { + for (tiling_idx = 0; tiling_idx < N_TILING_METHODS;tiling_idx++) {
tests/kms_draw_crc.c +7
-0+igt_subtest_f ("draw-method-%s-%s-%s" , +format_str (format_idx), +igt_draw_get_method_name (method), + tiling_str(tiling_idx)) +draw_method_subtest (method, format_idx, + tilings[tiling_idx]); + } } }
Quoted 2 lines
tests/kms_draw_crc.c static const char *format_str(int format_index) · line 320
Quoted 2 lines
tests/kms_draw_crc.c +0
-0igt_subtest("fill-fb")fill_fb_subtest ();
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 5/7] tests/kms_draw_crc: add support for Y tiling
Em Qua, 2017-07-12 às 13:45 +0530, Praveen Paneri escreveu:
Quoted 16 lines
Hi Paulo,
Quoted 13 lines · Paulo Zanoni
Em Sex, 2017-04-28 às 20:07 +0530, Praveen Paneri escreveu:
Quoted 5 lines
From: Paulo Zanoni <[email protected]>
This is the program that's supposed to test
lib/igt_draw. We just added Y tiling support for the library, so add the tests now.This is not my original version of the patch, yet there's no changelog
mentioning that this is a new version.
Quoted 8 lines
Quoted 5 lines
Why were the
kmstest_unset_all_crtcs()calls added? My guess is that
they ended up here as a rebase artifact, but please clarify if there's
an actual reason.Yes this is a rebase artifact and is not actually required. I will fix it.
Or you can just give a reviewed-by tag to my original patch :).
Quoted 134 lines
Thanks,
PraveenQuoted 131 lines
Quoted 131 lines
Signed-off-by Paulo Zanoni <[email protected]>Signed-off-by Praveen Paneri <[email protected]>---
tests/kms_draw_crc.c | 58
++++++++++++++++++++++++++++++++++++++--
------------1 file changed, 43 insertions(+), 15 deletions(-)tests/kms_draw_crc.c +12
-0@@ -47,6 +47,13 @@ static const uint32_t formats[N_FORMATS] = { DRM_FORMAT_XRGB2101010, }; +#define N_TILING_METHODS 3 +static const uint64_t tilings[N_TILING_METHODS ] = { +LOCAL_DRM_FORMAT_MOD_NONE , +LOCAL_I915_FORMAT_MOD_X_TILED , +LOCAL_I915_FORMAT_MOD_Y_TILED , +}; + struct base_crc { bool set; igt_crc_t crc;@@ -151,6 +158,11 @@ static void draw_method_subtest(enumigt_draw_method method, { igt_crc_t crc; +if (tiling ==LOCAL_I915_FORMAT_MOD_Y_TILED ) +igt_require (intel_gen (intel_get_drm_devid (drm_fd )) > = 9); + +kmstest_unset_all_crtcs (drm_fd, drm_res); +/* Use
IGT_DRAW_MMAP_GTTon an untiled buffer as the parameter for
* comparison. Cache the value so we don't recompute it for
every single
* subtest. */tests/kms_draw_crc.c +20
-0@@ -208,6 +220,12 @@ static void fill_fb_subtest(void) get_fill_crc(LOCAL_I915_FORMAT_MOD_X_TILED, &crc); igt_assert_crc_equal(&crc, &base_crc); +if (intel_gen (intel_get_drm_devid (drm_fd)) >=9 ) { +get_fill_crc (LOCAL_I915_FORMAT_MOD_Y_TILED , &crc); +igt_assert_crc_equal (&crc, &base_crc); + } + +kmstest_unset_all_crtcs (drm_fd, drm_res); igt_remove_fb(drm_fd, &fb); }@@ -265,28 +283,38 @@ static const char *format_str(int format_index) } } +static const char *tiling_str (int tiling_index) +{ +switch (tilings[tiling_index]) { +case LOCAL_DRM_FORMAT_MOD_NONE : +return "untiled" ; +case LOCAL_I915_FORMAT_MOD_X_TILED : +return "xtiled" ; +case LOCAL_I915_FORMAT_MOD_Y_TILED : +return "ytiled" ; +default : +igt_assert (false); + } +} +igt_main
{
enumigt_draw_methodmethod;tests/kms_draw_crc.c +1
-1-int format_index; +int format_idx, tiling_idx;
igt_fixture
setup_environment();tests/kms_draw_crc.c +0
-1- for (format_index = 0; format_index < N_FORMATS;format_index++) {
tests/kms_draw_crc.c +0
-1- for (method = 0; method < IGT_DRAW_METHOD_COUNT;method++) {
tests/kms_draw_crc.c +0
-1- igt_subtest_f("draw-method-%s-%s-untiled",
tests/kms_draw_crc.c +0
-2- format_str(format_index), - igt_draw_get_method_name(metho
d))tests/kms_draw_crc.c +0
-1- draw_method_subtest(method,
format_index,tests/kms_draw_crc.c +0
-1- LOCAL_DRM_FORMAT
_MOD_NONE);tests/kms_draw_crc.c +0
-3- igt_subtest_f("draw-method-%s-%s-tiled", - format_str(format_index), - igt_draw_get_method_name(metho
d))tests/kms_draw_crc.c +0
-1- draw_method_subtest(method,
format_index,tests/kms_draw_crc.c +0
-1-LOCAL_I915_FORMA
T_MOD_X_TILED);tests/kms_draw_crc.c +1
-2- } - } + for (format_idx = 0; format_idx < N_FORMATS;format_idx++) {
tests/kms_draw_crc.c +1
-0+ for (method = 0; method < IGT_DRAW_METHOD_COUNT;method++) {
tests/kms_draw_crc.c +1
-0+ for (tiling_idx = 0; tiling_idx < N_TILING_METHODS;tiling_idx++) {
tests/kms_draw_crc.c +6
-0+igt_subtest_f ("draw-method-%s-%s-%s" , + format_str(format_idx), + igt_draw_get_method_name(method), + tiling_str(tiling_idx)) +draw_method_subtest (method, format_idx, + tilings[tiling_idx]);
tests/kms_draw_crc.c +1
-0+ } } }
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
igt_subtest("fill-fb")
fill_fb_subtest();
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 5/7] tests/kms_draw_crc: add support for Y tiling
Quoted 23 lines · Paulo Zanoni
Em Qua, 2017-07-12 às 13:45 +0530, Praveen Paneri escreveu:
Quoted 22 lines
Hi Paulo,
Quoted 18 lines · Paulo Zanoni
Em Sex, 2017-04-28 às 20:07 +0530, Praveen Paneri escreveu:
Quoted 5 lines
From: Paulo Zanoni <[email protected]>
This is the program that's supposed to test
lib/igt_draw. We just added Y tiling support for the library, so add the tests now.This is not my original version of the patch, yet there's no changelog
mentioning that this is a new version.https://patchwork.freedesktop.org/patch/72040/
Why were the
kmstest_unset_all_crtcs()calls added? My guess is that
they ended up here as a rebase artifact, but please clarify if there's
an actual reason.
Quoted 4 lines
Quoted 2 lines
Yes this is a rebase artifact and is not actually required. I will fix it.
Or you can just give a reviewed-by tag to my original patch :).
Sure! I will add that in the next series :)
Quoted 135 lines
Quoted 135 lines
Thanks,
PraveenQuoted 131 lines
Quoted 131 lines
Signed-off-by Paulo Zanoni <[email protected]>Signed-off-by Praveen Paneri <[email protected]>--- tests/kms_draw_crc.c | 58 ++++++++++++++++++++++++++++++++++++++-- ------------ 1 file changed, 43 insertions(+), 15 deletions(-)tests/kms_draw_crc.c +12
-0@@ -47,6 +47,13 @@ static const uint32_t formats[N_FORMATS] = { DRM_FORMAT_XRGB2101010, }; +#define N_TILING_METHODS 3 +static const uint64_t tilings[N_TILING_METHODS ] = { +LOCAL_DRM_FORMAT_MOD_NONE , +LOCAL_I915_FORMAT_MOD_X_TILED , +LOCAL_I915_FORMAT_MOD_Y_TILED , +}; +struct base_crc {bool set;igt_crc_t crc;@@ -151,6 +158,11 @@ static void draw_method_subtest(enum igt_draw_method method, {igt_crc_t crc; +if (tiling ==LOCAL_I915_FORMAT_MOD_Y_TILED ) +igt_require (intel_gen (intel_get_drm_devid (drm_fd )) > = 9); + +kmstest_unset_all_crtcs (drm_fd, drm_res); +/* Use IGT_DRAW_MMAP_GTT on an untiled buffer as the parameter for
* comparison. Cache the value so we don't recompute it
for
every singletests/kms_draw_crc.c +21
-6* subtest. */ @@ -208,6 +220,12 @@ static void fill_fb_subtest(void)get_fill_crc (LOCAL_I915_FORMAT_MOD_X_TILED , &crc);igt_assert_crc_equal (&crc, &base_crc); +if (intel_gen (intel_get_drm_devid (drm_fd)) >=9 ) { +get_fill_crc (LOCAL_I915_FORMAT_MOD_Y_TILED , &crc); +igt_assert_crc_equal (&crc, &base_crc); + } + +kmstest_unset_all_crtcs (drm_fd, drm_res);igt_remove_fb (drm_fd, &fb); }@@ -265,28 +283,38 @@ static const char *format_str(int format_index) } } +static const char *tiling_str (int tiling_index) +{ +switch (tilings[tiling_index]) { +case LOCAL_DRM_FORMAT_MOD_NONE : +return "untiled" ; +case LOCAL_I915_FORMAT_MOD_X_TILED : +return "xtiled" ; +case LOCAL_I915_FORMAT_MOD_Y_TILED : +return "ytiled" ; +default : +igt_assert (false); + } +} + igt_main {enum igt_draw_method method; -int format_index; +int format_idx, tiling_idx;igt_fixture setup_environment (); -for (format_index =0 ; format_index <N_FORMATS ; format_index++) { -for (method =0 ; method <IGT_DRAW_METHOD_COUNT ; method++) { - igt_subtest_f("draw-method-%s-%s- untiled", - format_str(format_index), - igt_draw_get_method_name(metho
d))tests/kms_draw_crc.c +0
-1- draw_method_subtest(method,
format_index,tests/kms_draw_crc.c +0
-1-LOCAL_DRM_FO RMAT
_MOD_NONE);tests/kms_draw_crc.c +0
-3- igt_subtest_f("draw-method-%s-%s-tiled", - format_str(format_index), - igt_draw_get_method_name(metho
d))tests/kms_draw_crc.c +0
-1- draw_method_subtest(method,
format_index,tests/kms_draw_crc.c +0
-1-LOCAL_I915_FORMA
T_MOD_X_TILED);tests/kms_draw_crc.c +1
-2- } - } + for (format_idx = 0; format_idx < N_FORMATS;format_idx++) {
tests/kms_draw_crc.c +1
-0+ for (method = 0; method < IGT_DRAW_METHOD_COUNT;method++) {
tests/kms_draw_crc.c +1
-0+ for (tiling_idx = 0; tiling_idx < N_TILING_METHODS;tiling_idx++) {
tests/kms_draw_crc.c +6
-0+igt_subtest_f ("draw-method-%s-%s-%s" , +format_str (format_idx), +igt_draw_get_method_name (method), + tiling_str(tiling_idx)) +draw_method_subtest (method, format_idx, + tilings[tiling_idx]);
tests/kms_draw_crc.c +1
-0+ } } }
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
tests/kms_draw_crc.c static const char *format_str(int format_index) · line 320
Quoted 2 lines
tests/kms_draw_crc.c +0
-0igt_subtest("fill-fb")fill_fb_subtest ();
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 6/7 igt/kms_frontbuffer_tracking: Add Y-tiling support
In reply to Praveen PaneriAllow tests to create Y-tiled bufferes using a separate argument to the test without increasing the number of subtests.
v2: Changed tiling option to string (Paulo)
--- tests/kms_frontbuffer_tracking.c | 48 ++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 19 deletions(-)
tests/kms_frontbuffer_tracking.c +29 -19
@@ -252,6 +252,7 @@ struct {int only_pipes;int shared_fb_x_offset;int shared_fb_y_offset; +uint64_t tiling; } opt = { .check_status = true, .check_crc = true,
@@ -264,6 +265,7 @@ struct { .only_pipes = PIPE_COUNT, .shared_fb_x_offset = 500, .shared_fb_y_offset = 500, + .tiling = LOCAL_I915_FORMAT_MOD_X_TILED, };struct modeset_params {
@@ -578,7 +580,7 @@ static void create_fb(enum pixel_format pformat, int width, int height,if (plane ==PLANE_CUR ) tiling_for_size =LOCAL_DRM_FORMAT_MOD_NONE ;else - tiling_for_size =LOCAL_I915_FORMAT_MOD_X_TILED ; + tiling_for_size = opt.tiling;igt_calc_fb_size (drm.fd, width, height, bpp, tiling_for_size, &size, &stride);
@@ -710,7 +712,7 @@ static void create_shared_fb(enum pixel_format format) big_h = prim_h + scnd_h + offs_h + opt.shared_fb_y_offset; -create_fb (format, big_w, big_h,LOCAL_I915_FORMAT_MOD_X_TILED , +create_fb (format, big_w, big_h, opt.tiling,PLANE_PRI , &s->big); }
@@ -744,16 +746,16 @@ static void create_fbs(enum pixel_format format)create_fb (format, prim_mode_params.mode->hdisplay, prim_mode_params.mode->vdisplay, -LOCAL_I915_FORMAT_MOD_X_TILED ,PLANE_PRI , &s->prim_pri); + opt.tiling,PLANE_PRI , &s->prim_pri);create_fb (format, prim_mode_params.cursor.w, prim_mode_params.cursor.h,LOCAL_DRM_FORMAT_MOD_NONE ,PLANE_CUR , &s->prim_cur);create_fb (format, prim_mode_params.sprite.w, - prim_mode_params.sprite.h,LOCAL_I915_FORMAT_MOD_X_TILED , + prim_mode_params.sprite.h, opt.tiling,PLANE_SPR , &s->prim_spr);create_fb (format, offscreen_fb.w, offscreen_fb.h, -LOCAL_I915_FORMAT_MOD_X_TILED ,PLANE_PRI , &s->offscreen); + opt.tiling,PLANE_PRI , &s->offscreen);create_shared_fb (format);
@@ -762,11 +764,11 @@ static void create_fbs(enum pixel_format format)create_fb (format, scnd_mode_params.mode->hdisplay, scnd_mode_params.mode->vdisplay, -LOCAL_I915_FORMAT_MOD_X_TILED ,PLANE_PRI , &s->scnd_pri); + opt.tiling,PLANE_PRI , &s->scnd_pri);create_fb (format, scnd_mode_params.cursor.w, scnd_mode_params.cursor.h,LOCAL_DRM_FORMAT_MOD_NONE ,PLANE_CUR , &s->scnd_cur);create_fb (format, scnd_mode_params.sprite.w, scnd_mode_params.sprite.h, -LOCAL_I915_FORMAT_MOD_X_TILED ,PLANE_SPR , &s->scnd_spr); + opt.tiling,PLANE_SPR , &s->scnd_spr); }static bool set_mode_for_params (struct modeset_params *params)
@@ -1252,7 +1254,7 @@ static void init_blue_crc(enum pixel_format format, bool mandatory_sink_crc)create_fb (format, prim_mode_params.mode->hdisplay, prim_mode_params.mode->vdisplay, -LOCAL_I915_FORMAT_MOD_X_TILED ,PLANE_PRI , &blue); + opt.tiling,PLANE_PRI , &blue);fill_fb (&blue,COLOR_PRIM_BG );
@@ -1287,7 +1289,7 @@ static void init_crcs(enum pixel_format format,for (r =0 ; r < pattern->n_rects; r++)create_fb (format, prim_mode_params.mode->hdisplay, prim_mode_params.mode->vdisplay, -LOCAL_I915_FORMAT_MOD_X_TILED ,PLANE_PRI , &tmp_fbs[r]); + opt.tiling,PLANE_PRI , &tmp_fbs[r]);for (r =0 ; r < pattern->n_rects; r++)fill_fb (&tmp_fbs[r],COLOR_PRIM_BG );
@@ -2386,7 +2388,7 @@ static void flip_subtest(const struct test_mode *t)prepare_subtest (t, pattern);create_fb (t->format, params->fb.fb->width, params->fb.fb->height, -LOCAL_I915_FORMAT_MOD_X_TILED , t->plane, &fb2); + opt.tiling, t->plane, &fb2);fill_fb (&fb2, bg_color); orig_fb = params->fb.fb;
@@ -2432,7 +2434,7 @@ static void fliptrack_subtest(const struct test_mode *t, enum flip_type type)prepare_subtest (t, pattern);create_fb (t->format, params->fb.fb->width, params->fb.fb->height, -LOCAL_I915_FORMAT_MOD_X_TILED , t->plane, &fb2); + opt.tiling, t->plane, &fb2);fill_fb (&fb2,COLOR_PRIM_BG ); orig_fb = params->fb.fb;
@@ -2643,7 +2645,7 @@ static void fullscreen_plane_subtest(const struct test_mode *t)prepare_subtest (t, pattern); rect = pattern->get_rect (¶ms->fb,0 ); -create_fb (t->format, rect.w, rect.h,LOCAL_I915_FORMAT_MOD_X_TILED , +create_fb (t->format, rect.w, rect.h, opt.tiling, t->plane, &fullscreen_fb);/* Call pick_color() again since PRI and SPR may not support the same * pixel formats. */
@@ -2722,7 +2724,7 @@ static void scaledprimary_subtest(const struct test_mode *t) old_fb = params->fb.fb;create_fb (t->format, params->fb.fb->width, params->fb.fb->height, -LOCAL_I915_FORMAT_MOD_X_TILED , + opt.tiling, t->plane, &new_fb);fill_fb (&new_fb,COLOR_BLUE );
@@ -2832,7 +2834,7 @@ static void modesetfrombusy_subtest(const struct test_mode *t)prepare_subtest (t,NULL );create_fb (t->format, params->fb.fb->width, params->fb.fb->height, -LOCAL_I915_FORMAT_MOD_X_TILED , t->plane, &fb2); + opt.tiling, t->plane, &fb2);fill_fb (&fb2,COLOR_PRIM_BG );start_busy_thread (params->fb.fb);
@@ -2937,7 +2939,7 @@ static void farfromfence_subtest(const struct test_mode *t) target =pick_target (t, params);create_fb (t->format, params->mode->hdisplay, max_height, -LOCAL_I915_FORMAT_MOD_X_TILED , t->plane, &tall_fb); + opt.tiling, t->plane, &tall_fb);fill_fb (&tall_fb,COLOR_PRIM_BG );
@@ -3012,7 +3014,7 @@ static void badstride_subtest(const struct test_mode *t) old_fb = params->fb.fb;create_fb (t->format, params->fb.fb->width +4096 , params->fb.fb->height, -LOCAL_I915_FORMAT_MOD_X_TILED , t->plane, &wide_fb); + opt.tiling, t->plane, &wide_fb);igt_assert (wide_fb.stride >16384 );fill_fb (&wide_fb,COLOR_PRIM_BG );
@@ -3079,7 +3081,7 @@ static void stridechange_subtest(const struct test_mode *t) old_fb = params->fb.fb;create_fb (t->format, params->fb.fb->width +512 , params->fb.fb->height, -LOCAL_I915_FORMAT_MOD_X_TILED , t->plane, &new_fb); + opt.tiling, t->plane, &new_fb);fill_fb (&new_fb,COLOR_PRIM_BG );igt_assert (old_fb->stride != new_fb.stride);
@@ -3198,7 +3200,7 @@ static void basic_subtest(const struct test_mode *t)prepare_subtest (t, pattern);create_fb (t->format, params->fb.fb->width, params->fb.fb->height, -LOCAL_I915_FORMAT_MOD_X_TILED , t->plane, &fb2); + opt.tiling, t->plane, &fb2); fb1 = params->fb.fb;for (r =0 , method =0 ; method <IGT_DRAW_METHOD_COUNT ; method++, r++) {
@@ -3267,6 +3269,12 @@ static int opt_handler(int option, int option_index, void *data)igt_assert_eq (opt.only_pipes,PIPE_COUNT ); opt.only_pipes =PIPE_DUAL ;break ; +case 'l' : +if (!strncmp (optarg,"y" ,1 )) + opt.tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +else + opt.tiling =LOCAL_I915_FORMAT_MOD_X_TILED ; +break ;default :igt_assert (false); }
@@ -3286,7 +3294,8 @@ const char *help_str =" --shared-fb-x offset Use 'offset' as the X offset for the shared FB\n" " --shared-fb-y offset Use 'offset' as the Y offset for the shared FB\n" " --1p-only Only run subtests that use 1 pipe\n" -" --2p-only Only run subtests that use 2 pipes\n" ; +" --2p-only Only run subtests that use 2 pipes\n" +" --tiling Select tiling mode-'x' or 'y'\n" ;static const char *pipes_str (int pipes) {
@@ -3425,6 +3434,7 @@ int main(int argc, char *argv[]) { "shared-fb-y", 1, 0, 'y'}, { "1p-only", 0, 0, '1'}, { "2p-only", 0, 0, '2'}, + { "tiling", 1, 0, 'l'}, { 0, 0, 0, 0 } };
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 6/7] igt/kms_frontbuffer_tracking: Add Y-tiling support
Em Sex, 2017-04-28 às 20:07 +0530, Praveen Paneri escreveu:
Quoted 5 lines
Allow tests to create Y-tiled bufferes using a separate argument to the test without increasing the number of subtests.
v2: Changed tiling option to string (Paulo)
I had some minor nitpicks for this patch: reshuffling parameters between lines and the way we handle the new argument and its help message. Instead of requesting those trivial changes and creating yet another review round-trip I just went ahead and implemented them as v3. I hope you're fine with this approach. The patch can be applied without the rest of the patches in the series, so I applied it & pushed to IGT with my nitpicks and R-B.
Quoted 251 lines
Signed-off-by Praveen Paneri <[email protected]>---
tests/kms_frontbuffer_tracking.c | 48 ++++++++++++++++++++++++----
------------1 file changed, 29 insertions(+), 19 deletions(-)tests/kms_frontbuffer_tracking.c +2
-0@@ -252,6 +252,7 @@ struct { int only_pipes; int shared_fb_x_offset; int shared_fb_y_offset; +uint64_t tiling; } opt = { .check_status = true, .check_crc = true,@@ -264,6 +265,7 @@ struct { .only_pipes = PIPE_COUNT, .shared_fb_x_offset = 500, .shared_fb_y_offset = 500, + .tiling = LOCAL_I915_FORMAT_MOD_X_TILED, };
structmodeset_params{tests/kms_frontbuffer_tracking.c +0
-0@@ -578,7 +580,7 @@ static void create_fb(enum pixel_format pformat, int width, int height, if (plane == PLANE_CUR) tiling_for_size = LOCAL_DRM_FORMAT_MOD_NONE;else
tests/kms_frontbuffer_tracking.c +1
-1- tiling_for_size =LOCAL_I915_FORMAT_MOD_X_TILED ; + tiling_for_size = opt.tiling;
igt_calc_fb_size(drm.fd, width, height, bpp,tiling_for_size, &size,
&stride);tests/kms_frontbuffer_tracking.c +0
-0@@ -710,7 +712,7 @@ static void create_shared_fb(enum pixel_format format)
big_h=prim_h+scnd_h+offs_h+ opt.shared_fb_y_offset;tests/kms_frontbuffer_tracking.c +0
-1- create_fb(format, big_w, big_h,
LOCAL_I915_FORMAT_MOD_X_TILED,tests/kms_frontbuffer_tracking.c +1
-0+ create_fb(format, big_w, big_h, opt.tiling,PLANE_PRI,
&s->big);
}tests/kms_frontbuffer_tracking.c +0
-0@@ -744,16 +746,16 @@ static void create_fbs(enum pixel_format format)
create_fb(format,prim_mode_params.mode->hdisplay,prim_mode_params.mode->vdisplay,tests/kms_frontbuffer_tracking.c +0
-1- LOCAL_I915_FORMAT_MOD_X_TILED, PLANE_PRI, &s-Quoted 1 line
prim_pri);tests/kms_frontbuffer_tracking.c +1
-0+ opt.tiling, PLANE_PRI, &s->prim_pri);create_fb(format, prim_mode_params.cursor.w,
prim_mode_params.cursor.h,LOCAL_DRM_FORMAT_MOD_NONE,
PLANE_CUR,&s->prim_cur); create_fb(format, prim_mode_params.sprite.w,tests/kms_frontbuffer_tracking.c +0
-1- prim_mode_params.sprite.h,
LOCAL_I915_FORMAT_MOD_X_TILED,tests/kms_frontbuffer_tracking.c +1
-0+ prim_mode_params.sprite.h, opt.tiling,PLANE_SPR,
&s->prim_spr);
create_fb(format, offscreen_fb.w,offscreen_fb.h,tests/kms_frontbuffer_tracking.c +0
-1- LOCAL_I915_FORMAT_MOD_X_TILED, PLANE_PRI, &s-Quoted 1 line
offscreen);
tests/kms_frontbuffer_tracking.c +1
-0+ opt.tiling, PLANE_PRI, &s->offscreen);
create_shared_fb(format);tests/kms_frontbuffer_tracking.c +0
-0@@ -762,11 +764,11 @@ static void create_fbs(enum pixel_format format)
create_fb(format,scnd_mode_params.mode->hdisplay,scnd_mode_params.mode->vdisplay,tests/kms_frontbuffer_tracking.c +0
-1- LOCAL_I915_FORMAT_MOD_X_TILED, PLANE_PRI, &s-Quoted 1 line
scnd_pri);tests/kms_frontbuffer_tracking.c +1
-0+ opt.tiling, PLANE_PRI, &s->scnd_pri);create_fb(format, scnd_mode_params.cursor.w,
scnd_mode_params.cursor.h,LOCAL_DRM_FORMAT_MOD_NONE,PLANE_CUR, &s-Quoted 1 line
scnd_cur);create_fb(format, scnd_mode_params.sprite.w,
scnd_mode_params.sprite.h,tests/kms_frontbuffer_tracking.c +0
-1- LOCAL_I915_FORMAT_MOD_X_TILED, PLANE_SPR, &s-Quoted 1 line
scnd_spr);tests/kms_frontbuffer_tracking.c +1
-0+ opt.tiling, PLANE_SPR, &s->scnd_spr);}
static boolset_mode_for_params(struct modeset_params *params)tests/kms_frontbuffer_tracking.c +0
-0@@ -1252,7 +1254,7 @@ static void init_blue_crc(enum pixel_format format, bool mandatory_sink_crc)
create_fb(format,prim_mode_params.mode->hdisplay,prim_mode_params.mode->vdisplay,tests/kms_frontbuffer_tracking.c +1
-1- LOCAL_I915_FORMAT_MOD_X_TILED, PLANE_PRI, &blue); + opt.tiling, PLANE_PRI, &blue);
fill_fb(&blue, COLOR_PRIM_BG);tests/kms_frontbuffer_tracking.c +1
-1@@ -1287,7 +1289,7 @@ static void init_crcs(enum pixel_format format, for (r = 0; r < pattern->n_rects; r++) create_fb(format, prim_mode_params.mode->hdisplay, prim_mode_params.mode->vdisplay, - LOCAL_I915_FORMAT_MOD_X_TILED, PLANE_PRI, &tmp_fbs[r]); + opt.tiling, PLANE_PRI, &tmp_fbs[r]);
for (r = 0; r <pattern->n_rects; r++)fill_fb(&tmp_fbs[r], COLOR_PRIM_BG);tests/kms_frontbuffer_tracking.c +0
-0@@ -2386,7 +2388,7 @@ static void flip_subtest(const struct test_mode *t) prepare_subtest(t, pattern);
create_fb(t->format,params->fb.fb->width, params->fb.fb-Quoted 1 line
height,
tests/kms_frontbuffer_tracking.c +1
-1- LOCAL_I915_FORMAT_MOD_X_TILED, t->plane, &fb2); + opt.tiling, t->plane, &fb2);
fill_fb(&fb2, bg_color);
orig_fb=params->fb.fb;tests/kms_frontbuffer_tracking.c +0
-0@@ -2432,7 +2434,7 @@ static void fliptrack_subtest(const struct test_mode *t, enum flip_type type) prepare_subtest(t, pattern);
create_fb(t->format,params->fb.fb->width, params->fb.fb-Quoted 1 line
height,
tests/kms_frontbuffer_tracking.c +1
-1- LOCAL_I915_FORMAT_MOD_X_TILED, t->plane, &fb2); + opt.tiling, t->plane, &fb2);
fill_fb(&fb2, COLOR_PRIM_BG);
orig_fb=params->fb.fb;tests/kms_frontbuffer_tracking.c +0
-0@@ -2643,7 +2645,7 @@ static void fullscreen_plane_subtest(const struct test_mode *t) prepare_subtest(t, pattern);
rect =pattern->get_rect(¶ms->fb, 0);tests/kms_frontbuffer_tracking.c +0
-1- create_fb(t->format, rect.w, rect.h,
LOCAL_I915_FORMAT_MOD_X_TILED,tests/kms_frontbuffer_tracking.c +1
-0+ create_fb(t->format, rect.w, rect.h, opt.tiling,t->plane,
&fullscreen_fb);
/* Callpick_color()again since PRI and SPR may not support the same
* pixel formats. */tests/kms_frontbuffer_tracking.c +0
-0@@ -2722,7 +2724,7 @@ static void scaledprimary_subtest(const struct test_mode *t) old_fb = params->fb.fb;
create_fb(t->format,params->fb.fb->width, params->fb.fb-Quoted 1 line
height,
tests/kms_frontbuffer_tracking.c +1
-1- LOCAL_I915_FORMAT_MOD_X_TILED, + opt.tiling,t->plane,
&new_fb);
fill_fb(&new_fb, COLOR_BLUE);tests/kms_frontbuffer_tracking.c +0
-0@@ -2832,7 +2834,7 @@ static void modesetfrombusy_subtest(const struct test_mode *t) prepare_subtest(t, NULL);
create_fb(t->format,params->fb.fb->width, params->fb.fb-Quoted 1 line
height,
tests/kms_frontbuffer_tracking.c +1
-1- LOCAL_I915_FORMAT_MOD_X_TILED, t->plane, &fb2); + opt.tiling, t->plane, &fb2);
fill_fb(&fb2, COLOR_PRIM_BG);
start_busy_thread(params->fb.fb);tests/kms_frontbuffer_tracking.c +0
-0@@ -2937,7 +2939,7 @@ static void farfromfence_subtest(const struct test_mode *t) target = pick_target(t, params);
create_fb(t->format,params->mode->hdisplay,max_height,tests/kms_frontbuffer_tracking.c +0
-1- LOCAL_I915_FORMAT_MOD_X_TILED, t->plane,
&tall_fb);tests/kms_frontbuffer_tracking.c +1
-0+ opt.tiling, t->plane, &tall_fb);
fill_fb(&tall_fb, COLOR_PRIM_BG);tests/kms_frontbuffer_tracking.c +0
-0@@ -3012,7 +3014,7 @@ static void badstride_subtest(const struct test_mode *t) old_fb = params->fb.fb;
create_fb(t->format,params->fb.fb->width+ 4096, params-Quoted 1 line
fb.fb->height,tests/kms_frontbuffer_tracking.c +0
-1- LOCAL_I915_FORMAT_MOD_X_TILED, t->plane,
&wide_fb);tests/kms_frontbuffer_tracking.c +1
-0+ opt.tiling, t->plane, &wide_fb);
igt_assert(wide_fb.stride > 16384);
fill_fb(&wide_fb, COLOR_PRIM_BG);tests/kms_frontbuffer_tracking.c +0
-0@@ -3079,7 +3081,7 @@ static void stridechange_subtest(const struct test_mode *t) old_fb = params->fb.fb;
create_fb(t->format,params->fb.fb->width+ 512, params-Quoted 1 line
fb.fb->height,tests/kms_frontbuffer_tracking.c +1
-1- LOCAL_I915_FORMAT_MOD_X_TILED, t->plane, &new_fb); + opt.tiling, t->plane, &new_fb);
fill_fb(&new_fb, COLOR_PRIM_BG);
igt_assert(old_fb->stride != new_fb.stride);tests/kms_frontbuffer_tracking.c +0
-0@@ -3198,7 +3200,7 @@ static void basic_subtest(const struct test_mode *t) prepare_subtest(t, pattern);
create_fb(t->format,params->fb.fb->width, params->fb.fb-Quoted 1 line
height,
tests/kms_frontbuffer_tracking.c +1
-1- LOCAL_I915_FORMAT_MOD_X_TILED, t->plane, &fb2); + opt.tiling, t->plane, &fb2);fb1 =
params->fb.fb;
for (r = 0, method = 0; method <IGT_DRAW_METHOD_COUNT; method++, r++) {tests/kms_frontbuffer_tracking.c +6
-0@@ -3267,6 +3269,12 @@ static int opt_handler(int option, int option_index, void *data) igt_assert_eq(opt.only_pipes, PIPE_COUNT); opt.only_pipes = PIPE_DUAL; break; +case 'l' : +if (!strncmp (optarg,"y" ,1 )) + opt.tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +else + opt.tiling =LOCAL_I915_FORMAT_MOD_X_TILED ; +break ;default:
igt_assert(false);
}tests/kms_frontbuffer_tracking.c +0
-0@@ -3286,7 +3294,8 @@ const char *help_str =" --shared-fb-x offset Use 'offset' as the X offset for the shared FB\n"
" --shared-fb-y offset Use 'offset' as the Y offset for the shared FB\n"
" --1p-only Only run subtests that use 1 pipe\n" -" --2p-only Only run subtests that use 2 pipes\n";
+" --2p-only Only run subtests that use 2 pipes\n" +" --tiling Select tiling mode-'x' or 'y'\n";
static const char *pipes_str(int pipes)
{tests/kms_frontbuffer_tracking.c +1
-0@@ -3425,6 +3434,7 @@ int main(int argc, char *argv[]) { "shared-fb-y", 1, 0, 'y'}, { "1p-only", 0, 0, '1'}, { "2p-only", 0, 0, '2'}, + { "tiling", 1, 0, 'l'}, { 0, 0, 0, 0 } };
Quoted 1 line
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 6/7] igt/kms_frontbuffer_tracking: Add Y-tiling support
Hi Paulo,
Quoted 7 lines · Paulo Zanoni
Em Sex, 2017-04-28 às 20:07 +0530, Praveen Paneri escreveu:
Quoted 5 lines
Allow tests to create Y-tiled bufferes using a separate argument to the test without increasing the number of subtests.
v2: Changed tiling option to string (Paulo)
Quoted 9 lines
I had some minor nitpicks for this patch: reshuffling parameters between lines and the way we handle the new argument and its help message. Instead of requesting those trivial changes and creating yet another review round-trip I just went ahead and implemented them as v3. I hope you're fine with this approach. The patch can be applied without the rest of the patches in the series, so I applied it & pushed to IGT with my nitpicks and R-B.
Thank you for your review
Praveen
Quoted 242 lines
Quoted 242 lines
Signed-off-by Praveen Paneri <[email protected]>--- tests/kms_frontbuffer_tracking.c | 48 ++++++++++++++++++++++++---- ------------ 1 file changed, 29 insertions(+), 19 deletions(-)tests/kms_frontbuffer_tracking.c +3
-1@@ -252,6 +252,7 @@ struct {int only_pipes;int shared_fb_x_offset;int shared_fb_y_offset; +uint64_t tiling; } opt = { .check_status = true, .check_crc = true,@@ -264,6 +265,7 @@ struct { .only_pipes = PIPE_COUNT, .shared_fb_x_offset = 500, .shared_fb_y_offset = 500, + .tiling = LOCAL_I915_FORMAT_MOD_X_TILED, };struct modeset_params {@@ -578,7 +580,7 @@ static void create_fb(enum pixel_format pformat, int width, int height, if (plane == PLANE_CUR) tiling_for_size =LOCAL_DRM_FORMAT_MOD_NONE ; else - tiling_for_size =LOCAL_I915_FORMAT_MOD_X_TILED ; + tiling_for_size = opt.tiling; igt_calc_fb_size(drm.fd, width, height, bpp,
tiling_for_size, &size,tests/kms_frontbuffer_tracking.c +1
-1&stride);@@ -710,7 +712,7 @@ static void create_shared_fb(enum pixel_format format) big_h = prim_h + scnd_h + offs_h + opt.shared_fb_y_offset; -create_fb (format, big_w, big_h,LOCAL_I915_FORMAT_MOD_X_TILED , +create_fb (format, big_w, big_h, opt.tiling,PLANE_PRI , &s->big);}
tests/kms_frontbuffer_tracking.c +2
-3@@ -744,16 +746,16 @@ static void create_fbs(enum pixel_format format) create_fb(format, prim_mode_params.mode->hdisplay, prim_mode_params.mode->vdisplay, - LOCAL_I915_FORMAT_MOD_X_TILED, PLANE_PRI, &s- > prim_pri); + opt.tiling, PLANE_PRI, &s->prim_pri);create_fb (format, prim_mode_params.cursor.w, prim_mode_params.cursor.h,LOCAL_DRM_FORMAT_MOD_NONE ,PLANE_CUR , &s->prim_cur);create_fb (format, prim_mode_params.sprite.w, - prim_mode_params.sprite.h,LOCAL_I915_FORMAT_MOD_X_TILED , + prim_mode_params.sprite.h, opt.tiling,PLANE_SPR , &s->prim_spr); create_fb(format, offscreen_fb.w, offscreen_fb.h, - LOCAL_I915_FORMAT_MOD_X_TILED, PLANE_PRI, &s-Quoted 1 line
offscreen);
tests/kms_frontbuffer_tracking.c +2
-1+ opt.tiling, PLANE_PRI, &s->offscreen);create_shared_fb (format);@@ -762,11 +764,11 @@ static void create_fbs(enum pixel_format format) create_fb(format, scnd_mode_params.mode->hdisplay, scnd_mode_params.mode->vdisplay, - LOCAL_I915_FORMAT_MOD_X_TILED, PLANE_PRI, &s- > scnd_pri); + opt.tiling, PLANE_PRI, &s->scnd_pri);create_fb (format, scnd_mode_params.cursor.w, scnd_mode_params.cursor.h,LOCAL_DRM_FORMAT_MOD_NONE ,PLANE_CUR , &s- > scnd_cur); create_fb(format, scnd_mode_params.sprite.w,
scnd_mode_params.sprite.h,tests/kms_frontbuffer_tracking.c +0
-1- LOCAL_I915_FORMAT_MOD_X_TILED, PLANE_SPR, &s-Quoted 1 line
scnd_spr);tests/kms_frontbuffer_tracking.c +3
-2+ opt.tiling, PLANE_SPR, &s->scnd_spr); }static bool set_mode_for_params (struct modeset_params *params)@@ -1252,7 +1254,7 @@ static void init_blue_crc(enum pixel_format format, bool mandatory_sink_crc)create_fb (format, prim_mode_params.mode->hdisplay, prim_mode_params.mode->vdisplay, -LOCAL_I915_FORMAT_MOD_X_TILED ,PLANE_PRI , &blue); + opt.tiling,PLANE_PRI , &blue);fill_fb (&blue,COLOR_PRIM_BG );@@ -1287,7 +1289,7 @@ static void init_crcs(enum pixel_format format,for (r =0 ; r < pattern->n_rects; r++)create_fb (format, prim_mode_params.mode->hdisplay, prim_mode_params.mode->vdisplay, -LOCAL_I915_FORMAT_MOD_X_TILED ,PLANE_PRI , &tmp_fbs[r]); + opt.tiling, PLANE_PRI, &tmp_fbs[r]);for (r =0 ; r < pattern->n_rects; r++)tests/kms_frontbuffer_tracking.c +1
-1fill_fb (&tmp_fbs[r],COLOR_PRIM_BG );@@ -2386,7 +2388,7 @@ static void flip_subtest(const struct test_mode *t)prepare_subtest (t, pattern);create_fb (t->format, params->fb.fb->width, params->fb.fb- > height, -LOCAL_I915_FORMAT_MOD_X_TILED , t->plane, &fb2); + opt.tiling, t->plane, &fb2);fill_fb (&fb2, bg_color);tests/kms_frontbuffer_tracking.c +1
-1orig_fb = params->fb.fb;@@ -2432,7 +2434,7 @@ static void fliptrack_subtest(const struct test_mode *t, enum flip_type type)prepare_subtest (t ,pattern );create_fb (t->format, params->fb.fb->width, params->fb.fb- > height, -LOCAL_I915_FORMAT_MOD_X_TILED , t->plane, &fb2); + opt.tiling, t->plane, &fb2);fill_fb (&fb2,COLOR_PRIM_BG );tests/kms_frontbuffer_tracking.c +1
-1orig_fb = params->fb.fb;@@ -2643,7 +2645,7 @@ static void fullscreen_plane_subtest(const struct test_mode *t)prepare_subtest (t ,pattern ); rect = pattern->get_rect (¶ms->fb,0 ); -create_fb (t->format, rect.w, rect.h,LOCAL_I915_FORMAT_MOD_X_TILED , +create_fb (t->format, rect.w, rect.h, opt.tiling, t->plane, &fullscreen_fb);/* Call
pick_color()again since PRI and SPR may not support
the sametests/kms_frontbuffer_tracking.c +1
-1* pixel formats. */ @@ -2722,7 +2724,7 @@ static void scaledprimary_subtest(const struct test_mode *t) old_fb = params->fb.fb;create_fb (t->format, params->fb.fb->width, params->fb.fb- > height, -LOCAL_I915_FORMAT_MOD_X_TILED , + opt.tiling, t->plane, &new_fb);tests/kms_frontbuffer_tracking.c +1
-1fill_fb (&new_fb,COLOR_BLUE );@@ -2832,7 +2834,7 @@ static void modesetfrombusy_subtest(const struct test_mode *t)prepare_subtest (t ,NULL );create_fb (t->format, params->fb.fb->width, params->fb.fb- > height, -LOCAL_I915_FORMAT_MOD_X_TILED , t->plane, &fb2); + opt.tiling, t->plane, &fb2);fill_fb (&fb2,COLOR_PRIM_BG );tests/kms_frontbuffer_tracking.c +1
-1start_busy_thread (params->fb.fb);@@ -2937,7 +2939,7 @@ static void farfromfence_subtest(const struct test_mode *t) target =pick_target (t, params);create_fb (t->format, params->mode->hdisplay, max_height, -LOCAL_I915_FORMAT_MOD_X_TILED , t->plane, &tall_fb); + opt.tiling, t->plane, &tall_fb);tests/kms_frontbuffer_tracking.c +1
-1fill_fb (&tall_fb,COLOR_PRIM_BG );@@ -3012,7 +3014,7 @@ static void badstride_subtest(const struct test_mode *t) old_fb = params->fb.fb;create_fb (t->format, params->fb.fb->width +4096 , params- > fb.fb->height, -LOCAL_I915_FORMAT_MOD_X_TILED , t->plane, &wide_fb); + opt.tiling, t->plane, &wide_fb);tests/kms_frontbuffer_tracking.c +1
-1igt_assert (wide_fb.stride >16384 );fill_fb (&wide_fb,COLOR_PRIM_BG );@@ -3079,7 +3081,7 @@ static void stridechange_subtest(const struct test_mode *t) old_fb = params->fb.fb;create_fb (t->format, params->fb.fb->width +512 , params- > fb.fb->height, -LOCAL_I915_FORMAT_MOD_X_TILED , t->plane, &new_fb); + opt.tiling, t->plane, &new_fb);fill_fb (&new_fb,COLOR_PRIM_BG );tests/kms_frontbuffer_tracking.c +1
-1igt_assert (old_fb->stride != new_fb.stride);@@ -3198,7 +3200,7 @@ static void basic_subtest(const struct test_mode *t)prepare_subtest (t ,pattern );create_fb (t->format, params->fb.fb->width, params->fb.fb- > height, -LOCAL_I915_FORMAT_MOD_X_TILED , t->plane, &fb2); + opt.tiling, t->plane, &fb2); fb1 = params->fb.fb;for (r = 0, method = 0; method <
IGT_DRAW_METHOD_COUNT;
method++, r++) {tests/kms_frontbuffer_tracking.c +6
-0@@ -3267,6 +3269,12 @@ static int opt_handler(int option, int option_index, void *data)igt_assert_eq (opt.only_pipes,PIPE_COUNT ); opt.only_pipes =PIPE_DUAL ;break ; +case 'l' : +if (!strncmp (optarg,"y" ,1 )) + opt.tiling =LOCAL_I915_FORMAT_MOD_Y_TILED ; +else + opt.tiling =LOCAL_I915_FORMAT_MOD_X_TILED ; +break ;default :igt_assert (false);tests/kms_frontbuffer_tracking.c +0
-0}@@ -3286,7 +3294,8 @@ const char *help_str = " --shared-fb-x offset Use 'offset' as the X offset for theshared FB\n"
" --shared-fb-y offset Use 'offset' as the Y offset for the
shared FB\n"" --1p-only Only run subtests that use 1 pipe\n" -" --2p-only Only run subtests that use 2 pipes\n"; +" --2p-only Only run subtests that use 2 pipes\n" +" --tiling Select tiling mode-'x' or 'y'\n";
Quoted 10 lines
tests/kms_frontbuffer_tracking.c int main(int argc, char *argv[]) · line 3440
Quoted 10 lines
static const char *pipes_str(int pipes)
{tests/kms_frontbuffer_tracking.c +1
-0@@ -3425,6 +3434,7 @@ int main(int argc, char *argv[]) { "shared-fb-y", 1, 0, 'y'}, { "1p-only", 0, 0, '1'}, { "2p-only", 0, 0, '2'}, + { "tiling", 1, 0, 'l'}, { 0, 0, 0, 0 } };
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 7/7 igt/kms_fbc_crc.c : Add Y-tile tests
In reply to Praveen PaneriNow that we have support for Y-tiled buffers, add another iteration of tests for Y-tiled buffers.
--- tests/kms_fbc_crc.c | 71 +++++++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 32 deletions(-)
tests/kms_fbc_crc.c +39 -32
@@ -318,12 +318,10 @@ static void prepare_crtc(data_t *data)igt_output_set_pipe (output, data->pipe); } -static void create_fbs (data_t *data,bool tiled,struct igt_fb *fbs) +static void create_fbs (data_t *data,uint64_t tiling,struct igt_fb *fbs) {int rc;drmModeModeInfo *mode =igt_output_get_mode (data->output); -uint64_t tiling = tiled ?LOCAL_I915_FORMAT_MOD_X_TILED : -LOCAL_DRM_FORMAT_MOD_NONE ; rc = igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay, DRM_FORMAT_XRGB8888, tiling,
@@ -344,8 +342,8 @@ static void get_ref_crcs(data_t *data)struct igt_fb fbs[4 ];int i; -create_fbs (data, false, &fbs[0 ]); -create_fbs (data, false, &fbs[2 ]); +create_fbs (data,LOCAL_DRM_FORMAT_MOD_NONE , &fbs[0 ]); +create_fbs (data,LOCAL_DRM_FORMAT_MOD_NONE , &fbs[2 ]);fill_mmap_gtt (data, fbs[2 ].gem_handle,0xff );fill_mmap_gtt (data, fbs[3 ].gem_handle,0xff );
@@ -366,7 +364,7 @@ static void get_ref_crcs(data_t *data)igt_remove_fb (data->drm_fd, &fbs[i]); } -static bool prepare_test (data_t *data,enum test_mode test_mode) +static bool prepare_test (data_t *data,enum test_mode test_mode,uint64_t tiling) {igt_display_t *display = &data->display;igt_output_t *output = data->output;
@@ -374,7 +372,7 @@ static bool prepare_test(data_t *data, enum test_mode test_mode) data->primary =igt_output_get_plane_type (data->output,DRM_PLANE_TYPE_PRIMARY ); -create_fbs (data, true, data->fb); +create_fbs (data, tiling, data->fb);igt_pipe_crc_free (data->pipe_crc); data->pipe_crc =NULL ;
@@ -484,32 +482,41 @@ static void run_test(data_t *data, enum test_mode mode)reset_display (data); -for_each_pipe_with_valid_output (display, data->pipe, data->output) { -prepare_crtc (data); - -igt_info ("Beginning %s on pipe %s, connector %s\n" , -igt_subtest_name (), -kmstest_pipe_name (data->pipe), -igt_output_name (data->output)); - -if (!prepare_test (data, mode)) { -igt_info ("%s on pipe %s, connector %s: SKIPPED\n" , -igt_subtest_name (), -kmstest_pipe_name (data->pipe), -igt_output_name (data->output)); -continue ; +for (int tiling =I915_TILING_X ; + tiling <=I915_TILING_Y ; tiling++) { +for_each_pipe_with_valid_output (display, + data->pipe, data->output) { +prepare_crtc (data); + +igt_info ("Beginning %s on pipe %s, connector " +"%s, %s-tiled\n" , +igt_subtest_name (), +kmstest_pipe_name (data->pipe), +igt_output_name (data->output), + (tiling ==I915_TILING_X ) ?"x" :"y" ); + +if (!prepare_test (data, mode, +igt_fb_tiling_to_mod (tiling))) { +igt_info ("%s on pipe %s, connector %s: SKIPPED\n" , +igt_subtest_name (), +kmstest_pipe_name (data->pipe), +igt_output_name (data->output)); +continue ; + } + + valid_tests++; + +test_crc (data, mode); + +igt_info ("%s on pipe %s, connector %s" +"%s-tiled: PASSED\n" , +igt_subtest_name (), +kmstest_pipe_name (data->pipe), +igt_output_name (data->output), + (tiling ==I915_TILING_X ) ?"x" :"y" ); + +finish_crtc (data, mode); } - - valid_tests++; - -test_crc (data, mode); - -igt_info ("%s on pipe %s, connector %s: PASSED\n" , -igt_subtest_name (), -kmstest_pipe_name (data->pipe), -igt_output_name (data->output)); - -finish_crtc (data, mode); }igt_require_f (valid_tests,"no valid crtc/connector combinations found\n" );
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 7/7] igt/kms_fbc_crc.c : Add Y-tile tests
Em Sex, 2017-04-28 às 20:07 +0530, Praveen Paneri escreveu:
Quoted 2 lines
Now that we have support for Y-tiled buffers, add another iteration of tests for Y-tiled buffers.
Have you tested this on platforms that don't support Y-tiled buffers? I don't see a check for that, so I wonder if we'll just fail some assertion or correctly hit some igt_skip() call I couldn't find.
More below.
Quoted 76 lines
Signed-off-by Praveen Paneri <[email protected]>---
tests/kms_fbc_crc.c | 71 +++++++++++++++++++++++++++++------------
------------1 file changed, 39 insertions(+), 32 deletions(-)tests/kms_fbc_crc.c +0
-0@@ -318,12 +318,10 @@ static void prepare_crtc(data_t *data) igt_output_set_pipe(output, data->pipe); }tests/kms_fbc_crc.c +1
-1-static void create_fbs (data_t *data,bool tiled,struct igt_fb *fbs) +static void create_fbs(data_t *data, uint64_t tiling, struct igt_fb*fbs)
{
int rc;
drmModeModeInfo *mode =igt_output_get_mode(data->output);tests/kms_fbc_crc.c +0
-2-uint64_t tiling = tiled ?LOCAL_I915_FORMAT_MOD_X_TILED : - LOCAL_DRM_FORMAT_MOD_NONE;
rc = igt_create_color_fb(data->drm_fd,mode->hdisplay, mode-Quoted 1 line
vdisplay,
DRM_FORMAT_XRGB8888, tiling,
tests/kms_fbc_crc.c +0
-0@@ -344,8 +342,8 @@ static void get_ref_crcs(data_t *data) struct igt_fb fbs[4]; int i;tests/kms_fbc_crc.c +2
-2-create_fbs (data, false, &fbs[0 ]); -create_fbs (data, false, &fbs[2 ]); +create_fbs (data,LOCAL_DRM_FORMAT_MOD_NONE , &fbs[0 ]); +create_fbs (data,LOCAL_DRM_FORMAT_MOD_NONE , &fbs[2 ]);
fill_mmap_gtt(data, fbs[2].gem_handle, 0xff);fill_mmap_gtt(data, fbs[3].gem_handle, 0xff);tests/kms_fbc_crc.c +0
-0@@ -366,7 +364,7 @@ static void get_ref_crcs(data_t *data) igt_remove_fb(data->drm_fd, &fbs[i]); }tests/kms_fbc_crc.c +1
-1-static bool prepare_test (data_t *data,enum test_mode test_mode) +static bool prepare_test(data_t *data, enum test_mode test_mode,
uint64_ttiling)
{
igt_display_t*display =&data->display;
igt_output_t*output =data->output;tests/kms_fbc_crc.c +0
-0@@ -374,7 +372,7 @@ static bool prepare_test(data_t *data, enum test_mode test_mode)
data->primary=igt_output_get_plane_type(data->output, DRM_PLANE_TYPE_PRIMARY);tests/kms_fbc_crc.c +1
-1-create_fbs (data, true, data->fb); +create_fbs (data, tiling, data->fb);
igt_pipe_crc_free(data->pipe_crc);
data->pipe_crc= NULL;tests/kms_fbc_crc.c +0
-0@@ -484,32 +482,41 @@ static void run_test(data_t *data, enum test_mode mode)
reset_display(data);tests/kms_fbc_crc.c +0
-1- for_each_pipe_with_valid_output(display, data->pipe, data-Quoted 1 line
output) {
tests/kms_fbc_crc.c +0
-9-prepare_crtc (data); - -igt_info ("Beginning %s on pipe %s, connector %s\n" , - igt_subtest_name(), - kmstest_pipe_name(data->pipe), - igt_output_name(data->output)); - -if (!prepare_test (data, mode)) { - igt_info("%s on pipe %s, connector %s:SKIPPED\n",
tests/kms_fbc_crc.c static void run_test(data_t *data, enum test_mode mode) · line 486
Quoted 6 lines
tests/kms_fbc_crc.c +2
-4- igt_subtest_name(), - kmstest_pipe_name(data->pipe), - igt_output_name(data->output)); -continue ; +for (int tiling =I915_TILING_X ; + tiling <= I915_TILING_Y; tiling++) {
What I don't understand is why this part of the code chooses to go with the tiling constants (I915_TILING_) only to later convert them to modifiers with igt_fb_tiling_to_mod(). If this loop iterated over the modifiers directly we wouldn't need that. The rest of the code only cares about the modifiers.
Quoted 14 lines
tests/kms_fbc_crc.c +2
-0+for_each_pipe_with_valid_output (display, + data->pipe, data-Quoted 1 line
output) {
tests/kms_fbc_crc.c +3
-0+prepare_crtc (data); + + igt_info("Beginning %s on pipe %s, connector"
tests/kms_fbc_crc.c +3
-0+"%s, %s-tiled\n" , +igt_subtest_name (), + kmstest_pipe_name(data-Quoted 1 line
pipe),
tests/kms_fbc_crc.c +1
-0+ igt_output_name(data-Quoted 1 line
output),
tests/kms_fbc_crc.c +1
-0+ (tiling == I915_TILING_X) ?
Quoted 1 line
"x":"y" );
This change is not keeping the indentation style, things should be aligned with the parens (although I see they're actually aligned with the quote, which is also weird). The same can be said for the other two igt_info() calls in this patch.
tests/kms_fbc_crc.c
Quoted 11 lines
tests/kms_fbc_crc.c +3
-0+ + if (!prepare_test(data, mode, + igt_fb_tiling_to_mod(tiling))) {
tests/kms_fbc_crc.c +1
-0+ igt_info("%s on pipe %s, connector%s: SKIPPED\n",
tests/kms_fbc_crc.c +2
-0+igt_subtest_name (), + kmstest_pipe_name(da
ta->pipe),tests/kms_fbc_crc.c +1
-1+ igt_output_name(data ->output));
This one is missing the "%s-tiled" part that was added in the other two messages.
And we can probably create a "const char *tiling_name" variable to store the %s part in order to avoid the same ternary operator in the 3 if statements.
Quoted 30 lines
tests/kms_fbc_crc.c +11
-0+continue ; + } + + valid_tests++; + +test_crc (data, mode); + + igt_info("%s on pipe %s, connector %s" + "%s-tiled: PASSED\n", + igt_subtest_name(), + kmstest_pipe_name(data-Quoted 1 line
pipe),
tests/kms_fbc_crc.c +1
-0+ igt_output_name(data-Quoted 1 line
output),
tests/kms_fbc_crc.c +1
-0+ (tiling == I915_TILING_X) ?"x":"y" );
tests/kms_fbc_crc.c +2
-0+ +finish_crtc (data, mode);}
tests/kms_fbc_crc.c +0
-11- - valid_tests++; - -test_crc (data, mode); - -igt_info ("%s on pipe %s, connector %s: PASSED\n" , - igt_subtest_name(), - kmstest_pipe_name(data->pipe), - igt_output_name(data->output)); - -finish_crtc (data, mode);
Quoted 4 lines
}
igt_require_f(valid_tests, "no valid crtc/connector combinations found\n");
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 7/7] igt/kms_fbc_crc.c : Add Y-tile tests
Hi Paulo,
Quoted 5 lines · Paulo Zanoni
Em Sex, 2017-04-28 às 20:07 +0530, Praveen Paneri escreveu:
Quoted 2 lines
Now that we have support for Y-tiled buffers, add another iteration of tests for Y-tiled buffers.
Have you tested this on platforms that don't support Y-tiled buffers? I
Unfortunately I haven't...
Quoted 2 lines
don't see a check for that, so I wonder if we'll just fail some assertion or correctly hit some
igt_skip()call I couldn't find.
...but I will add the check as you have mentioned
Quoted 83 lines
More below.
Quoted 80 lines
Signed-off-by Praveen Paneri <[email protected]>--- tests/kms_fbc_crc.c | 71 +++++++++++++++++++++++++++++------------ ------------ 1 file changed, 39 insertions(+), 32 deletions(-)tests/kms_fbc_crc.c +1
-3@@ -318,12 +318,10 @@ static void prepare_crtc(data_t *data)igt_output_set_pipe (output, data->pipe); } -static void create_fbs (data_t *data,bool tiled,struct igt_fb *fbs) +static void create_fbs (data_t *data,uint64_t tiling,struct igt_fb *fbs) {int rc;drmModeModeInfo *mode =igt_output_get_mode (data->output); -uint64_t tiling = tiled ?LOCAL_I915_FORMAT_MOD_X_TILED : -LOCAL_DRM_FORMAT_MOD_NONE ; rc = igt_create_color_fb(data->drm_fd, mode->hdisplay, mode-Quoted 1 line
vdisplay,
tests/kms_fbc_crc.c +3
-3DRM_FORMAT_XRGB8888, tiling,@@ -344,8 +342,8 @@ static void get_ref_crcs(data_t *data)struct igt_fb fbs[4 ];int i; -create_fbs (data, false, &fbs[0 ]); -create_fbs (data, false, &fbs[2 ]); +create_fbs (data,LOCAL_DRM_FORMAT_MOD_NONE , &fbs[0 ]); +create_fbs (data,LOCAL_DRM_FORMAT_MOD_NONE , &fbs[2 ]);fill_mmap_gtt (data, fbs[2 ].gem_handle,0xff );fill_mmap_gtt (data, fbs[3 ].gem_handle,0xff );@@ -366,7 +364,7 @@ static void get_ref_crcs(data_t *data)igt_remove_fb (data->drm_fd, &fbs[i]); } -static bool prepare_test (data_t *data,enum test_mode test_mode) +static bool prepare_test (data_t *data,enum test_mode test_mode,uint64_t tiling) {igt_display_t *display = &data->display;tests/kms_fbc_crc.c +1
-1igt_output_t *output = data->output;@@ -374,7 +372,7 @@ static bool prepare_test(data_t *data, enum test_mode test_mode) data->primary = igt_output_get_plane_type(data->output,DRM_PLANE_TYPE_PRIMARY ); -create_fbs (data, true, data->fb); +create_fbs (data, tiling, data->fb);tests/kms_fbc_crc.c +0
-14igt_pipe_crc_free (data->pipe_crc); data->pipe_crc =NULL ;@@ -484,32 +482,41 @@ static void run_test(data_t *data, enum test_mode mode)reset_display (data ); -for_each_pipe_with_valid_output (display, data->pipe, data- > output) { -prepare_crtc (data); - -igt_info ("Beginning %s on pipe %s, connector %s\n" , -igt_subtest_name (), -kmstest_pipe_name (data->pipe), -igt_output_name (data->output)); - -if (!prepare_test (data, mode)) { -igt_info ("%s on pipe %s, connector %s: SKIPPED\n", -igt_subtest_name (), -kmstest_pipe_name (data->pipe), -igt_output_name (data->output)); -continue ;
Quoted 8 lines
tests/kms_fbc_crc.c static void run_test(data_t *data, enum test_mode mode) · line 486
Quoted 2 lines
tests/kms_fbc_crc.c +2
-0+for (int tiling =I915_TILING_X ; + tiling <=I915_TILING_Y ; tiling++) {What I don't understand is why this part of the code chooses to go with the tiling constants (
I915_TILING_) only to later convert them to modifiers withigt_fb_tiling_to_mod(). If this loop iterated over the modifiers directly we wouldn't need that. The rest of the code only cares about the modifiers.
I chose to loop over tiling constants as they are in a simple arithmetic order. anyhow I will just change that.
Also as mentioned above can I just add a check to skip Y-tiling tests for older platforms?
igt_skip_on(intel_gen(intel_get_drm_devid(drm_fd)) < 9 &&
tiling == I915_TILING_Y);
Quoted 14 lines
Quoted 14 lines
tests/kms_fbc_crc.c +5
-0+for_each_pipe_with_valid_output (display, + data->pipe, data- > output) { +prepare_crtc (data); + + igt_info("Beginning %s on pipe %s, connector"
tests/kms_fbc_crc.c +3
-0+"%s, %s-tiled\n" , +igt_subtest_name (), + kmstest_pipe_name(data-Quoted 1 line
pipe),
tests/kms_fbc_crc.c +1
-0+ igt_output_name(data-
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
output),
tests/kms_fbc_crc.c +1
-0+ (tiling == I915_TILING_X) ?"x":"y" );
This change is not keeping the indentation style, things should be aligned with the parens (although I see they're actually aligned with the quote, which is also weird). The same can be said for the other two
igt_info()calls in this patch.
Will fix it
Quoted 17 lines
tests/kms_fbc_crc.c
Quoted 13 lines
tests/kms_fbc_crc.c +3
-0+ + if (!prepare_test(data, mode, + igt_fb_tiling_to_mod(tiling))) {
tests/kms_fbc_crc.c +1
-0+ igt_info("%s on pipe %s, connector%s: SKIPPED\n",
tests/kms_fbc_crc.c +2
-0+igt_subtest_name (), + kmstest_pipe_name(da
ta->pipe),tests/kms_fbc_crc.c +1
-1+ igt_output_name(data ->output));This one is missing the "%s-tiled" part that was added in the other two messages.
Quoted 3 lines
And we can probably create a "const char
*tiling_name" variable to store the %s part in order to avoid the same ternary operator in the 3 if statements.
make sense, will add.
Quoted 34 lines
Quoted 34 lines
tests/kms_fbc_crc.c +11
-0+continue ; + } + + valid_tests++; + +test_crc (data, mode); + + igt_info("%s on pipe %s, connector %s" + "%s-tiled: PASSED\n", + igt_subtest_name(), + kmstest_pipe_name(data-Quoted 1 line
pipe),
tests/kms_fbc_crc.c +1
-0+ igt_output_name(data-Quoted 1 line
output),
tests/kms_fbc_crc.c +1
-0+ (tiling == I915_TILING_X) ?"x":"y" );
tests/kms_fbc_crc.c +2
-11+ +finish_crtc (data, mode); } - - valid_tests++; - -test_crc (data, mode); - -igt_info ("%s on pipe %s, connector %s: PASSED\n" , -igt_subtest_name (), -kmstest_pipe_name (data->pipe), -igt_output_name (data->output)); - -finish_crtc (data, mode); }
Quoted 2 lines
Quoted 2 lines
igt_require_f(valid_tests, "no valid crtc/connector
combinations found\n");
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 7/7] igt/kms_fbc_crc.c : Add Y-tile tests
Em Sex, 2017-07-14 às 19:25 +0530, Praveen Paneri escreveu:
Quoted 120 lines
Hi Paulo,
Quoted 6 lines · Paulo Zanoni
Em Sex, 2017-04-28 às 20:07 +0530, Praveen Paneri escreveu:
Quoted 2 lines
Now that we have support for Y-tiled buffers, add another iteration of tests for Y-tiled buffers.
Have you tested this on platforms that don't support Y-tiled buffers? I
Unfortunately I haven't...
Quoted 2 lines
don't see a check for that, so I wonder if we'll just fail some assertion or correctly hit some
igt_skip()call I couldn't find....but I will add the check as you have mentioned
Quoted 93 lines
More below.
Quoted 90 lines
Signed-off-by Praveen Paneri <[email protected]>---
tests/kms_fbc_crc.c | 71 +++++++++++++++++++++++++++++--------
----
------------1 file changed, 39 insertions(+), 32 deletions(-)tests/kms_fbc_crc.c +1
-1@@ -318,12 +318,10 @@ static void prepare_crtc(data_t *data) igt_output_set_pipe(output, data->pipe); } -static void create_fbs (data_t *data,bool tiled,struct igt_fb *fbs) +static void create_fbs(data_t *data, uint64_t tiling, struct
igt_fb
*fbs)
{
int rc;
drmModeModeInfo *mode = igt_output_get_mode(data-Quoted 1 line
output);
tests/kms_fbc_crc.c +0
-1- uint64_t tiling = tiled ? LOCAL_I915_FORMAT_MOD_X_TILED:
tests/kms_fbc_crc.c +0
-1- LOCAL_DRM_FORMAT_MOD_NONE;rc = igt_create_color_fb(data->drm_fd,
mode->hdisplay, mode-Quoted 1 line
vdisplay,
DRM_FORMAT_XRGB8888, tiling,
tests/kms_fbc_crc.c +3
-3@@ -344,8 +342,8 @@ static void get_ref_crcs(data_t *data) struct igt_fb fbs[4]; int i; -create_fbs (data, false, &fbs[0 ]); -create_fbs (data, false, &fbs[2 ]); +create_fbs (data,LOCAL_DRM_FORMAT_MOD_NONE , &fbs[0 ]); +create_fbs (data,LOCAL_DRM_FORMAT_MOD_NONE , &fbs[2 ]); fill_mmap_gtt(data, fbs[2].gem_handle, 0xff); fill_mmap_gtt(data, fbs[3].gem_handle, 0xff);@@ -366,7 +364,7 @@ static void get_ref_crcs(data_t *data) igt_remove_fb(data->drm_fd, &fbs[i]); } -static bool prepare_test (data_t *data,enum test_mode test_mode) +static bool prepare_test (data_t *data,enum test_mode test_mode,uint64_t tiling) { igt_display_t *display = &data->display;
igt_output_t*output =data->output;tests/kms_fbc_crc.c +1
-1@@ -374,7 +372,7 @@ static bool prepare_test(data_t *data, enum test_mode test_mode) data->primary = igt_output_get_plane_type(data->output,DRM_PLANE_TYPE_PRIMARY ); -create_fbs (data, true, data->fb); +create_fbs (data, tiling, data->fb);
igt_pipe_crc_free(data->pipe_crc);
data->pipe_crc= NULL;tests/kms_fbc_crc.c +0
-1@@ -484,32 +482,41 @@ static void run_test(data_t *data, enum test_mode mode) reset_display(data); - for_each_pipe_with_valid_output(display, data->pipe,data-
Quoted 1 line
output) {
tests/kms_fbc_crc.c +0
-3-prepare_crtc (data); - - igt_info("Beginning %s on pipe %s, connector%s\n",
tests/kms_fbc_crc.c +0
-6- igt_subtest_name(), - kmstest_pipe_name(data->pipe), - igt_output_name(data->output)); - -if (!prepare_test (data, mode)) { - igt_info("%s on pipe %s, connector %s:SKIPPED\n",
tests/kms_fbc_crc.c +0
-3- igt_subtest_name(), - kmstest_pipe_name(data->pipe), - igt_output_name(data-Quoted 1 line
output));
Quoted 11 lines
tests/kms_fbc_crc.c static void run_test(data_t *data, enum test_mode mode) · line 486
Quoted 3 lines
tests/kms_fbc_crc.c +2
-1-continue ; +for (int tiling =I915_TILING_X ; + tiling <= I915_TILING_Y; tiling++) {What I don't understand is why this part of the code chooses to go with
the tiling constants (I915_TILING_) only to later convert them to modifiers withigt_fb_tiling_to_mod(). If this loop iterated over the
modifiers directly we wouldn't need that. The rest of the code only cares about the modifiers.
Quoted 3 lines
I chose to loop over tiling constants as they are in a simple arithmetic
order. anyhow I will just change that.
Just put the two local_format stuff in an array and iterate over it.
Quoted 7 lines
Also as mentioned above can I just add a check to skip Y-tiling tests
for older platforms?
igt_skip_on(intel_gen(intel_get_drm_devid(drm_fd)) < 9 && tiling == I915_TILING_Y);
You can't do this here because the same subtest tests X tiling.
Perhaps we could make Y tiling be a separate subtest? I'm not a huge fan of single tests that do tons of stuff.
Quoted 100 lines
Quoted 21 lines
Quoted 21 lines
tests/kms_fbc_crc.c +2
-0+for_each_pipe_with_valid_output (display, + data->pipe,data-
Quoted 1 line
output) {
tests/kms_fbc_crc.c +3
-0+prepare_crtc (data); + + igt_info("Beginning %s on pipe %s,connector
"tests/kms_fbc_crc.c +3
-0+"%s, %s-tiled\n" , +igt_subtest_name (), + kmstest_pipe_name(data-Quoted 1 line
pipe),
tests/kms_fbc_crc.c +1
-0+ igt_output_name(data-Quoted 1 line
output),
Quoted 10 lines
Quoted 3 lines
tests/kms_fbc_crc.c +1
-0+ (tiling ==
I915_TILING_X) ?
"x":"y" );This change is not keeping the indentation style, things should be aligned with the parens (although I see they're actually aligned with
the quote, which is also weird). The same can be said for the other twoigt_info()calls in this patch.Will fix it
Quoted 23 lines
Quoted 16 lines
tests/kms_fbc_crc.c +3
-0+ + if (!prepare_test(data, mode, + igt_fb_tiling_to_mod(tilin
g))) {tests/kms_fbc_crc.c +1
-0+ igt_info("%s on pipe %s,connector
%s: SKIPPED\n",tests/kms_fbc_crc.c +1
-0+ igt_subtest_name(),
tests/kms_fbc_crc.c +1
-0+ kmstest_pipe_name(da
ta->pipe),tests/kms_fbc_crc.c +1
-0+ igt_output_name(Quoted 2 lines
data
->output));This one is missing the "%s-tiled" part that was added in the other two
messages.Quoted 4 lines
And we can probably create a "const char
*tiling_name" variable to store the %s part in order to avoid the same ternary operator in the 3
if statements.make sense, will add.
Quoted 38 lines
Quoted 38 lines
tests/kms_fbc_crc.c +11
-0+continue ; + } + + valid_tests++; + +test_crc (data, mode); + + igt_info("%s on pipe %s, connector %s" + "%s-tiled: PASSED\n", + igt_subtest_name(), + kmstest_pipe_name(data-Quoted 1 line
pipe),
tests/kms_fbc_crc.c +1
-0+ igt_output_name(data-Quoted 1 line
output),
tests/kms_fbc_crc.c +1
-0+ (tiling ==
I915_TILING_X) ?
"x":"y" );tests/kms_fbc_crc.c +2
-0+ +finish_crtc (data, mode);}
tests/kms_fbc_crc.c +0
-6- - valid_tests++; - -test_crc (data, mode); - - igt_info("%s on pipe %s, connector %s:PASSED\n",
tests/kms_fbc_crc.c +0
-5- igt_subtest_name(), - kmstest_pipe_name(data->pipe), - igt_output_name(data->output)); - -finish_crtc (data, mode);}
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
igt_require_f(valid_tests, "no valid crtc/connector combinations found\n");
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 7/7] igt/kms_fbc_crc.c : Add Y-tile tests
Quoted 128 lines · Paulo Zanoni
Em Sex, 2017-07-14 às 19:25 +0530, Praveen Paneri escreveu:
Quoted 120 lines
Hi Paulo,
Quoted 6 lines · Paulo Zanoni
Em Sex, 2017-04-28 às 20:07 +0530, Praveen Paneri escreveu:
Quoted 2 lines
Now that we have support for Y-tiled buffers, add another iteration of tests for Y-tiled buffers.
Have you tested this on platforms that don't support Y-tiled buffers? I
Unfortunately I haven't...
Quoted 2 lines
don't see a check for that, so I wonder if we'll just fail some assertion or correctly hit some
igt_skip()call I couldn't find....but I will add the check as you have mentioned
Quoted 93 lines
More below.
Quoted 90 lines
Signed-off-by Praveen Paneri <[email protected]>--- tests/kms_fbc_crc.c | 71 +++++++++++++++++++++++++++++-------- ---- ------------ 1 file changed, 39 insertions(+), 32 deletions(-)tests/kms_fbc_crc.c +1
-1@@ -318,12 +318,10 @@ static void prepare_crtc(data_t *data)igt_output_set_pipe (output, data->pipe); } -static void create_fbs (data_t *data,bool tiled,struct igt_fb *fbs) +static void create_fbs(data_t *data, uint64_t tiling, struct
igt_fb
*fbs)
{tests/kms_fbc_crc.c +0
-0int rc; drmModeModeInfo *mode = igt_output_get_mode(data-Quoted 1 line
output);
tests/kms_fbc_crc.c +0
-1- uint64_t tiling = tiled ? LOCAL_I915_FORMAT_MOD_X_TILED:
tests/kms_fbc_crc.c +0
-1-LOCAL_DRM_FORMAT_MOD_NONE ; rc = igt_create_color_fb(data->drm_fd, mode->hdisplay,mode-
Quoted 1 line
vdisplay,
tests/kms_fbc_crc.c +3
-3DRM_FORMAT_XRGB8888, tiling,@@ -344,8 +342,8 @@ static void get_ref_crcs(data_t *data)struct igt_fb fbs[4 ];int i; -create_fbs (data, false, &fbs[0 ]); -create_fbs (data, false, &fbs[2 ]); +create_fbs (data,LOCAL_DRM_FORMAT_MOD_NONE , &fbs[0 ]); +create_fbs (data,LOCAL_DRM_FORMAT_MOD_NONE , &fbs[2 ]);fill_mmap_gtt (data, fbs[2 ].gem_handle,0xff );fill_mmap_gtt (data, fbs[3 ].gem_handle,0xff );@@ -366,7 +364,7 @@ static void get_ref_crcs(data_t *data)igt_remove_fb (data->drm_fd, &fbs[i]); } -static bool prepare_test (data_t *data,enum test_mode test_mode) +static bool prepare_test (data_t *data,enum test_mode test_mode,uint64_t tiling) {igt_display_t *display = &data->display;tests/kms_fbc_crc.c +1
-1igt_output_t *output = data->output;@@ -374,7 +372,7 @@ static bool prepare_test(data_t *data, enum test_mode test_mode) data->primary = igt_output_get_plane_type(data->output,DRM_PLANE_TYPE_PRIMARY ); -create_fbs (data, true, data->fb); +create_fbs (data, tiling, data->fb);tests/kms_fbc_crc.c +0
-1igt_pipe_crc_free (data->pipe_crc); data->pipe_crc =NULL ;@@ -484,32 +482,41 @@ static void run_test(data_t *data, enum test_mode mode)reset_display (data ); - for_each_pipe_with_valid_output(display, data->pipe,data-
Quoted 1 line
output) {
tests/kms_fbc_crc.c +0
-3-prepare_crtc (data); - - igt_info("Beginning %s on pipe %s, connector%s\n",
tests/kms_fbc_crc.c +0
-6-igt_subtest_name (), -kmstest_pipe_name (data->pipe), - igt_output_name(data->output)); - -if (!prepare_test (data, mode)) { - igt_info("%s on pipe %s, connector %s:SKIPPED\n",
tests/kms_fbc_crc.c +0
-3-igt_subtest_name (), -kmstest_pipe_name (data->pipe), - igt_output_name(data-Quoted 1 line
output));
Quoted 11 lines
tests/kms_fbc_crc.c static void run_test(data_t *data, enum test_mode mode) · line 486
Quoted 3 lines
tests/kms_fbc_crc.c +2
-1-continue ; +for (int tiling =I915_TILING_X ; + tiling <=I915_TILING_Y ; tiling++) {What I don't understand is why this part of the code chooses to go with
the tiling constants (I915_TILING_) only to later convert them to modifiers withigt_fb_tiling_to_mod(). If this loop iterated over the
modifiers directly we wouldn't need that. The rest of the code only cares about the modifiers.Quoted 3 lines
I chose to loop over tiling constants as they are in a simple arithmetic
order. anyhow I will just change that.Just put the two
local_formatstuff in an array and iterate over it.Quoted 1 line
Quoted 8 lines
Quoted 6 lines
Also as mentioned above can I just add a check to skip Y-tiling tests
for older platforms?igt_skip_on(intel_gen(intel_get_drm_devid(drm_fd)) < 9 &&
tiling == I915_TILING_Y);You can't do this here because the same subtest tests X tiling.
Okay! what if I just skip the loop for Y tiling with some message?
Quoted 3 lines
Perhaps we could make Y tiling be a separate subtest? I'm not a huge fan of single tests that do tons of stuff.
Will it be possible in just one subtest. I thought we will have to duplicate all the subtests for Y-tile case? Plz suggest
Thanks,
Praveen
Quoted 101 lines
Quoted 101 lines
Quoted 22 lines
Quoted 22 lines
tests/kms_fbc_crc.c +2
-0+for_each_pipe_with_valid_output (display, + data->pipe,data-
Quoted 1 line
output) {
tests/kms_fbc_crc.c +3
-0+prepare_crtc (data); + + igt_info("Beginning %s on pipe %s,connector
"tests/kms_fbc_crc.c +3
-0+"%s, %s-tiled\n" , +igt_subtest_name (), + kmstest_pipe_name(data-Quoted 1 line
pipe),
tests/kms_fbc_crc.c +1
-0+ igt_output_name(data-Quoted 1 line
output),
Quoted 10 lines
Quoted 3 lines
tests/kms_fbc_crc.c +1
-0+ (tiling ==
I915_TILING_X) ?
"x":"y" );This change is not keeping the indentation style, things should be aligned with the parens (although I see they're actually aligned with
the quote, which is also weird). The same can be said for the other twoigt_info()calls in this patch.Will fix it
Quoted 23 lines
Quoted 16 lines
tests/kms_fbc_crc.c +3
-0+ + if (!prepare_test(data, mode, + igt_fb_tiling_to_mod(tilin
g))) {tests/kms_fbc_crc.c +1
-0+ igt_info("%s on pipe %s,connector
%s: SKIPPED\n",tests/kms_fbc_crc.c +1
-0+ igt_subtest_name(),
tests/kms_fbc_crc.c +1
-0+ kmstest_pipe_name(da
ta->pipe),tests/kms_fbc_crc.c +1
-0+ igt_output_name(Quoted 2 lines
data
->output));This one is missing the "%s-tiled" part that was added in the other two
messages.Quoted 4 lines
And we can probably create a "const char
*tiling_name" variable to store the %s part in order to avoid the same ternary operator in the 3
if statements.make sense, will add.
Quoted 38 lines
Quoted 38 lines
tests/kms_fbc_crc.c +11
-0+continue ; + } + + valid_tests++; + +test_crc (data, mode); + + igt_info("%s on pipe %s, connector %s" + "%s-tiled: PASSED\n", + igt_subtest_name(), + kmstest_pipe_name(data-Quoted 1 line
pipe),
tests/kms_fbc_crc.c +1
-0+ igt_output_name(data-Quoted 1 line
output),
tests/kms_fbc_crc.c +1
-0+ (tiling ==
I915_TILING_X) ?
"x":"y" );tests/kms_fbc_crc.c +2
-6+ +finish_crtc (data, mode); } - - valid_tests++; - -test_crc (data, mode); - - igt_info("%s on pipe %s, connector %s:PASSED\n",
tests/kms_fbc_crc.c +0
-5-igt_subtest_name (), -kmstest_pipe_name (data->pipe), - igt_output_name(data->output)); - -finish_crtc (data, mode); }
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
igt_require_f(valid_tests, "no valid crtc/connector
combinations found\n");
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Em Sex, 2017-04-28 às 20:07 +0530, Praveen Paneri escreveu:
Quoted 4 lines
This series adds Y-tiled buffer creation support into IGT libraries and
goes on to use this capability to add support into FBC tests to use Y-tiled buffers.
The problem I reported before still happens to me. Please fix it before resending.
Quoted 14 lines
Akash Goel (1):
lib/igt_draw: Add Y-tiling support forIGT_DRAW_BLTmethodPaulo Zanoni (1):
tests/kms_draw_crc: add support for Y tilingPraveen Paneri (5):
lib/igt_fb: Let others useigt_get_fb_tile_sizelib/igt_fb: Add helper function fortile_to_modlib/igt_draw: Add Y-tiling support igt/kms_frontbuffer_tracking: Add Y-tiling supportigt/kms_fbc_crc.c: Add Y-tile tests
Quoted 9 lines
lib/igt_draw.c | 165 ++++++++++++++++++++++++++++-
----------
lib/igt_fb.c | 41 +++++++++- lib/igt_fb.h | 4 +- tests/kms_draw_crc.c | 58 ++++++++++---- tests/kms_fbc_crc.c | 71 +++++++++--------tests/kms_frontbuffer_tracking.c| 48 +++++++-----6 files changed, 273 insertions(+), 114 deletions(-)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
HI Paulo,
Quoted 8 lines · Paulo Zanoni
Em Sex, 2017-04-28 às 20:07 +0530, Praveen Paneri escreveu:
Quoted 4 lines
This series adds Y-tiled buffer creation support into IGT libraries and
goes on to use this capability to add support into FBC tests to use Y-tiled buffers.The problem I reported before still happens to me. Please fix it before resending.
I tried reproducing it on SKL. For me the test was just running fine.
I ran it in shell mode on ubuntu running the latest kernel.
Could you plz give some hint to repro it at my end. Thanks,
Praveen
Quoted 24 lines
Quoted 15 lines
Akash Goel (1):
lib/igt_draw: Add Y-tiling support forIGT_DRAW_BLTmethodPaulo Zanoni (1):
tests/kms_draw_crc: add support for Y tilingPraveen Paneri (5):
lib/igt_fb: Let others useigt_get_fb_tile_sizelib/igt_fb: Add helper function fortile_to_modlib/igt_draw: Add Y-tiling support igt/kms_frontbuffer_tracking: Add Y-tiling supportigt/kms_fbc_crc.c: Add Y-tile testsQuoted 9 lines
lib/igt_draw.c | 165 ++++++++++++++++++++++++++++- ---------- lib/igt_fb.c | 41 +++++++++- lib/igt_fb.h | 4 +- tests/kms_draw_crc.c | 58 ++++++++++---- tests/kms_fbc_crc.c | 71 +++++++++-------- tests/kms_frontbuffer_tracking.c | 48 +++++++----- 6 files changed, 273 insertions(+), 114 deletions(-)
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Em Sáb, 2017-04-29 às 08:44 +0530, Praveen Paneri escreveu:
Quoted 18 lines
HI Paulo,
Quoted 11 lines · Paulo Zanoni
Em Sex, 2017-04-28 às 20:07 +0530, Praveen Paneri escreveu:
Quoted 6 lines
This series adds Y-tiled buffer creation support into IGT libraries
and
goes on to use this capability to add support into FBC tests to use
Y-tiled buffers.The problem I reported before still happens to me. Please fix it before
resending.
Quoted 5 lines
I tried reproducing it on SKL. For me the test was just running fine.
I ran it in shell mode on ubuntu running the latest kernel.
Could you plz give some hint to repro it at my end.
How much time did each subtest take to complete? I have tests that should take 1s but take up to 150s with the patch.
Quoted 32 lines
Thanks,
PraveenQuoted 30 lines
Quoted 23 lines
Akash Goel (1):
lib/igt_draw: Add Y-tiling support forIGT_DRAW_BLTmethodPaulo Zanoni (1):
tests/kms_draw_crc: add support for Y tilingPraveen Paneri (5):
lib/igt_fb: Let others useigt_get_fb_tile_sizelib/igt_fb: Add helper function fortile_to_modlib/igt_draw: Add Y-tiling support igt/kms_frontbuffer_tracking: Add Y-tiling supportigt/kms_fbc_crc.c: Add Y-tile testslib/igt_draw.c | 165
++++++++++++++++++++++++++++-
----------
lib/igt_fb.c | 41 +++++++++- lib/igt_fb.h | 4 +- tests/kms_draw_crc.c | 58 ++++++++++---- tests/kms_fbc_crc.c | 71 +++++++++--------tests/kms_frontbuffer_tracking.c| 48 +++++++-----Quoted 2 lines
6 files changed, 273 insertions(+), 114 deletions(-)_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi Paulo,
Quoted 19 lines · Paulo Zanoni
Em Sáb, 2017-04-29 às 08:44 +0530, Praveen Paneri escreveu:
Quoted 18 lines
HI Paulo,
Quoted 11 lines · Paulo Zanoni
Em Sex, 2017-04-28 às 20:07 +0530, Praveen Paneri escreveu:
Quoted 6 lines
This series adds Y-tiled buffer creation support into IGT libraries
and
goes on to use this capability to add support into FBC tests to use
Y-tiled buffers.The problem I reported before still happens to me. Please fix it before
resending.
Quoted 8 lines
Quoted 5 lines
I tried reproducing it on SKL. For me the test was just running fine.
I ran it in shell mode on ubuntu running the latest kernel.
Could you plz give some hint to repro it at my end.
How much time did each subtest take to complete? I have tests that should take 1s but take up to 150s with the patch.
It was not taking 150s for me but some tests were taking around 7-8 secs. I realized that call to igt_get_fb_tile_size() was happening inside a busy loop. I have fixed the issue and I see most of the tests completing within a sec now. I have floated the updated patch and here is the link to new series. Plz review.
https://patchwork.freedesktop.org/series/21467/
Thanks,
Praveen
Quoted 29 lines
Quoted 29 lines
Thanks,
PraveenQuoted 26 lines
Quoted 25 lines
Akash Goel (1):
lib/igt_draw: Add Y-tiling support forIGT_DRAW_BLTmethodPaulo Zanoni (1):
tests/kms_draw_crc: add support for Y tilingPraveen Paneri (5):
lib/igt_fb: Let others useigt_get_fb_tile_sizelib/igt_fb: Add helper function fortile_to_modlib/igt_draw: Add Y-tiling support igt/kms_frontbuffer_tracking: Add Y-tiling supportigt/kms_fbc_crc.c: Add Y-tile testslib/igt_draw.c | 165 ++++++++++++++++++++++++++++- ---------- lib/igt_fb.c | 41 +++++++++- lib/igt_fb.h | 4 +- tests/kms_draw_crc.c | 58 ++++++++++---- tests/kms_fbc_crc.c | 71 +++++++++-------- tests/kms_frontbuffer_tracking.c | 48 +++++++----- 6 files changed, 273 insertions(+), 114 deletions(-)
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx