diff options
| author | Alex Deucher | 2017-04-13 20:35:02 +0200 |
|---|---|---|
| committer | Alex Deucher | 2017-05-24 23:39:57 +0200 |
| commit | 6a124e675aa4e0b3cc6f96aca8fe2b7fd3c00ae2 (patch) | |
| tree | 98da3e1b8a6d48e1e3fa2c2fde8caa1a1a214c0c /drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | |
| parent | drm/amdgpu: set cpg doorbell for fiji and polaris. (diff) | |
| download | kernel-qcow2-linux-6a124e675aa4e0b3cc6f96aca8fe2b7fd3c00ae2.tar.gz kernel-qcow2-linux-6a124e675aa4e0b3cc6f96aca8fe2b7fd3c00ae2.tar.xz kernel-qcow2-linux-6a124e675aa4e0b3cc6f96aca8fe2b7fd3c00ae2.zip | |
drm/amdgpu/gfx8: move CP_PQ_STATUS after doorbell range setting (v2)
I'm not sure if the order matters, but it seems like it makes
more sense to set this after the range is programmed.
v2: rebase (Alex)
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c index a9cc3d79845b..8a9202d50bb8 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c @@ -4961,9 +4961,6 @@ static int gfx_v8_0_kiq_init_register(struct amdgpu_ring *ring) /* activate the queue */ WREG32(mmCP_HQD_ACTIVE, mqd->cp_hqd_active); - if (ring->use_doorbell) - WREG32_FIELD(CP_PQ_STATUS, DOORBELL_ENABLE, 1); - return 0; } @@ -5040,6 +5037,8 @@ static void gfx_v8_0_set_mec_doorbell_range(struct amdgpu_device *adev) WREG32(mmCP_MEC_DOORBELL_RANGE_LOWER, AMDGPU_DOORBELL_KIQ << 2); WREG32(mmCP_MEC_DOORBELL_RANGE_UPPER, AMDGPU_DOORBELL_MEC_RING7 << 2); } + /* enable doorbells */ + WREG32_FIELD(CP_PQ_STATUS, DOORBELL_ENABLE, 1); } static int gfx_v8_0_kiq_resume(struct amdgpu_device *adev) |