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>

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
index 75b5366b9a49f412859481e4fc01c259c3ea9c14..ef7290c552b00be0ffbbabee3d22f49339d50871 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -2978,8 +2978,6 @@ static int dce_v11_0_sw_init(void *handle)
        if (r)
                return r;
 
-       adev->mode_info.mode_config_initialized = true;
-
        adev->ddev->mode_config.funcs = &amdgpu_mode_funcs;
 
        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_height = 16384;
 
+
        /* allocate crtcs */
        for (i = 0; i < adev->mode_info.num_crtc; 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);
 
-       return r;
+       adev->mode_info.mode_config_initialized = true;
+       return 0;
 }
 
 static int dce_v11_0_sw_fini(void *handle)