diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2610-Revert-drm-amdgpu-Move-IB-pool-init-and-fini-v2.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2610-Revert-drm-amdgpu-Move-IB-pool-init-and-fini-v2.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2610-Revert-drm-amdgpu-Move-IB-pool-init-and-fini-v2.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2610-Revert-drm-amdgpu-Move-IB-pool-init-and-fini-v2.patch new file mode 100644 index 00000000..b5c46223 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2610-Revert-drm-amdgpu-Move-IB-pool-init-and-fini-v2.patch @@ -0,0 +1,61 @@ +From 3a92b0beb287292c4bfb81e0e18c8eced447b335 Mon Sep 17 00:00:00 2001 +From: Chaudhary Amit Kumar <Chaudharyamit.Kumar@amd.com> +Date: Mon, 8 Jul 2019 15:33:36 +0530 +Subject: [PATCH 2610/2940] Revert "drm/amdgpu: Move IB pool init and fini v2" + +This reverts commit 4a0a9ec12d4f52ffcbf663c54fa027158e788734. +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index d5eaa3d61b7d..cb59eec5ece3 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -1754,13 +1754,6 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) + } + } + +- r = amdgpu_ib_pool_init(adev); +- if (r) { +- dev_err(adev->dev, "IB initialization failed (%d).\n", r); +- amdgpu_vf_error_put(adev, AMDGIM_ERROR_VF_IB_INIT_FAIL, 0, r); +- goto init_failed; +- } +- + r = amdgpu_ucode_create_bo(adev); /* create ucode bo when sw_init complete*/ + if (r) + goto init_failed; +@@ -2040,7 +2033,6 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev) + amdgpu_free_static_csa(&adev->virt.csa_obj); + amdgpu_device_wb_fini(adev); + amdgpu_device_vram_scratch_fini(adev); +- amdgpu_ib_pool_fini(adev); + } + + r = adev->ip_blocks[i].version->funcs->sw_fini((void *)adev); +@@ -2735,6 +2727,13 @@ int amdgpu_device_init(struct amdgpu_device *adev, + /* Get a log2 for easy divisions. */ + adev->mm_stats.log2_max_MBps = ilog2(max(1u, max_MBps)); + ++ r = amdgpu_ib_pool_init(adev); ++ if (r) { ++ dev_err(adev->dev, "IB initialization failed (%d).\n", r); ++ amdgpu_vf_error_put(adev, AMDGIM_ERROR_VF_IB_INIT_FAIL, 0, r); ++ goto failed; ++ } ++ + amdgpu_fbdev_init(adev); + + if (amdgpu_sriov_vf(adev) && amdgim_is_hwperf(adev)) +@@ -2835,6 +2834,7 @@ void amdgpu_device_fini(struct amdgpu_device *adev) + else + drm_atomic_helper_shutdown(adev->ddev); + } ++ amdgpu_ib_pool_fini(adev); + amdgpu_fence_driver_fini(adev); + amdgpu_pm_sysfs_fini(adev); + amdgpu_fbdev_fini(adev); +-- +2.17.1 + |