summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-05-19 14:14:41 +1000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-06-03 09:32:40 +0900
commit5e9b0976b345e6ba50bcfb663db3d6fc37a07727 (patch)
tree8abfb932c26b442f99e9427064879fe5684d900f
parent960f84f94493758bb0ffa4d1ddea341db573bfe7 (diff)
downloadlinux-stable-5e9b0976b345e6ba50bcfb663db3d6fc37a07727.tar.gz
linux-stable-5e9b0976b345e6ba50bcfb663db3d6fc37a07727.tar.bz2
linux-stable-5e9b0976b345e6ba50bcfb663db3d6fc37a07727.zip
drm/radeon/kms: fix tile_config value reported to userspace on cayman.
commit cde5083b051e9c66c99a8764aefbc13349e7730d upstream. cayman is reporting the wrong tile config value to userspace, this causes piglit mipmap generation tests to fail. Reviewed-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/gpu/drm/radeon/ni.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index 99d33b18ef85..b205ba1cdd8f 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -829,7 +829,7 @@ static void cayman_gpu_init(struct radeon_device *rdev)
rdev->config.cayman.tile_config |=
((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) << 4;
rdev->config.cayman.tile_config |=
- (gb_addr_config & PIPE_INTERLEAVE_SIZE_MASK) >> PIPE_INTERLEAVE_SIZE_SHIFT;
+ ((gb_addr_config & PIPE_INTERLEAVE_SIZE_MASK) >> PIPE_INTERLEAVE_SIZE_SHIFT) << 8;
rdev->config.cayman.tile_config |=
((gb_addr_config & ROW_SIZE_MASK) >> ROW_SIZE_SHIFT) << 12;