aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd
diff options
context:
space:
mode:
authorTom St Denis <tom.stdenis@amd.com>2017-04-04 09:43:18 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-04-06 13:26:49 -0400
commit699d12b755835b7f22f5524855cf7cff3427bd9c (patch)
treedca0917918ae18caca346a1af0e2fc6690bd6cf0 /drivers/gpu/drm/amd
parent0ac642c5b541f4812e28156abfd0f2a1454cd773 (diff)
drm/amd/amdgpu: de-numberify HQD_ACTIVE check.
Signed-off-by: Tom St Denis <tom.stdenis@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index 8860dd5c965d..fcd441c20e49 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -4832,10 +4832,10 @@ static int gfx_v8_0_kiq_init_register(struct amdgpu_ring *ring)
4832 WREG32(mmCP_HQD_PQ_DOORBELL_CONTROL, mqd->cp_hqd_pq_doorbell_control); 4832 WREG32(mmCP_HQD_PQ_DOORBELL_CONTROL, mqd->cp_hqd_pq_doorbell_control);
4833 4833
4834 /* disable the queue if it's active */ 4834 /* disable the queue if it's active */
4835 if (RREG32(mmCP_HQD_ACTIVE) & 1) { 4835 if (RREG32(mmCP_HQD_ACTIVE) & CP_HQD_ACTIVE__ACTIVE_MASK) {
4836 WREG32(mmCP_HQD_DEQUEUE_REQUEST, 1); 4836 WREG32(mmCP_HQD_DEQUEUE_REQUEST, 1);
4837 for (j = 0; j < adev->usec_timeout; j++) { 4837 for (j = 0; j < adev->usec_timeout; j++) {
4838 if (!(RREG32(mmCP_HQD_ACTIVE) & 1)) 4838 if (!(RREG32(mmCP_HQD_ACTIVE) & CP_HQD_ACTIVE__ACTIVE_MASK))
4839 break; 4839 break;
4840 udelay(1); 4840 udelay(1);
4841 } 4841 }