aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amdfalconx86/recipes-kernel/linux/files/0366-drm-amd-amdgpu-Move-init-flag-to-after-init-in-sw_in.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amdfalconx86/recipes-kernel/linux/files/0366-drm-amd-amdgpu-Move-init-flag-to-after-init-in-sw_in.patch')
-rw-r--r--meta-amdfalconx86/recipes-kernel/linux/files/0366-drm-amd-amdgpu-Move-init-flag-to-after-init-in-sw_in.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/meta-amdfalconx86/recipes-kernel/linux/files/0366-drm-amd-amdgpu-Move-init-flag-to-after-init-in-sw_in.patch b/meta-amdfalconx86/recipes-kernel/linux/files/0366-drm-amd-amdgpu-Move-init-flag-to-after-init-in-sw_in.patch
new file mode 100644
index 00000000..06d84a6f
--- /dev/null
+++ b/meta-amdfalconx86/recipes-kernel/linux/files/0366-drm-amd-amdgpu-Move-init-flag-to-after-init-in-sw_in.patch
@@ -0,0 +1,49 @@
+From 6ef6c6089087a13e22e1ec2c3bdaa539ec4e3dc2 Mon Sep 17 00:00:00 2001
+From: Tom St Denis <tom.stdenis@amd.com>
+Date: Wed, 2 Mar 2016 09:14:40 -0500
+Subject: [PATCH 0366/1110] 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>
+---
+ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+index 1b8abaf..c510226 100644
+--- 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)
+--
+2.7.4
+