summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-05-19 14:14:41 +1000
committerDave Airlie <airlied@gmail.com>2011-05-22 20:28:10 +1000
commitcde5083b051e9c66c99a8764aefbc13349e7730d (patch)
tree8aa0c305bf6a55817ac5c6f0ed9135329feab07d /drivers/gpu/drm
parentc289cff10a265ec4afe4396425297ff979a840b5 (diff)
downloadblackbird-op-linux-cde5083b051e9c66c99a8764aefbc13349e7730d.tar.gz
blackbird-op-linux-cde5083b051e9c66c99a8764aefbc13349e7730d.zip
drm/radeon/kms: fix tile_config value reported to userspace on cayman.
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> cc: stable@kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-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 4e30e9ebd17c..a0cc7a5ff031 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;
OpenPOWER on IntegriCloud