diff options
| author |   Dave Airlie <airlied@redhat.com> | 2020-02-20 10:46:17 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-02-20 10:46:17 +1000 |
| commit | 99edb18b86d9c37c98f182d45c0ae79070e70ac0 (patch) | |
| tree | 8a000eea91244fcd2c0cbad4259660c79f9df101 /drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | |
| parent | Linux 5.6-rc2 (diff) | |
| parent | drm/amdgpu/display: clean up hdcp workqueue handling (diff) | |
| download | wireguard-linux-99edb18b86d9c37c98f182d45c0ae79070e70ac0.tar.xz wireguard-linux-99edb18b86d9c37c98f182d45c0ae79070e70ac0.zip | |
Merge tag 'amd-drm-fixes-5.6-2020-02-19' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
amd-drm-fixes-5.6-2020-02-19:
amdgpu:
- HDCP fixes
- xclk fix for raven
- GFXOFF fixes
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200219173954.3847-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c index 1785fdad6ecb..22bbb36c768e 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c @@ -3923,11 +3923,13 @@ static uint64_t gfx_v10_0_get_gpu_clock_counter(struct amdgpu_device *adev) { uint64_t clock; + amdgpu_gfx_off_ctrl(adev, false); mutex_lock(&adev->gfx.gpu_clock_mutex); WREG32_SOC15(GC, 0, mmRLC_CAPTURE_GPU_CLOCK_COUNT, 1); clock = (uint64_t)RREG32_SOC15(GC, 0, mmRLC_GPU_CLOCK_COUNT_LSB) | ((uint64_t)RREG32_SOC15(GC, 0, mmRLC_GPU_CLOCK_COUNT_MSB) << 32ULL); mutex_unlock(&adev->gfx.gpu_clock_mutex); + amdgpu_gfx_off_ctrl(adev, true); return clock; } |