aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom St Denis <tom.stdenis@amd.com>2017-04-05 08:51:02 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-04-06 13:27:22 -0400
commit9da2c6526944a0de6a1449a977e58af88fb619ea (patch)
tree8ee9cf3067e74dcf4ae342072fbb9ae83e026bb5
parent8dd553e1568ea6fdc69b62743226670728fc25a7 (diff)
drm/amd/amdgpu: cleanup gfx_v9_0_set_gfx_eop_interrupt_state()
Use new WREG32_FIELD15 macro. Signed-off-by: Tom St Denis <tom.stdenis@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index a73fbe948b82..61098f0b3850 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -3376,21 +3376,12 @@ static void gfx_v9_0_ring_emit_wreg(struct amdgpu_ring *ring, uint32_t reg,
3376static void gfx_v9_0_set_gfx_eop_interrupt_state(struct amdgpu_device *adev, 3376static void gfx_v9_0_set_gfx_eop_interrupt_state(struct amdgpu_device *adev,
3377 enum amdgpu_interrupt_state state) 3377 enum amdgpu_interrupt_state state)
3378{ 3378{
3379 u32 cp_int_cntl;
3380
3381 switch (state) { 3379 switch (state) {
3382 case AMDGPU_IRQ_STATE_DISABLE: 3380 case AMDGPU_IRQ_STATE_DISABLE:
3383 cp_int_cntl = RREG32(SOC15_REG_OFFSET(GC, 0, mmCP_INT_CNTL_RING0));
3384 cp_int_cntl = REG_SET_FIELD(cp_int_cntl, CP_INT_CNTL_RING0,
3385 TIME_STAMP_INT_ENABLE, 0);
3386 WREG32(SOC15_REG_OFFSET(GC, 0, mmCP_INT_CNTL_RING0), cp_int_cntl);
3387 break;
3388 case AMDGPU_IRQ_STATE_ENABLE: 3381 case AMDGPU_IRQ_STATE_ENABLE:
3389 cp_int_cntl = RREG32(SOC15_REG_OFFSET(GC, 0, mmCP_INT_CNTL_RING0)); 3382 WREG32_FIELD15(GC, 0, CP_INT_CNTL_RING0,
3390 cp_int_cntl = 3383 TIME_STAMP_INT_ENABLE,
3391 REG_SET_FIELD(cp_int_cntl, CP_INT_CNTL_RING0, 3384 state == AMDGPU_IRQ_STATE_ENABLE ? 1 : 0);
3392 TIME_STAMP_INT_ENABLE, 1);
3393 WREG32(SOC15_REG_OFFSET(GC, 0, mmCP_INT_CNTL_RING0), cp_int_cntl);
3394 break; 3385 break;
3395 default: 3386 default:
3396 break; 3387 break;