diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3448-remove-errors-from-radeon-kfd.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3448-remove-errors-from-radeon-kfd.patch | 115 |
1 files changed, 115 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3448-remove-errors-from-radeon-kfd.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3448-remove-errors-from-radeon-kfd.patch new file mode 100644 index 00000000..b164b93b --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3448-remove-errors-from-radeon-kfd.patch @@ -0,0 +1,115 @@ +From 40a34b78c74ccfba3f1994624dabb9ac9510c037 Mon Sep 17 00:00:00 2001 +From: Sanjay R Mehta <sanju.mehta@amd.com> +Date: Thu, 17 May 2018 17:33:01 +0530 +Subject: [PATCH 3448/4131] remove errors from radeon kfd + +Signed-off-by: Sanjay R Mehta <sanju.mehta@amd.com> +--- + drivers/gpu/drm/radeon/cik.c | 8 -------- + drivers/gpu/drm/radeon/radeon_drv.c | 10 ---------- + drivers/gpu/drm/radeon/radeon_kms.c | 5 ----- + 3 files changed, 23 deletions(-) + mode change 100644 => 100755 drivers/gpu/drm/radeon/cik.c + mode change 100644 => 100755 drivers/gpu/drm/radeon/radeon_drv.c + mode change 100644 => 100755 drivers/gpu/drm/radeon/radeon_kms.c + +diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c +old mode 100644 +new mode 100755 +index ce8b353b..81add8f +--- a/drivers/gpu/drm/radeon/cik.c ++++ b/drivers/gpu/drm/radeon/cik.c +@@ -7562,9 +7562,6 @@ int cik_irq_process(struct radeon_device *rdev) + /* wptr/rptr are in bytes! */ + ring_index = rptr / 4; + +- radeon_kfd_interrupt(rdev, +- (const void *) &rdev->ih.ring[ring_index]); +- + src_id = le32_to_cpu(rdev->ih.ring[ring_index]) & 0xff; + src_data = le32_to_cpu(rdev->ih.ring[ring_index + 1]) & 0xfffffff; + ring_id = le32_to_cpu(rdev->ih.ring[ring_index + 2]) & 0xff; +@@ -8459,10 +8456,6 @@ static int cik_startup(struct radeon_device *rdev) + if (r) + return r; + +- r = radeon_kfd_resume(rdev); +- if (r) +- return r; +- + return 0; + } + +@@ -8511,7 +8504,6 @@ int cik_resume(struct radeon_device *rdev) + */ + int cik_suspend(struct radeon_device *rdev) + { +- radeon_kfd_suspend(rdev); + radeon_pm_suspend(rdev); + radeon_audio_fini(rdev); + radeon_vm_manager_fini(rdev); +diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c +old mode 100644 +new mode 100755 +index f4becad..31dd04f +--- a/drivers/gpu/drm/radeon/radeon_drv.c ++++ b/drivers/gpu/drm/radeon/radeon_drv.c +@@ -43,7 +43,6 @@ + #include <drm/drm_fb_helper.h> + + #include <drm/drm_crtc_helper.h> +-#include "radeon_kfd.h" + + /* + * KMS wrapper. +@@ -338,14 +337,6 @@ static int radeon_pci_probe(struct pci_dev *pdev, + { + int ret; + +- /* +- * Initialize amdkfd before starting radeon. If it was not loaded yet, +- * defer radeon probing +- */ +- ret = radeon_kfd_init(); +- if (ret == -EPROBE_DEFER) +- return ret; +- + if (vga_switcheroo_client_probe_defer(pdev)) + return -EPROBE_DEFER; + +@@ -645,7 +636,6 @@ static int __init radeon_init(void) + + static void __exit radeon_exit(void) + { +- radeon_kfd_fini(); + pci_unregister_driver(pdriver); + radeon_unregister_atpx_handler(); + } +diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c +old mode 100644 +new mode 100755 +index dfee8f7..c91ae76 +--- a/drivers/gpu/drm/radeon/radeon_kms.c ++++ b/drivers/gpu/drm/radeon/radeon_kms.c +@@ -68,8 +68,6 @@ void radeon_driver_unload_kms(struct drm_device *dev) + pm_runtime_forbid(dev->dev); + } + +- radeon_kfd_device_fini(rdev); +- + radeon_acpi_fini(rdev); + + radeon_modeset_fini(rdev); +@@ -174,9 +172,6 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags) + "Error during ACPI methods call\n"); + } + +- radeon_kfd_device_probe(rdev); +- radeon_kfd_device_init(rdev); +- + if (radeon_is_px(dev)) { + pm_runtime_use_autosuspend(dev->dev); + pm_runtime_set_autosuspend_delay(dev->dev, 5000); +-- +2.7.4 + |