aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
diff options
context:
space:
mode:
authorTom St Denis <tom.stdenis@amd.com>2016-03-03 09:21:44 -0500
committerAlex Deucher <alexander.deucher@amd.com>2016-03-08 11:01:54 -0500
commit98822a2f748cf400a1fa08eabd0ccf6baa146a92 (patch)
tree97db5f6770df2ca7b4d39f08ad7962e03ebc9eac /drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
parentdrm/amd/amdgpu: Don't proceed in audio_fini if disabled (DCEv10) (diff)
downloadlinux-dev-98822a2f748cf400a1fa08eabd0ccf6baa146a92.tar.xz
linux-dev-98822a2f748cf400a1fa08eabd0ccf6baa146a92.zip
drm/amd/amdgpu: Move initialized flag to bottom of sw_init (DCEv10)
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/dce_v10_0.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/dce_v10_0.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index 199b95fff046..6555b4a0c34a 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -2983,8 +2983,6 @@ static int dce_v10_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;
@@ -3023,7 +3021,8 @@ static int dce_v10_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_v10_0_sw_fini(void *handle)