From 9d9c33f4897d97550f84978fde64b437b6003344 Mon Sep 17 00:00:00 2001 From: changzhu Date: Thu, 14 Mar 2019 15:08:02 +0800 Subject: [PATCH] drm/amdkcl: [4.8] fix Centos7.4 modprobe hang problem [Why] adev->ddev->mode_config.helper_private = &amdgpu_dm_mode_config_helperfuncs; will not be used when using 4.12 as drm control version. So the hang problem happens. [How] Using 4.8 as drm control version according to old kcl patch: drm/amdkcl: [RHEL 6] Include kernel.h in chash.c for pr_fmt definition The use of helper_private can be traced to patch: drm/atomic-helper: nonblocking commit support This patch is introduced in drm version(4.8.0). So we need to use 4.8 as drm control version. Change-Id: I19c57332c8f744e4edccc11a6d5758bbc20f1cc5 Signed-off-by: changzhu Reviewed-by: Tianci Yin Reviewed-by: Tao Zhou --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0d71456352791..7ce7123a3314c 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -1782,7 +1782,7 @@ static int amdgpu_dm_mode_config_init(struct amdgpu_device *adev) adev->mode_info.mode_config_initialized = true; adev->ddev->mode_config.funcs = (void *)&amdgpu_dm_mode_funcs; -#if DRM_VERSION_CODE >= DRM_VERSION(4, 12, 0) +#if DRM_VERSION_CODE >= DRM_VERSION(4, 8, 0) adev->ddev->mode_config.helper_private = &amdgpu_dm_mode_config_helperfuncs; #endif