Skip to contentSkip to conversation

drm/amdgpu/dce6: Set MASTER_UPDATE_MODE to 0 in resume_mc_access as well

PATCH Applied Michel Dänzer 4 participants 4 messages Dec 6, 2016 – Dec 8, 2016 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu/dce6: Set MASTER_UPDATE_MODE to 0 in resume_mc_access as well

From: Michel Dänzer <[email protected]>

Looks like this was missed when dce_v6_0.c was added.

Fixes e2cdf640cbb5 ("drm/amdgpu: add display controller implementation for si v10")
---
 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +1 -2
index 03c8529a8e02..c81ae9c4e4b8 100644
@@ -456,9 +456,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(EVERGREEN_MASTER_UPDATE_MODE + crtc_offsets[i]);
-			if ((tmp & 0x7) != 3) {
+			if ((tmp & 0x7) != 0) {
 				tmp &= ~0x7;
-				tmp |= 0x3;
 				WREG32(EVERGREEN_MASTER_UPDATE_MODE + crtc_offsets[i], tmp);
 			}
 			tmp = RREG32(EVERGREEN_GRPH_UPDATE + crtc_offsets[i]);
Signature · 6 lines
2.11.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 20161206093303.21237-1-michel-otUistvHUpPR7s880joybQ@public.gmane.org

Reviewed-by
#2 lore raw

Am 06.12.2016 um 10:33 schrieb Michel Dänzer:

Quoted 6 lines

From: Michel Dänzer <[email protected]>

Looks like this was missed when dce_v6_0.c was added.

Fixes e2cdf640cbb5 ("drm/amdgpu: add display controller implementation for si v10")
Quoted 9 lines
---
  drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +0 -0
index 03c8529a8e02..c81ae9c4e4b8 100644

drivers/gpu/drm/amd/amdgpu/dce_v6_0.c static void dce_v6_0_resume_mc_access(struct amdgpu_device *adev, · line 463

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +1 -2
@@ -456,9 +456,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(EVERGREEN_MASTER_UPDATE_MODE + crtc_offsets[i]);
-			if ((tmp & 0x7) != 3) {
+			if ((tmp & 0x7) != 0) {
  				tmp &= ~0x7;
-				tmp |= 0x3;
  				WREG32(EVERGREEN_MASTER_UPDATE_MODE + crtc_offsets[i], tmp);
  			}
  			tmp = RREG32(EVERGREEN_GRPH_UPDATE + crtc_offsets[i]);

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reviewed-by Alex Deucher
#3 lore raw
In reply to a message not in the archive
Quoted 8 lines

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Michel Dänzer
Sent: Tuesday, December 06, 2016 4:33 AM
To: [email protected]
Subject: [PATCH] drm/amdgpu/dce6: Set MASTER_UPDATE_MODE to 0 in resume_mc_access as well

Quoted 7 lines

From: Michel Dänzer <[email protected]>

Looks like this was missed when dce_v6_0.c was added.

Fixes e2cdf640cbb5 ("drm/amdgpu: add display controller implementation

for si v10")

Quoted 28 lines
---
 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +1 -2
index 03c8529a8e02..c81ae9c4e4b8 100644
@@ -456,9 +456,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(EVERGREEN_MASTER_UPDATE_MODE + crtc_offsets[i]);
-			if ((tmp & 0x7) != 3) {
+			if ((tmp & 0x7) != 0) {
 				tmp &= ~0x7;
-				tmp |= 0x3;
 

WREG32(EVERGREEN_MASTER_UPDATE_MODE + crtc_offsets[i],
tmp);

drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +0 -0
 			}
 			tmp = RREG32(EVERGREEN_GRPH_UPDATE +

crtc_offsets[i]);
--
2.11.0

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Applied
#4 lore raw
In reply to a message not in the archive
Quoted 6 lines · Michel Dänzer

From: Michel Dänzer <[email protected]>

Looks like this was missed when dce_v6_0.c was added.

Fixes e2cdf640cbb5 ("drm/amdgpu: add display controller implementation for si v10")

Applied. thanks!

Alex

Quoted 22 lines
---
 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +1 -3
index 03c8529a8e02..c81ae9c4e4b8 100644
@@ -456,9 +456,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(EVERGREEN_MASTER_UPDATE_MODE + crtc_offsets[i]);
-                       if ((tmp & 0x7) != 3) {
+                       if ((tmp & 0x7) != 0) {
                                tmp &= ~0x7;
-                               tmp |= 0x3;
                                WREG32(EVERGREEN_MASTER_UPDATE_MODE + crtc_offsets[i], tmp);
                        }
                        tmp = RREG32(EVERGREEN_GRPH_UPDATE + crtc_offsets[i]);
--

2.11.0

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx