diff options
| author | Chris Wilson | 2018-07-07 12:04:05 +0200 |
|---|---|---|
| committer | Chris Wilson | 2018-07-09 12:02:36 +0200 |
| commit | e147913247e3a7ea98e72e8537336bcea06c2405 (patch) | |
| tree | 9353ea5226af662b3d91a0bdb54ffafa0f5832d1 /drivers/gpu/drm/i915/selftests | |
| parent | drm/i915: Replace nested subclassing with explicit subclasses (diff) | |
| download | kernel-qcow2-linux-e147913247e3a7ea98e72e8537336bcea06c2405.tar.gz kernel-qcow2-linux-e147913247e3a7ea98e72e8537336bcea06c2405.tar.xz kernel-qcow2-linux-e147913247e3a7ea98e72e8537336bcea06c2405.zip | |
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
Diffstat (limited to 'drivers/gpu/drm/i915/selftests')
| -rw-r--r-- | drivers/gpu/drm/i915/selftests/i915_gem_object.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_object.c b/drivers/gpu/drm/i915/selftests/i915_gem_object.c index 25c2b2d433bd..f4a5099c75b5 100644 --- 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; |