Skip to contentSkip to conversation

drm/amdgpu: fix that issue that the number of the crtc of the 3250c is not correct

PATCH Superseded RyanLin 2 participants 2 messages Jan 28, 2022

Subsystems (3)
lore
Share & tools
lore

RyanLin

author
#0 lore raw

PATCH v2 1/28 drm/amdgpu: fix that issue that the number of the crtc of the 3250c is not correct

v2:
- remove unnecessary comments and Id

[Why]
External displays take priority over internal display when there are fewer display controllers than displays.

[How]
The root cause is because of that number of the crtc is not correct. The number of the crtc on the 3250c is 3, but on the 3500c is 4. From the source code, we can see that number of the crtc has been fixed at 4. Needs to set the num_crtc to 3 for 3250c platform.

---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +9 -3
index 40c91b448f7d..455a2c45e8cd 100644
@@ -2738,9 +2738,15 @@ static int dm_early_init(void *handle)
 		break;
 #if defined(CONFIG_DRM_AMD_DC_DCN1_0)
 	case CHIP_RAVEN:
-		adev->mode_info.num_crtc = 4;
-		adev->mode_info.num_hpd = 4;
-		adev->mode_info.num_dig = 4;
+		if (adev->rev_id >= 8) {
+			adev->mode_info.num_crtc = 3;
+			adev->mode_info.num_hpd = 3;
+			adev->mode_info.num_dig = 3;
+		} else {
+			adev->mode_info.num_crtc = 4;
+			adev->mode_info.num_hpd = 4;
+			adev->mode_info.num_dig = 4;
+		}
 		break;
 #endif
 #if defined(CONFIG_DRM_AMD_DC_DCN2_0)
Signature · 1 line
2.25.1
maintainer Reviewed-by on v2 1/28
#1 lore raw

[Public]

________________________________
From: RyanLin <[email protected]>
Sent: Thursday, January 27, 2022 10:47 PM
To: Wentland, Harry <[email protected]>; Li, Sun peng (Leo) <[email protected]>; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; Kazlauskas, Nicholas <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; Siqueira, Rodrigo <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; Li, Leon <[email protected]>
Cc: Lin, Tsung-hua (Ryan) <[email protected]>
Subject: [PATCH v2 1/28] drm/amdgpu: fix that issue that the number of the crtc of the 3250c is not correct

v2:
- remove unnecessary comments and Id

[Why]
External displays take priority over internal display when there are fewer display controllers than displays.

[How]
The root cause is because of that number of the crtc is not correct. The number of the crtc on the 3250c is 3, but on the 3500c is 4. From the source code, we can see that number of the crtc has been fixed at 4. Needs to set the num_crtc to 3 for 3250c platform.

---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +9 -3
index 40c91b448f7d..455a2c45e8cd 100644
@@ -2738,9 +2738,15 @@ static int dm_early_init(void *handle)
                 break;
 #if defined(CONFIG_DRM_AMD_DC_DCN1_0)
         case CHIP_RAVEN:
-               adev->mode_info.num_crtc = 4;
-               adev->mode_info.num_hpd = 4;
-               adev->mode_info.num_dig = 4;
+               if (adev->rev_id >= 8) {
+                       adev->mode_info.num_crtc = 3;
+                       adev->mode_info.num_hpd = 3;
+                       adev->mode_info.num_dig = 3;
+               } else {
+                       adev->mode_info.num_crtc = 4;
+                       adev->mode_info.num_hpd = 4;
+                       adev->mode_info.num_dig = 4;
+               }
                 break;
 #endif
 #if defined(CONFIG_DRM_AMD_DC_DCN2_0)

--
2.25.1