summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2015-02-19 22:02:15 +0100
committerAlex Deucher <alexander.deucher@amd.com>2015-02-25 22:06:09 +0100
commitdbfb00c3e7e18439f2ebf67fe99bf7a50b5bae1e (patch)
tree602c9b7e94408dcf966b6705df08b9f98f06dc49 /drivers/gpu
parentdrm/radeon: enable SRBM timeout interrupt on EG/NI (diff)
downloadlinux-dbfb00c3e7e18439f2ebf67fe99bf7a50b5bae1e.tar.xz
linux-dbfb00c3e7e18439f2ebf67fe99bf7a50b5bae1e.zip
drm/radeon: fix 1 RB harvest config setup for TN/RL
The logic was reversed from what the hw actually exposed. Fixes graphics corruption in certain harvest configurations. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/radeon/ni.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index ebe68dd8e06a..dab00812abaa 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -1088,12 +1088,12 @@ static void cayman_gpu_init(struct radeon_device *rdev)
if ((rdev->config.cayman.max_backends_per_se == 1) &&
(rdev->flags & RADEON_IS_IGP)) {
- if ((disabled_rb_mask & 3) == 1) {
- /* RB0 disabled, RB1 enabled */
- tmp = 0x11111111;
- } else {
+ if ((disabled_rb_mask & 3) == 2) {
/* RB1 disabled, RB0 enabled */
tmp = 0x00000000;
+ } else {
+ /* RB0 disabled, RB1 enabled */
+ tmp = 0x11111111;
}
} else {
tmp = gb_addr_config & NUM_PIPES_MASK;