From patchwork Mon Oct 24 16:55:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Praveen Paneri X-Patchwork-Id: 9392653 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6AE2460762 for ; Mon, 24 Oct 2016 16:51:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A042291AA for ; Mon, 24 Oct 2016 16:51:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4EA5E291AC; Mon, 24 Oct 2016 16:51:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CFA9A291B1 for ; Mon, 24 Oct 2016 16:51:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 83CD06E55E; Mon, 24 Oct 2016 16:51:44 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4345B6E55E for ; Mon, 24 Oct 2016 16:51:43 +0000 (UTC) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP; 24 Oct 2016 09:51:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,542,1473145200"; d="scan'208";a="23025983" Received: from intel-desktop.iind.intel.com ([10.223.82.55]) by fmsmga006.fm.intel.com with ESMTP; 24 Oct 2016 09:51:41 -0700 From: Praveen Paneri To: intel-gfx@lists.freedesktop.org Date: Mon, 24 Oct 2016 22:25:56 +0530 Message-Id: <1477328158-10817-2-git-send-email-praveen.paneri@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1477328158-10817-1-git-send-email-praveen.paneri@intel.com> References: <1477328158-10817-1-git-send-email-praveen.paneri@intel.com> Cc: Praveen Paneri Subject: [Intel-gfx] [PATCH 2/4] lib/igt_draw: Add Y-tiling support X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This patch adds Y-tiling support for igt_draw_rect function. Change-Id: I139e9773b7df286febe9ffa3dce358df079dac14 Signed-off-by: Praveen Paneri --- lib/igt_draw.c | 148 ++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 110 insertions(+), 38 deletions(-) diff --git a/lib/igt_draw.c b/lib/igt_draw.c index 3afb827..29a725f 100644 --- a/lib/igt_draw.c +++ b/lib/igt_draw.c @@ -137,7 +137,7 @@ 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) + int bpp, int tiling) { int x_tile_size, y_tile_size; int x_tile_n, y_tile_n, x_tile_off, y_tile_off; @@ -146,23 +146,54 @@ static int linear_x_y_to_tiled_pos(int x, int y, uint32_t stride, int swizzle, int tiled_pos, tiles_per_line; 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; - - y_tile_n = y / y_tile_size; - y_tile_off = y % y_tile_size; - - x_tile_n = (x * pixel_size) / x_tile_size; - x_tile_off = (x * pixel_size) % x_tile_size; - - 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; - - tiled_pos = swizzle_addr(tiled_pos, swizzle); + if (tiling == I915_TILING_X ) { + 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; + + y_tile_n = y / y_tile_size; + y_tile_off = y % y_tile_size; + + x_tile_n = (x * pixel_size) / x_tile_size; + x_tile_off = (x * pixel_size) % x_tile_size; + + 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; + + tiled_pos = swizzle_addr(tiled_pos, swizzle); + } else { + int x_oword_n, x_oword_off; + int oword_size; + + /* Y-tile arrangement */ + line_size = stride; + oword_size = 16; + x_tile_size = 128; + y_tile_size = 32; + tile_size = x_tile_size * y_tile_size; + tiles_per_line = line_size / x_tile_size; + + y_tile_n = y / y_tile_size; + y_tile_off = y % y_tile_size; + + x_tile_n = (x * pixel_size) / x_tile_size; + x_tile_off = (x * pixel_size) % x_tile_size; + + tile_n = y_tile_n * tiles_per_line + x_tile_n; + + /* computation inside the tile */ + x_oword_n = x_tile_off / oword_size; + x_oword_off = x_tile_off % oword_size; + tile_off = x_oword_n * y_tile_size * oword_size + + y_tile_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; } @@ -170,7 +201,8 @@ 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) + 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; @@ -181,22 +213,50 @@ static void tiled_pos_to_x_y_linear(int tiled_pos, uint32_t stride, 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; + if (tiling == I915_TILING_X ) { + 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_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_n = tiled_pos / tile_size; - tile_off = tiled_pos % tile_size; + x_tile_n = tile_n % tiles_per_line; + y_tile_n = tile_n / tiles_per_line; + + *x = (x_tile_n * x_tile_size + x_tile_off) / pixel_size; + *y = y_tile_n * y_tile_size + y_tile_off; + } else { + int x_oword_n, x_oword_off; + int oword_size; - y_tile_off = tile_off / x_tile_size; - x_tile_off = tile_off % x_tile_size; + oword_size = 16; + x_tile_size = 128; + y_tile_size = 32; + tile_size = x_tile_size * y_tile_size; + tiles_per_line = line_size / x_tile_size; - x_tile_n = tile_n % tiles_per_line; - y_tile_n = tile_n / tiles_per_line; + tile_n = tiled_pos / tile_size; + tile_off = tiled_pos % tile_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_n = tile_n % tiles_per_line; + y_tile_n = tile_n / tiles_per_line; + + x_oword_n = tile_off / (oword_size * y_tile_size); + x_oword_off = tile_off % oword_size; + + x_tile_off = x_oword_n * oword_size + x_oword_off; + y_tile_off = (tile_off - x_oword_n * oword_size * y_tile_size) + / oword_size; + + *x = (x_tile_n * x_tile_size + x_tile_off) / pixel_size; + *y = y_tile_n * y_tile_size + y_tile_off; + + } } static void set_pixel(void *_ptr, int index, uint32_t color, int bpp) @@ -225,14 +285,15 @@ 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) + 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); + bpp, tiling); set_pixel(ptr, pos, color, bpp); } } @@ -260,7 +321,11 @@ static void draw_rect_mmap_cpu(int fd, struct buf_data *buf, struct rect *rect, break; case I915_TILING_X: draw_rect_ptr_tiled(ptr, buf->stride, swizzle, rect, color, - buf->bpp); + buf->bpp, tiling); + break; + case I915_TILING_Y: + draw_rect_ptr_tiled(ptr, buf->stride, swizzle, rect, color, + buf->bpp, tiling); break; default: igt_assert(false); @@ -310,7 +375,11 @@ static void draw_rect_mmap_wc(int fd, struct buf_data *buf, struct rect *rect, break; case I915_TILING_X: draw_rect_ptr_tiled(ptr, buf->stride, swizzle, rect, color, - buf->bpp); + buf->bpp, tiling); + break; + case I915_TILING_Y: + draw_rect_ptr_tiled(ptr, buf->stride, swizzle, rect, color, + buf->bpp, tiling); break; default: igt_assert(false); @@ -338,7 +407,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; @@ -362,7 +431,7 @@ static void draw_rect_pwrite_tiled(int fd, struct buf_data *buf, 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); + buf->bpp, &x, &y, tiling); if (x >= rect->x && x < rect->x + rect->w && y >= rect->y && y < rect->y + rect->h) { @@ -399,7 +468,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);