projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7fe2857
)
drm/amdgpu/dce6: Set MASTER_UPDATE_MODE to 0 in resume_mc_access as well
author
Michel Dänzer
<
[email protected]
>
Tue, 6 Dec 2016 09:33:03 +0000
(18:33 +0900)
committer
Alex Deucher
<
[email protected]
>
Thu, 8 Dec 2016 19:17:12 +0000
(14:17 -0500)
Looks like this was missed when dce_v6_0.c was added.
Fixes: e2cdf640cbb5 ("drm/amdgpu: add display controller implementation for si v10")
Reviewed-by: Christian König <
[email protected]
>
Reviewed-by: Alex Deucher <
[email protected]
>
Signed-off-by: Michel Dänzer <
[email protected]
>
Signed-off-by: Alex Deucher <
[email protected]
>
Cc:
[email protected]
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
index 18cb295c0f38b21a4d1218b54b7a3c645435a19a..e564442b6393f82520aad6e2f47f99e23f7c68bc 100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
+++ b/
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
@@
-460,9
+460,8
@@
static void dce_v6_0_resume_mc_access(struct amdgpu_device *adev,
for (i = 0; i < adev->mode_info.num_crtc; i++) {
if (save->crtc_enabled[i]) {
tmp = RREG32(mmMASTER_UPDATE_MODE + crtc_offsets[i]);
- if ((tmp & 0x7) !=
3
) {
+ if ((tmp & 0x7) !=
0
) {
tmp &= ~0x7;
- tmp |= 0x3;
WREG32(mmMASTER_UPDATE_MODE + crtc_offsets[i], tmp);
}
tmp = RREG32(mmGRPH_UPDATE + crtc_offsets[i]);