diff options
author | James Zhu <James.Zhu@amd.com> | 2018-10-02 12:56:32 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-10-09 18:07:33 -0400 |
commit | b17c524922d65f3ce527277a030d505da3c7b754 (patch) | |
tree | d62575fba2e70f9bfc91ba1e6166631f5d1a49f4 /drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | |
parent | 2dc4aa523b538f55e38bd4c7b6d704162b5728ac (diff) |
drm/amdgpu/vcn:Replace value with defined macro
Replace value with defined macro to make
code more readable
Signed-off-by: James Zhu <James.Zhu@amd.com>
Acked-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c index 12a60ecd44b3..a75745904b81 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | |||
@@ -309,14 +309,17 @@ static int amdgpu_vcn_pause_dpg_mode(struct amdgpu_device *adev, | |||
309 | /* Restore */ | 309 | /* Restore */ |
310 | ring = &adev->vcn.ring_jpeg; | 310 | ring = &adev->vcn.ring_jpeg; |
311 | WREG32_SOC15(UVD, 0, mmUVD_LMI_JRBC_RB_VMID, 0); | 311 | WREG32_SOC15(UVD, 0, mmUVD_LMI_JRBC_RB_VMID, 0); |
312 | WREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_CNTL, 0x00000001L | 0x00000002L); | 312 | WREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_CNTL, |
313 | UVD_JRBC_RB_CNTL__RB_NO_FETCH_MASK | | ||
314 | UVD_JRBC_RB_CNTL__RB_RPTR_WR_EN_MASK); | ||
313 | WREG32_SOC15(UVD, 0, mmUVD_LMI_JRBC_RB_64BIT_BAR_LOW, | 315 | WREG32_SOC15(UVD, 0, mmUVD_LMI_JRBC_RB_64BIT_BAR_LOW, |
314 | lower_32_bits(ring->gpu_addr)); | 316 | lower_32_bits(ring->gpu_addr)); |
315 | WREG32_SOC15(UVD, 0, mmUVD_LMI_JRBC_RB_64BIT_BAR_HIGH, | 317 | WREG32_SOC15(UVD, 0, mmUVD_LMI_JRBC_RB_64BIT_BAR_HIGH, |
316 | upper_32_bits(ring->gpu_addr)); | 318 | upper_32_bits(ring->gpu_addr)); |
317 | WREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_RPTR, ring->wptr); | 319 | WREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_RPTR, ring->wptr); |
318 | WREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_WPTR, ring->wptr); | 320 | WREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_WPTR, ring->wptr); |
319 | WREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_CNTL, 0x00000002L); | 321 | WREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_CNTL, |
322 | UVD_JRBC_RB_CNTL__RB_RPTR_WR_EN_MASK); | ||
320 | 323 | ||
321 | ring = &adev->vcn.ring_dec; | 324 | ring = &adev->vcn.ring_dec; |
322 | WREG32_SOC15(UVD, 0, mmUVD_RBC_RB_WPTR, | 325 | WREG32_SOC15(UVD, 0, mmUVD_RBC_RB_WPTR, |