aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0235-drm-amdgpu-drop-hard_reset-module-parameter.patch
diff options
context:
space:
mode:
authorAwais Belal <awais_belal@mentor.com>2016-10-13 14:39:46 +0500
committerAwais Belal <awais_belal@mentor.com>2016-10-14 15:22:00 +0500
commit912c1466ad973230fcdd08b07f766d291a6c13a4 (patch)
tree3e7a0bdfdf033d61c2212f66c19bf192d41e49b2 /common/recipes-kernel/linux/files/0235-drm-amdgpu-drop-hard_reset-module-parameter.patch
parentb701f13977df4dd34e618e7d074220782b27dd34 (diff)
downloadmeta-amd-912c1466ad973230fcdd08b07f766d291a6c13a4.tar.gz
meta-amd-912c1466ad973230fcdd08b07f766d291a6c13a4.tar.bz2
meta-amd-912c1466ad973230fcdd08b07f766d291a6c13a4.zip
SE/BE: move to 4.4 kernel
This commit does a few things which cannot be separated easily so it cannot be split in to separate commits. * Drops all 4.1 kernel bits. * Moves all common patches from meta-amdfalconx86 to common. * Moves SE/BE builds to 4.4 kernel. Signed-off-by: Awais Belal <awais_belal@mentor.com>
Diffstat (limited to 'common/recipes-kernel/linux/files/0235-drm-amdgpu-drop-hard_reset-module-parameter.patch')
-rw-r--r--common/recipes-kernel/linux/files/0235-drm-amdgpu-drop-hard_reset-module-parameter.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0235-drm-amdgpu-drop-hard_reset-module-parameter.patch b/common/recipes-kernel/linux/files/0235-drm-amdgpu-drop-hard_reset-module-parameter.patch
new file mode 100644
index 00000000..8c9f7ca8
--- /dev/null
+++ b/common/recipes-kernel/linux/files/0235-drm-amdgpu-drop-hard_reset-module-parameter.patch
@@ -0,0 +1,52 @@
+From 2e2bc430d6c21e43c22161bbf0d0b494475e6f11 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Fri, 15 Jan 2016 13:18:12 -0500
+Subject: [PATCH 0235/1110] drm/amdgpu: drop hard_reset module parameter
+
+It doesn't currently do anything and there's no need for it
+going forward since pci config reset will be required as a
+fallback even when we have fine grained reset implemented.
+
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 ----
+ 2 files changed, 5 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+index e3be9f5..a1da7e2 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+@@ -74,7 +74,6 @@ extern int amdgpu_dpm;
+ extern int amdgpu_smc_load_fw;
+ extern int amdgpu_aspm;
+ extern int amdgpu_runtime_pm;
+-extern int amdgpu_hard_reset;
+ extern unsigned amdgpu_ip_block_mask;
+ extern int amdgpu_bapm;
+ extern int amdgpu_deep_color;
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+index 58c81a4..c1182ec 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+@@ -69,7 +69,6 @@ int amdgpu_dpm = -1;
+ int amdgpu_smc_load_fw = 1;
+ int amdgpu_aspm = -1;
+ int amdgpu_runtime_pm = -1;
+-int amdgpu_hard_reset = 0;
+ unsigned amdgpu_ip_block_mask = 0xffffffff;
+ int amdgpu_bapm = -1;
+ int amdgpu_deep_color = 0;
+@@ -126,9 +125,6 @@ module_param_named(aspm, amdgpu_aspm, int, 0444);
+ MODULE_PARM_DESC(runpm, "PX runtime pm (1 = force enable, 0 = disable, -1 = PX only default)");
+ module_param_named(runpm, amdgpu_runtime_pm, int, 0444);
+
+-MODULE_PARM_DESC(hard_reset, "PCI config reset (1 = force enable, 0 = disable (default))");
+-module_param_named(hard_reset, amdgpu_hard_reset, int, 0444);
+-
+ MODULE_PARM_DESC(ip_block_mask, "IP Block Mask (all blocks enabled (default))");
+ module_param_named(ip_block_mask, amdgpu_ip_block_mask, uint, 0444);
+
+--
+2.7.4
+