diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1378-drm-amdgpu-enable-foreign-DMA-buf-objects.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1378-drm-amdgpu-enable-foreign-DMA-buf-objects.patch | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1378-drm-amdgpu-enable-foreign-DMA-buf-objects.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1378-drm-amdgpu-enable-foreign-DMA-buf-objects.patch deleted file mode 100644 index 9a349d6f..00000000 --- a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1378-drm-amdgpu-enable-foreign-DMA-buf-objects.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 9b6ea4163e7b060e23f4037ab63719da4ecdfdc5 Mon Sep 17 00:00:00 2001 -From: Christian Koenig <christian.koenig@amd.com> -Date: Wed, 2 Dec 2015 15:40:55 +0100 -Subject: [PATCH 1378/4131] drm/amdgpu: enable foreign DMA-buf objects -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We should be able to handle BOs from other instances as well. - -Signed-off-by: Christian König <christian.koenig@amd.com> -Signed-off-by: kalyan.alle <kalyan.alle@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 ++ - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- - drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 19 +++++++++++++++++++ - 3 files changed, 22 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -index c876ad5..d6d7924 100755 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -@@ -406,6 +406,8 @@ amdgpu_gem_prime_import_sg_table(struct drm_device *dev, - struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev, - struct drm_gem_object *gobj, - int flags); -+struct drm_gem_object *amdgpu_gem_prime_import(struct drm_device *dev, -+ struct dma_buf *dma_buf); - int amdgpu_gem_prime_pin(struct drm_gem_object *obj); - void amdgpu_gem_prime_unpin(struct drm_gem_object *obj); - struct reservation_object *amdgpu_gem_prime_res_obj(struct drm_gem_object *); -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -index 0720358..a61a7daf 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -@@ -840,7 +840,7 @@ static struct drm_driver kms_driver = { - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = amdgpu_gem_prime_export, -- .gem_prime_import = drm_gem_prime_import, -+ .gem_prime_import = amdgpu_gem_prime_import, - .gem_prime_pin = amdgpu_gem_prime_pin, - .gem_prime_unpin = amdgpu_gem_prime_unpin, - .gem_prime_res_obj = amdgpu_gem_prime_res_obj, -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c -index 458e99a..8beb92e 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c -@@ -201,3 +201,22 @@ amdgpu_gem_prime_foreign_bo(struct amdgpu_device *adev, struct amdgpu_bo *bo) - return &gobj->base; - } - -+struct drm_gem_object *amdgpu_gem_prime_import(struct drm_device *dev, -+ struct dma_buf *dma_buf) -+{ -+ struct amdgpu_device *adev = dev->dev_private; -+ -+ if (dma_buf->ops == &drm_gem_prime_dmabuf_ops) { -+ struct drm_gem_object *obj = dma_buf->priv; -+ -+ if (obj->dev != dev && obj->dev->driver == dev->driver) { -+ /* It's a amdgpu_bo from a different driver instance */ -+ struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj); -+ -+ return amdgpu_gem_prime_foreign_bo(adev, bo); -+ } -+ } -+ -+ return drm_gem_prime_import(dev, dma_buf); -+} -+ --- -2.7.4 - |