aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.14.71/4863-drm-amdgpu-fix-kmap-error-handling-for-bo-creations.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/4863-drm-amdgpu-fix-kmap-error-handling-for-bo-creations.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/4863-drm-amdgpu-fix-kmap-error-handling-for-bo-creations.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4863-drm-amdgpu-fix-kmap-error-handling-for-bo-creations.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4863-drm-amdgpu-fix-kmap-error-handling-for-bo-creations.patch
new file mode 100644
index 00000000..0592422b
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4863-drm-amdgpu-fix-kmap-error-handling-for-bo-creations.patch
@@ -0,0 +1,34 @@
+From 9f555c718f60971dc2b50911afb6eac392131b03 Mon Sep 17 00:00:00 2001
+From: Junwei Zhang <Jerry.Zhang@amd.com>
+Date: Tue, 26 Jun 2018 16:23:48 +0800
+Subject: [PATCH 4863/5725] drm/amdgpu: fix kmap error handling for bo
+ creations
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+kmap happens after bo pin, so unpin is required on error
+
+Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
+Reviewed-by: Christian König <christian.koenig@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+index f6b58c5..7b9da44 100755
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+@@ -294,7 +294,7 @@ int amdgpu_bo_create_reserved(struct amdgpu_device *adev,
+ r = amdgpu_bo_kmap(*bo_ptr, cpu_addr);
+ if (r) {
+ dev_err(adev->dev, "(%d) kernel bo map failed\n", r);
+- goto error_unreserve;
++ goto error_unpin;
+ }
+ }
+
+--
+2.7.4
+