diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2073-Revert-drm-amdgpu-add-option-for-force-enable-multip.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2073-Revert-drm-amdgpu-add-option-for-force-enable-multip.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2073-Revert-drm-amdgpu-add-option-for-force-enable-multip.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2073-Revert-drm-amdgpu-add-option-for-force-enable-multip.patch new file mode 100644 index 00000000..037fd176 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2073-Revert-drm-amdgpu-add-option-for-force-enable-multip.patch @@ -0,0 +1,67 @@ +From c4a891288144da458f8658be3898b529e13fa315 Mon Sep 17 00:00:00 2001 +From: "Le.Ma" <Le.Ma@amd.com> +Date: Thu, 2 Nov 2017 13:57:10 +0800 +Subject: [PATCH 2073/4131] Revert "drm/amdgpu: add option for force enable + multipipe policy for compute" + +This reverts commit 08345aeec6aada3e79404287bfc0e5283c188c9d. +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 ---- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 6 ------ + 3 files changed, 11 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index 7c9e988..b2f8531 100755 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -126,7 +126,6 @@ extern int amdgpu_cntl_sb_buf_per_se; + extern int amdgpu_param_buf_per_se; + extern int amdgpu_job_hang_limit; + extern int amdgpu_lbpw; +-extern int amdgpu_compute_multipipe; + + #ifdef CONFIG_DRM_AMDGPU_SI + extern int amdgpu_si_support; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +index 973d14a..61b3b88 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +@@ -127,7 +127,6 @@ int amdgpu_cntl_sb_buf_per_se = 0; + int amdgpu_param_buf_per_se = 0; + int amdgpu_job_hang_limit = 0; + int amdgpu_lbpw = -1; +-int amdgpu_compute_multipipe = -1; + + MODULE_PARM_DESC(vramlimit, "Restrict VRAM for testing, in megabytes"); + module_param_named(vramlimit, amdgpu_vram_limit, int, 0600); +@@ -277,9 +276,6 @@ module_param_named(job_hang_limit, amdgpu_job_hang_limit, int ,0444); + MODULE_PARM_DESC(lbpw, "Load Balancing Per Watt (LBPW) support (1 = enable, 0 = disable, -1 = auto)"); + module_param_named(lbpw, amdgpu_lbpw, int, 0444); + +-MODULE_PARM_DESC(compute_multipipe, "Force compute queues to be spread across pipes (1 = enable, 0 = disable, -1 = auto)"); +-module_param_named(compute_multipipe, amdgpu_compute_multipipe, int, 0444); +- + #ifdef CONFIG_DRM_AMDGPU_SI + + int amdgpu_si_support = 1; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +index 95f46b8..1dae2c7 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +@@ -111,12 +111,6 @@ void amdgpu_gfx_parse_disable_cu(unsigned *mask, unsigned max_se, unsigned max_s + + static bool amdgpu_gfx_is_multipipe_capable(struct amdgpu_device *adev) + { +- if (amdgpu_compute_multipipe != -1) { +- DRM_INFO("amdgpu: forcing compute pipe policy %d\n", +- amdgpu_compute_multipipe); +- return amdgpu_compute_multipipe == 1; +- } +- + /* FIXME: spreading the queues across pipes causes perf regressions + * on POLARIS11 compute workloads */ + if (adev->asic_type == CHIP_POLARIS11) +-- +2.7.4 + |