diff options
author | Tom St Denis <tom.stdenis@amd.com> | 2016-03-03 09:42:43 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-03-08 11:01:56 -0500 |
commit | 74c1e842793fcc470413b1f7d14e2e74e1e8240b (patch) | |
tree | e54ec186a984788fe5a69e44ae2da933af1ee867 | |
parent | 84cffef127cce662e73f5f887c590ac582dcc845 (diff) |
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>
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c index ab536d3ed965..a7d871105b2a 100644 --- 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) | |||
2893 | if (r) | 2893 | if (r) |
2894 | return r; | 2894 | return r; |
2895 | 2895 | ||
2896 | adev->mode_info.mode_config_initialized = true; | ||
2897 | |||
2898 | adev->ddev->mode_config.funcs = &amdgpu_mode_funcs; | 2896 | adev->ddev->mode_config.funcs = &amdgpu_mode_funcs; |
2899 | 2897 | ||
2900 | adev->ddev->mode_config.max_width = 16384; | 2898 | adev->ddev->mode_config.max_width = 16384; |
@@ -2933,7 +2931,8 @@ static int dce_v8_0_sw_init(void *handle) | |||
2933 | 2931 | ||
2934 | drm_kms_helper_poll_init(adev->ddev); | 2932 | drm_kms_helper_poll_init(adev->ddev); |
2935 | 2933 | ||
2936 | return r; | 2934 | adev->mode_info.mode_config_initialized = true; |
2935 | return 0; | ||
2937 | } | 2936 | } |
2938 | 2937 | ||
2939 | static int dce_v8_0_sw_fini(void *handle) | 2938 | static int dce_v8_0_sw_fini(void *handle) |