From: "Zbigniew Kempczyński" <zbigniew.kempczynski@intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t v25 03/22] lib/intel_bufops: change stride requirements for Grantsdale
Date: Mon, 3 Aug 2020 14:42:54 +0200 [thread overview]
Message-ID: <20200803124313.31162-4-zbigniew.kempczynski@intel.com> (raw)
In-Reply-To: <20200803124313.31162-1-zbigniew.kempczynski@intel.com>
Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
---
lib/intel_bufops.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/intel_bufops.c b/lib/intel_bufops.c
index 649999ba..902d072e 100644
--- a/lib/intel_bufops.c
+++ b/lib/intel_bufops.c
@@ -752,8 +752,7 @@ static void __intel_buf_init(struct buf_ops *bops,
if (bops->intel_gen < 3)
tile_width = 128;
- else if (IS_915GM(devid) || IS_915G(devid) ||
- buf->tiling == I915_TILING_X)
+ else if (IS_915G(devid) || buf->tiling == I915_TILING_X)
tile_width = 512;
else
tile_width = 128;
@@ -1037,11 +1036,13 @@ static bool probe_hw_tiling(struct buf_ops *bops, uint32_t tiling,
{
uint64_t size = 256 * 256;
uint32_t handle, buf_tiling, buf_swizzle, phys_swizzle;
- uint32_t stride;
+ uint32_t devid, stride;
int ret;
bool is_set = false;
- if (tiling == I915_TILING_X)
+ devid = intel_get_drm_devid(bops->fd);
+
+ if (tiling == I915_TILING_X || IS_915G(devid))
stride = 512;
else if (tiling == I915_TILING_Y)
stride = 128;
--
2.26.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2020-08-03 12:43 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-03 12:42 [igt-dev] [PATCH i-g-t v25 00/22] Remove libdrm in rendercopy Zbigniew Kempczyński
2020-08-03 12:42 ` [igt-dev] [PATCH i-g-t v25 01/22] lib/intel_bufops: add mapping on cpu / device Zbigniew Kempczyński
2020-08-03 12:42 ` [igt-dev] [PATCH i-g-t v25 02/22] lib/intel_bufops: change in hw/sw tiling detection Zbigniew Kempczyński
2020-08-03 12:42 ` Zbigniew Kempczyński [this message]
2020-08-03 12:42 ` [igt-dev] [PATCH i-g-t v25 04/22] lib/intel_batchbuffer: add new functions to support rendercopy Zbigniew Kempczyński
2020-08-03 12:42 ` [igt-dev] [PATCH i-g-t v25 05/22] lib/intel_batchbuffer: dump bb to base64 Zbigniew Kempczyński
2020-08-03 12:42 ` [igt-dev] [PATCH i-g-t v25 06/22] lib/intel_batchbuffer: use canonical addresses for 48bit ppgtt Zbigniew Kempczyński
2020-08-03 12:42 ` [igt-dev] [PATCH i-g-t v25 07/22] tests/api_intel_bb: test flags are cleared on bb reset Zbigniew Kempczyński
2020-08-03 12:42 ` [igt-dev] [PATCH i-g-t v25 08/22] tests/gem_caching|partial: adopt to batch flush function cleanup Zbigniew Kempczyński
2020-08-03 12:43 ` [igt-dev] [PATCH i-g-t v25 09/22] lib/rendercopy: remove libdrm dependency Zbigniew Kempczyński
2020-08-03 12:43 ` [igt-dev] [PATCH i-g-t v25 10/22] tests/api_intel_bb: add render tests Zbigniew Kempczyński
2020-08-03 12:43 ` [igt-dev] [PATCH i-g-t v25 11/22] lib/igt_draw: remove libdrm dependency Zbigniew Kempczyński
2020-08-03 12:43 ` [igt-dev] [PATCH i-g-t v25 12/22] lib/igt_fb: Removal of " Zbigniew Kempczyński
2020-08-03 12:43 ` [igt-dev] [PATCH i-g-t v25 13/22] tests/gem|kms: remove libdrm dependency (batch 1) Zbigniew Kempczyński
2020-08-03 12:43 ` [igt-dev] [PATCH i-g-t v25 14/22] tests/gem|kms: remove libdrm dependency (batch 2) Zbigniew Kempczyński
2020-08-03 12:43 ` [igt-dev] [PATCH i-g-t v25 15/22] tools/intel_residency: adopt intel_residency to use bufops Zbigniew Kempczyński
2020-08-03 12:43 ` [igt-dev] [PATCH i-g-t v25 16/22] tests/perf: remove libdrm dependency for rendercopy Zbigniew Kempczyński
2020-08-03 12:43 ` [igt-dev] [PATCH i-g-t v25 17/22] fix: lib/intel_bufops: add 64bit bpp Zbigniew Kempczyński
2020-08-03 12:43 ` [igt-dev] [PATCH i-g-t v25 18/22] tests/kms_psr: trying to fix blt Zbigniew Kempczyński
2020-08-03 12:43 ` [igt-dev] [PATCH i-g-t v25 19/22] tests/api_intel_bb: just fail in BAT Zbigniew Kempczyński
2020-08-03 12:43 ` [igt-dev] [PATCH i-g-t v25 20/22] tests/perf: debug stuff Zbigniew Kempczyński
2020-08-03 12:43 ` [igt-dev] [PATCH i-g-t v25 21/22] tests/perf: use coherent mapping on non-llc platforms Zbigniew Kempczyński
2020-08-03 12:43 ` [igt-dev] [PATCH i-g-t v25 22/22] HAX: run in BAT and fail to avoid full run Zbigniew Kempczyński
2020-08-03 13:08 ` [igt-dev] ✓ Fi.CI.BAT: success for Remove libdrm in rendercopy (rev24) Patchwork
2020-08-03 16:30 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200803124313.31162-4-zbigniew.kempczynski@intel.com \
--to=zbigniew.kempczynski@intel.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox