projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'sunxi-fixes-for-4.3' of https://git.kernel.org/pub/scm/linux/kernel/git...
[linux-drm-fsl-dcu.git]
/
drivers
/
gpu
/
drm
/
amd
/
amdgpu
/
uvd_v4_2.c
diff --git
a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
index 5fac5da694f0d12a1bb415d2a5f557cb25461c43..ed50dd725788df2e766650868f1782b49dec2cdd 100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
+++ b/
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
@@
-224,11
+224,11
@@
static int uvd_v4_2_suspend(void *handle)
int r;
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
- r =
uvd_v4_2_hw_fini
(adev);
+ r =
amdgpu_uvd_suspend
(adev);
if (r)
return r;
- r =
amdgpu_uvd_suspend
(adev);
+ r =
uvd_v4_2_hw_fini
(adev);
if (r)
return r;