drm/amd/amdgpu: Move config init flag to bottom of sw_init (DCEv8)

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_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
index ab536d3ed965597e9fa998eb32cbeba4aa2a7659..a7d871105b2ad74ce2e3ca4275c11aa3ae577faf 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
@@ -2893,8 +2893,6 @@ static int dce_v8_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;
@@ -2933,7 +2931,8 @@ static int dce_v8_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_v8_0_sw_fini(void *handle)