aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0235-drm-amdgpu-drop-hard_reset-module-parameter.patch
diff options
context:
space:
mode:
authorWade Farnsworth <wfarnsworth@users.noreply.github.com>2019-10-22 08:08:07 -0700
committerGitHub <noreply@github.com>2019-10-22 08:08:07 -0700
commit8e0cf9ee43840bd7ee004412129ba4aa055f5fc8 (patch)
treeb13804093e413307097cd6788ccdc8b062084013 /common/recipes-kernel/linux/files/0235-drm-amdgpu-drop-hard_reset-module-parameter.patch
parent9e1e1da00d8ef569d83a7a742a734dbbf5e0bd13 (diff)
parent3f8062a03dc1d1d5fa386e1f1ca59d56b86a85d1 (diff)
downloadmeta-amd-master.tar.gz
meta-amd-master.tar.bz2
meta-amd-master.zip
Merge pull request #661 from ArsalanHAwan/master-merge-warriorHEADmaster
master: merge warrior
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, 0 insertions, 52 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
deleted file mode 100644
index 8c9f7ca8..00000000
--- a/common/recipes-kernel/linux/files/0235-drm-amdgpu-drop-hard_reset-module-parameter.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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
-