[Public] Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> ________________________________ From: RyanLin <tsung-hua....@amd.com> Sent: Thursday, January 27, 2022 10:47 PM To: Wentland, Harry <harry.wentl...@amd.com>; Li, Sun peng (Leo) <sunpeng...@amd.com>; Deucher, Alexander <alexander.deuc...@amd.com>; Koenig, Christian <christian.koe...@amd.com>; david1.z...@amd.com <david1.z...@amd.com>; airl...@linux.ie <airl...@linux.ie>; dan...@ffwll.ch <dan...@ffwll.ch>; seanp...@chromium.org <seanp...@chromium.org>; b...@basnieuwenhuizen.nl <b...@basnieuwenhuizen.nl>; Kazlauskas, Nicholas <nicholas.kazlaus...@amd.com>; sas...@kernel.org <sas...@kernel.org>; markyac...@google.com <markyac...@google.com>; victorchengchi...@amd.com <victorchengchi...@amd.com>; ching-shih...@amd.corp-partner.google.com <ching-shih...@amd.corp-partner.google.com>; Siqueira, Rodrigo <rodrigo.sique...@amd.com>; ddavenp...@chromium.org <ddavenp...@chromium.org>; amd-...@lists.freedesktop.org <amd-...@lists.freedesktop.org>; dri-devel@lists.freedesktop.org <dri-devel@lists.freedesktop.org>; linux-ker...@vger.kernel.org <linux-ker...@vger.kernel.org>; Li, Leon <leon...@amd.com> Cc: Lin, Tsung-hua (Ryan) <tsung-hua....@amd.com> 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. Signed-off-by: RyanLin <tsung-hua....@amd.com> --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 40c91b448f7d..455a2c45e8cd 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -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