summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Kempczyński <zbigniew.kempczynski@intel.com>2020-09-11 10:07:20 +0200
committerChris Wilson <chris@chris-wilson.co.uk>2020-09-16 14:15:07 +0100
commit3fb063259aa915c7695c469c5b5e10248f3b3392 (patch)
tree91eb4331ebcba424faf5a5f2511480d8e0db6b2a
parenta6344df6cdbd2e206ef1f1d2f61a490915fa25d9 (diff)
lib/intel_bufops: change stride requirements for Grantsdale
Grantsdale requires 512 stride on Y tiling. v2: Remove redundant code for getting the stride Fix using not initialized buf->tiling field (reported by Dominik) Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> Cc: Dominik Grzegorzek <dominik.grzegorzek@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--lib/intel_bufops.c33
1 files changed, 15 insertions, 18 deletions
diff --git a/lib/intel_bufops.c b/lib/intel_bufops.c
index d1a4cf38..4373ca4f 100644
--- a/lib/intel_bufops.c
+++ b/lib/intel_bufops.c
@@ -142,6 +142,16 @@ static inline bool is_tiling_supported(struct buf_ops *bops, uint32_t tiling)
return bops->supported_tiles & TILE_DEF(tiling);
}
+static uint32_t get_stride(uint32_t devid, uint32_t tiling)
+{
+ uint32_t stride = 128;
+
+ if (IS_915G(devid) || IS_915GM(devid) || tiling == I915_TILING_X)
+ stride = 512;
+
+ return stride;
+}
+
static int __gem_get_tiling(int fd, struct drm_i915_gem_get_tiling *arg)
{
int err;
@@ -747,17 +757,9 @@ static void __intel_buf_init(struct buf_ops *bops,
size = buf->ccs[0].offset + aux_width * aux_height;
} else {
- if (buf->tiling) {
+ if (tiling) {
devid = intel_get_drm_devid(bops->fd);
-
- if (bops->intel_gen < 3)
- tile_width = 128;
- else if (IS_915GM(devid) || IS_915G(devid) ||
- buf->tiling == I915_TILING_X)
- tile_width = 512;
- else
- tile_width = 128;
-
+ tile_width = get_stride(devid, tiling);
buf->surface[0].stride = ALIGN(width * (bpp / 8), tile_width);
} else {
buf->surface[0].stride = ALIGN(width * (bpp / 8), alignment ?: 1);
@@ -1049,17 +1051,12 @@ 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)
- stride = 512;
- else if (tiling == I915_TILING_Y)
- stride = 128;
- else
- return false;
-
+ devid = intel_get_drm_devid(bops->fd);
+ stride = get_stride(devid, tiling);
handle = gem_create(bops->fd, size);
/* Single shot, if no fences are available we fail immediately */