1 files changed, 41 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3131-drm-amdgpu-add-reset_method-asic-callback-for-cik.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3131-drm-amdgpu-add-reset_method-asic-callback-for-cik.patch
new file mode 100644
index 00000000..e24e4a48
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3131-drm-amdgpu-add-reset_method-asic-callback-for-cik.patch
@@ -0,0 +1,41 @@
+From 36a792fb993dcf08eb4cf2774284a43eb4df5e16 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Tue, 23 Jul 2019 23:45:39 -0500
+Subject: [PATCH 3131/4256] drm/amdgpu: add reset_method asic callback for cik
+
+CIK always uses the legacy pci based reset.
+
+Reviewed-by: Evan Quan <evan.quan@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/cik.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
+index 3a4f20766a39..7b63d7a8298a 100644
+--- a/drivers/gpu/drm/amd/amdgpu/cik.c
++++ b/drivers/gpu/drm/amd/amdgpu/cik.c
+@@ -1290,6 +1290,12 @@ static int cik_asic_reset(struct amdgpu_device *adev)
+ 	return r;
+ }
+ 
++static enum amd_reset_method
++cik_asic_reset_method(struct amdgpu_device *adev)
++{
++	return AMD_RESET_METHOD_LEGACY;
++}
++
+ static u32 cik_get_config_memsize(struct amdgpu_device *adev)
+ {
+ 	return RREG32(mmCONFIG_MEMSIZE);
+@@ -1822,6 +1828,7 @@ static const struct amdgpu_asic_funcs cik_asic_funcs =
+ 	.read_bios_from_rom = &cik_read_bios_from_rom,
+ 	.read_register = &cik_read_register,
+ 	.reset = &cik_asic_reset,
++	.reset_method = &cik_asic_reset_method,
+ 	.set_vga_state = &cik_vga_set_state,
+ 	.get_xclk = &cik_get_xclk,
+ 	.set_uvd_clocks = &cik_set_uvd_clocks,
+-- 
+2.17.1
+