diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2015-02-19 16:02:15 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-02-25 16:06:09 -0500 |
commit | dbfb00c3e7e18439f2ebf67fe99bf7a50b5bae1e (patch) | |
tree | 602c9b7e94408dcf966b6705df08b9f98f06dc49 | |
parent | acc1522a54a3ff4dc250b6e94c55c53c5240e234 (diff) |
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
-rw-r--r-- | drivers/gpu/drm/radeon/ni.c | 8 |
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) | |||
1088 | 1088 | ||
1089 | if ((rdev->config.cayman.max_backends_per_se == 1) && | 1089 | if ((rdev->config.cayman.max_backends_per_se == 1) && |
1090 | (rdev->flags & RADEON_IS_IGP)) { | 1090 | (rdev->flags & RADEON_IS_IGP)) { |
1091 | if ((disabled_rb_mask & 3) == 1) { | 1091 | if ((disabled_rb_mask & 3) == 2) { |
1092 | /* RB0 disabled, RB1 enabled */ | ||
1093 | tmp = 0x11111111; | ||
1094 | } else { | ||
1095 | /* RB1 disabled, RB0 enabled */ | 1092 | /* RB1 disabled, RB0 enabled */ |
1096 | tmp = 0x00000000; | 1093 | tmp = 0x00000000; |
1094 | } else { | ||
1095 | /* RB0 disabled, RB1 enabled */ | ||
1096 | tmp = 0x11111111; | ||
1097 | } | 1097 | } |
1098 | } else { | 1098 | } else { |
1099 | tmp = gb_addr_config & NUM_PIPES_MASK; | 1099 | tmp = gb_addr_config & NUM_PIPES_MASK; |