diff options
| author | Dave Airlie <[email protected]> | 2020-03-20 12:48:10 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2020-03-20 12:48:17 +1000 |
| commit | 362b86a3d337f6056e8c0692b15bc3c9d49306f5 (patch) | |
| tree | 1a743c583da3efcc8d0544a4b51ba9af74257296 /drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | |
| parent | 0f08b3156d28e95333556ef8d6183982a68501f7 (diff) | |
| parent | eb916a5a93a64c182b0a8f43886aa6bb4c3e52b0 (diff) | |
Merge tag 'amd-drm-fixes-5.6-2020-03-19' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
amd-drm-fixes-5.6-2020-03-19:
amdgpu:
- Pageflip fix
- VCN clockgating fixes
- GPR debugfs fix for umr
- GPU reset fix
- eDP fix for MBP
- DCN2.x fix
Signed-off-by: Dave Airlie <[email protected]>
From: Alex Deucher <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c index c6d046df4b70..c04c2078a7c1 100644 --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c @@ -477,7 +477,7 @@ static int jpeg_v2_5_set_clockgating_state(void *handle, continue; if (enable) { - if (jpeg_v2_5_is_idle(handle)) + if (!jpeg_v2_5_is_idle(handle)) return -EBUSY; jpeg_v2_5_enable_clock_gating(adev, i); } else { |