diff mbox series

[5.4,25/78] Revert "drm/amdgpu: Set no-retry as default."

Message ID	20200114094357.099118296@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=X/91=3D=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Felix Kuehling <Felix.Kuehling@amd.com>, =?utf-8?q?Christian_K=C3=B6nig?= <christian.koenig@amd.com>, Alex Deucher <alexander.deucher@amd.com> Subject: [PATCH 5.4 25/78] Revert "drm/amdgpu: Set no-retry as default." Date: Tue, 14 Jan 2020 11:00:59 +0100 Message-Id: <20200114094357.099118296@linuxfoundation.org> In-Reply-To: <20200114094352.428808181@linuxfoundation.org> References: <20200114094352.428808181@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.4,03/78] powercap: intel_rapl: add NULL pointer check to rapl_mmio_cpu_online() [5.4,04/78] usb: chipidea: host: Disable port power only if previously enabled [5.4,06/78] ALSA: hda/realtek - Add new codec supported for ALCS1200A [5.4,08/78] ALSA: hda/realtek - Add quirk for the bass speaker on Lenovo Yoga X1 7th gen [5.4,10/78] tpm: Revert "tpm_tis_core: Set TPM_CHIP_FLAG_IRQ before probing for interrupts" [5.4,13/78] rtc: sun6i: Add support for RTC clocks on R40 [5.4,14/78] kernel/trace: Fix do not unregister tracepoints when register sched_migrate_task fail [5.4,15/78] tracing: Have stack tracer compile when MCOUNT_INSN_SIZE is not defined [5.4,17/78] HID: Fix slab-out-of-bounds read in hid_field_extract [5.4,18/78] HID: uhid: Fix returning EPOLLOUT from uhid_char_poll [5.4,21/78] Input: add safety guards to input_set_keycode() [5.4,22/78] Input: input_event - fix struct padding on sparc64 [5.4,25/78] Revert "drm/amdgpu: Set no-retry as default." [5.4,27/78] drm/fb-helper: Round up bits_per_pixel if possible [5.4,28/78] drm/dp_mst: correct the shifting in DP_REMOTE_I2C_READ [5.4,29/78] drm/i915: Add Wa_1407352427:icl,ehl [5.4,32/78] can: kvaser_usb: fix interface sanity check [5.4,34/78] can: tcan4x5x: tcan4x5x_can_probe(): get the device out of standby before register ac... [5.4,38/78] gpiolib: acpi: Add honor_wakeup module-option + quirk mechanism [5.4,39/78] pstore/ram: Regularize prz label allocation lifetime [5.4,41/78] staging: vt6656: Fix non zero logical return of, usb_control_msg [5.4,42/78] usb: cdns3: should not use the same dev_id for shared interrupt handler [5.4,44/78] USB-PD tcpm: bad warning+size, PPS adapters [5.4,47/78] usb: musb: Disable pullup at init [5.4,48/78] usb: musb: dma: Correct parameter passed to IRQ handler [5.4,50/78] staging: vt6656: correct return of vnt_init_registers. [5.4,52/78] staging: rtl8188eu: Add device code for TP-Link TL-WN727N v5.21 [5.4,54/78] iommu/vt-d: Fix adding non-PCI devices to Intel IOMMU [5.4,58/78] arm64: Implement copy_thread_tls [5.4,59/78] arm: Implement copy_thread_tls [5.4,62/78] xtensa: Implement copy_thread_tls [5.4,64/78] um: Implement copy_thread_tls [5.4,66/78] mwifiex: fix possible heap overflow in mwifiex_process_country_ie() [5.4,67/78] mwifiex: pcie: Fix memory leak in mwifiex_pcie_alloc_cmdrsp_buf [5.4,71/78] ath10k: fix memory leak [5.4,72/78] HID: hiddev: fix mess in hiddev_open() [5.4,74/78] phy: cpcap-usb: Fix error path when no host driver is loaded [5.4,75/78] phy: cpcap-usb: Fix flakey host idling and enumerating of devices [5.4,76/78] netfilter: arp_tables: init netns pointer in xt_tgchk_param struct

Commit Message

Greg Kroah-Hartman Jan. 14, 2020, 10 a.m. UTC

From: Alex Deucher <alexander.deucher@amd.com>

commit 7aec9ec1cf324d5c5a8d17b9c78a34c388e5f17b upstream.

This reverts commit 51bfac71cade386966791a8db87a5912781d249f.

This causes stability issues on some raven boards.  Revert
for now until a proper fix is completed.

Bug: https://gitlab.freedesktop.org/drm/amd/issues/934
Bug: https://bugzilla.kernel.org/show_bug.cgi?id=206017
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff mbox series

Patch

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -145,7 +145,7 @@  int amdgpu_async_gfx_ring = 1;
 int amdgpu_mcbp = 0;
 int amdgpu_discovery = -1;
 int amdgpu_mes = 0;
-int amdgpu_noretry = 1;
+int amdgpu_noretry;
 
 struct amdgpu_mgpu_info mgpu_info = {
 	.mutex = __MUTEX_INITIALIZER(mgpu_info.mutex),
@@ -613,7 +613,7 @@  MODULE_PARM_DESC(mes,
 module_param_named(mes, amdgpu_mes, int, 0444);
 
 MODULE_PARM_DESC(noretry,
-	"Disable retry faults (0 = retry enabled, 1 = retry disabled (default))");
+	"Disable retry faults (0 = retry enabled (default), 1 = retry disabled)");
 module_param_named(noretry, amdgpu_noretry, int, 0644);
 
 #ifdef CONFIG_HSA_AMD