openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amd/amdgpu: Move init flag to after init in sw_init() (DCEv11) 

Don't set config_init to true until all config statements pass.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Tom St Denis 2016-03-02 09:14:40 -05:00 committed by Alex Deucher
parent bcc71beb2a
commit c437b9d6c0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
View File

@ -2978,8 +2978,6 @@ static int dce_v11_0_sw_init(void *handle)
if (r) if (r)
return r; return r;
adev->mode_info.mode_config_initialized = true;
adev->ddev->mode_config.funcs = &amdgpu_mode_funcs; adev->ddev->mode_config.funcs = &amdgpu_mode_funcs;
adev->ddev->mode_config.max_width = 16384; adev->ddev->mode_config.max_width = 16384;
@ -2997,6 +2995,7 @@ static int dce_v11_0_sw_init(void *handle)
adev->ddev->mode_config.max_width = 16384; adev->ddev->mode_config.max_width = 16384;
adev->ddev->mode_config.max_height = 16384; adev->ddev->mode_config.max_height = 16384;
/* allocate crtcs */ /* allocate crtcs */
for (i = 0; i < adev->mode_info.num_crtc; i++) { for (i = 0; i < adev->mode_info.num_crtc; i++) {
r = dce_v11_0_crtc_init(adev, i); r = dce_v11_0_crtc_init(adev, i);
@ -3018,7 +3017,8 @@ static int dce_v11_0_sw_init(void *handle)
drm_kms_helper_poll_init(adev->ddev); drm_kms_helper_poll_init(adev->ddev);
return r; adev->mode_info.mode_config_initialized = true;
return 0;
} }
static int dce_v11_0_sw_fini(void *handle) static int dce_v11_0_sw_fini(void *handle)