diff options
author | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2016-08-21 14:06:32 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-08-23 13:48:04 -0400 |
commit | 5c0eb98e484067c3492352bb7f504653302cf5f2 (patch) | |
tree | dc1468410288b0c6da6002fb7161268ffe406b47 /drivers/gpu/drm/amd/amdgpu | |
parent | 5da25cd5754b97088f2f33bdc811f379b5b3e9ae (diff) |
drm/amdgpu/gmc7: remove dead code (v2)
In an if block for (running == 0) running cannot be non-zero.
v2: agd: remove unused variable
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c index bca50e590fdb..aa0c4b964621 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | |||
@@ -183,7 +183,7 @@ static int gmc_v7_0_mc_load_microcode(struct amdgpu_device *adev) | |||
183 | const struct mc_firmware_header_v1_0 *hdr; | 183 | const struct mc_firmware_header_v1_0 *hdr; |
184 | const __le32 *fw_data = NULL; | 184 | const __le32 *fw_data = NULL; |
185 | const __le32 *io_mc_regs = NULL; | 185 | const __le32 *io_mc_regs = NULL; |
186 | u32 running, blackout = 0; | 186 | u32 running; |
187 | int i, ucode_size, regs_size; | 187 | int i, ucode_size, regs_size; |
188 | 188 | ||
189 | if (!adev->mc.fw) | 189 | if (!adev->mc.fw) |
@@ -203,11 +203,6 @@ static int gmc_v7_0_mc_load_microcode(struct amdgpu_device *adev) | |||
203 | running = REG_GET_FIELD(RREG32(mmMC_SEQ_SUP_CNTL), MC_SEQ_SUP_CNTL, RUN); | 203 | running = REG_GET_FIELD(RREG32(mmMC_SEQ_SUP_CNTL), MC_SEQ_SUP_CNTL, RUN); |
204 | 204 | ||
205 | if (running == 0) { | 205 | if (running == 0) { |
206 | if (running) { | ||
207 | blackout = RREG32(mmMC_SHARED_BLACKOUT_CNTL); | ||
208 | WREG32(mmMC_SHARED_BLACKOUT_CNTL, blackout | 1); | ||
209 | } | ||
210 | |||
211 | /* reset the engine and set to writable */ | 206 | /* reset the engine and set to writable */ |
212 | WREG32(mmMC_SEQ_SUP_CNTL, 0x00000008); | 207 | WREG32(mmMC_SEQ_SUP_CNTL, 0x00000008); |
213 | WREG32(mmMC_SEQ_SUP_CNTL, 0x00000010); | 208 | WREG32(mmMC_SEQ_SUP_CNTL, 0x00000010); |
@@ -239,9 +234,6 @@ static int gmc_v7_0_mc_load_microcode(struct amdgpu_device *adev) | |||
239 | break; | 234 | break; |
240 | udelay(1); | 235 | udelay(1); |
241 | } | 236 | } |
242 | |||
243 | if (running) | ||
244 | WREG32(mmMC_SHARED_BLACKOUT_CNTL, blackout); | ||
245 | } | 237 | } |
246 | 238 | ||
247 | return 0; | 239 | return 0; |