aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2015-07-10 17:05:31 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-07-16 12:39:41 -0400
commit4f2d3ad6863ad5bc361c704511cd8888723085e8 (patch)
tree5224302eeb94715f9a9b1f0b3a2e9c239c1c7b22
parentdrm/amdgpu: set proper index/data pair for smc regs on CZ (v2) (diff)
downloadlinux-dev-4f2d3ad6863ad5bc361c704511cd8888723085e8.tar.xz
linux-dev-4f2d3ad6863ad5bc361c704511cd8888723085e8.zip
drm/amdgpu: remove bogus check in gfx8 rb setup
Always respect the harvest configuration as is. Acked-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index 7b683fb2173c..1c7c992dea37 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -1813,10 +1813,7 @@ static u32 gfx_v8_0_get_rb_disabled(struct amdgpu_device *adev,
u32 data, mask;
data = RREG32(mmCC_RB_BACKEND_DISABLE);
- if (data & 1)
- data &= CC_RB_BACKEND_DISABLE__BACKEND_DISABLE_MASK;
- else
- data = 0;
+ data &= CC_RB_BACKEND_DISABLE__BACKEND_DISABLE_MASK;
data |= RREG32(mmGC_USER_RB_BACKEND_DISABLE);