summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCong Liu <liucong2@kylinos.cn>2023-09-26 13:56:17 +0800
committerAlex Deucher <alexander.deucher@amd.com>2023-09-28 15:36:57 -0400
commit0c3601a2fbfb265ce283651480e30c8e60459112 (patch)
tree4489f819da7a6c5934bc65b6c2be1944afff3b85
parent554340133e4f596fc40fd75a58f9cf18b6b8dbbc (diff)
downloadlinux-0c3601a2fbfb265ce283651480e30c8e60459112.tar.gz
linux-0c3601a2fbfb265ce283651480e30c8e60459112.tar.bz2
linux-0c3601a2fbfb265ce283651480e30c8e60459112.zip
drm/amd/display: Fix null pointer dereference in error message
This patch fixes a null pointer dereference in the error message that is printed when the Display Core (DC) fails to initialize. The original message includes the DC version number, which is undefined if the DC is not initialized. Fixes: 9788d087caff ("drm/amd/display: improve the message printed when loading DC") Signed-off-by: Cong Liu <liucong2@kylinos.cn> Reviewed-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c3
1 files changed, 1 insertions, 2 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 c53daaddc888..62566a26fcd6 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1708,8 +1708,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
DRM_INFO("Display Core v%s initialized on %s\n", DC_VER,
dce_version_to_string(adev->dm.dc->ctx->dce_version));
} else {
- DRM_INFO("Display Core v%s failed to initialize on %s\n", DC_VER,
- dce_version_to_string(adev->dm.dc->ctx->dce_version));
+ DRM_INFO("Display Core failed to initialize with v%s!\n", DC_VER);
goto error;
}