diff options
Diffstat (limited to 'meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1603-drm-amdgpu-Fix-FD-leak-due-to-rebase-conflict.patch')
| -rw-r--r-- | meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1603-drm-amdgpu-Fix-FD-leak-due-to-rebase-conflict.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1603-drm-amdgpu-Fix-FD-leak-due-to-rebase-conflict.patch b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1603-drm-amdgpu-Fix-FD-leak-due-to-rebase-conflict.patch new file mode 100644 index 00000000..270bf02b --- /dev/null +++ b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1603-drm-amdgpu-Fix-FD-leak-due-to-rebase-conflict.patch @@ -0,0 +1,32 @@ +From 0f38b702244082fd58753b4e0f9dd3f7f11c05c3 Mon Sep 17 00:00:00 2001 +From: Kent Russell <kent.russell@amd.com> +Date: Wed, 22 Feb 2017 09:17:19 -0500 +Subject: [PATCH 1603/4131] drm/amdgpu: Fix FD leak due to rebase conflict + +This was missed during the rebase conflict resolution + +Change-Id: I6e9b623a109a46cde8e7ddf84a547af7f1b75d9c +Signed-off-by: Kent Russell <kent.russell@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +index cde1dad..6215299 100755 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +@@ -370,11 +370,6 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev, + return -ENOMEM; + } + +- r = drm_gem_object_init(adev->ddev, &gobj->base, size); +- if (unlikely(r)) { +- kfree(bo); +- return r; +- } + INIT_LIST_HEAD(&bo->shadow_list); + INIT_LIST_HEAD(&bo->va); + INIT_LIST_HEAD(&bo->gem_objects); +-- +2.7.4 + |