drm/i915/selftests: Magic numbers for old Y-tiling

i915g has a slightly different tiling layout, and so requires a
different reference swizzle pattern.

Testcase: igt/drv_selftests/live_objects #gdg
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180707100405.817-1-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_object.c b/drivers/gpu/drm/i915/selftests/i915_gem_object.c
index 25c2b2d433bdb0e89726bcce7087fa63f83154fa..f4a5099c75b5f1e9df40412f2d27436192846c59 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/i915_gem_object.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem_object.c
@@ -169,9 +169,16 @@ static u64 tiled_offset(const struct tile *tile, u64 v)
                v += y * tile->width;
                v += div64_u64_rem(x, tile->width, &x) << tile->size;
                v += x;
-       } else {
+       } else if (tile->width == 128) {
                const unsigned int ytile_span = 16;
-               const unsigned int ytile_height = 32 * ytile_span;
+               const unsigned int ytile_height = 512;
+
+               v += y * ytile_span;
+               v += div64_u64_rem(x, ytile_span, &x) * ytile_height;
+               v += x;
+       } else {
+               const unsigned int ytile_span = 32;
+               const unsigned int ytile_height = 256;
 
                v += y * ytile_span;
                v += div64_u64_rem(x, ytile_span, &x) * ytile_height;