diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/0294-drm-amdgpu-always-enable-shadow-BOs-v2.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/0294-drm-amdgpu-always-enable-shadow-BOs-v2.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/0294-drm-amdgpu-always-enable-shadow-BOs-v2.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/0294-drm-amdgpu-always-enable-shadow-BOs-v2.patch new file mode 100644 index 00000000..f2050f6e --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/0294-drm-amdgpu-always-enable-shadow-BOs-v2.patch @@ -0,0 +1,55 @@ +From 81cce477bf7a7b9b6a10b3a3edc45da588ce1302 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Tue, 11 Sep 2018 10:30:31 +0200 +Subject: [PATCH 0294/2940] drm/amdgpu: always enable shadow BOs v2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Even when GPU recovery is disabled we could run into a manually +triggered recovery. + +v2: keep accidental removed comments + +Signed-off-by: Christian König <christian.koenig@amd.com> +Acked-by: Emily Deng <Emily.Deng@amd.com> +Signed-off-by: Kalyan Alle <kalyan.alle@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 14 +------------- + 1 file changed, 1 insertion(+), 13 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +index 8fd91c996381..c8bc53b40c45 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +@@ -51,18 +51,6 @@ + * + */ + +-static bool amdgpu_bo_need_backup(struct amdgpu_device *adev) +-{ +- if (adev->flags & AMD_IS_APU) +- return false; +- +- if (amdgpu_gpu_recovery == 0 || +- (amdgpu_gpu_recovery == -1 && !amdgpu_sriov_vf(adev))) +- return false; +- +- return true; +-} +- + /** + * amdgpu_bo_subtract_pin_size - Remove BO from pin_size accounting + * +@@ -635,7 +623,7 @@ int amdgpu_bo_create(struct amdgpu_device *adev, + if (r) + return r; + +- if ((flags & AMDGPU_GEM_CREATE_SHADOW) && amdgpu_bo_need_backup(adev)) { ++ if ((flags & AMDGPU_GEM_CREATE_SHADOW) && !(adev->flags & AMD_IS_APU)) { + if (!bp->resv) + WARN_ON(reservation_object_lock((*bo_ptr)->tbo.resv, + NULL)); +-- +2.17.1 + |