Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5e9c1a2 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm: Pass dma-buf as argument to gem_prime_import_sg_table 



Allows importing dma_reservation_objects from a dma-buf.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
parent 15a996bb

drivers/gpu/drm/drm_gem_cma_helper.c

+4 −3
Original line number Diff line number Diff line
@@ -316,7 +316,8 @@ struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) 
EXPORT_SYMBOL_GPL(drm_gem_cma_prime_get_sg_table);



struct drm_gem_object *

drm_gem_cma_prime_import_sg_table(struct drm_device *dev, size_t size,

drm_gem_cma_prime_import_sg_table(struct drm_device *dev,

				  struct dma_buf_attachment *attach,

				  struct sg_table *sgt)

{

	struct drm_gem_cma_object *cma_obj;
@@ -325,14 +326,14 @@ drm_gem_cma_prime_import_sg_table(struct drm_device *dev, size_t size, 
		return ERR_PTR(-EINVAL);



	/* Create a CMA GEM buffer. */

	cma_obj = __drm_gem_cma_create(dev, size);

	cma_obj = __drm_gem_cma_create(dev, attach->dmabuf->size);

	if (IS_ERR(cma_obj))

		return ERR_CAST(cma_obj);



	cma_obj->paddr = sg_dma_address(sgt->sgl);

	cma_obj->sgt = sgt;



	DRM_DEBUG_PRIME("dma_addr = %pad, size = %zu\n", &cma_obj->paddr, size);

	DRM_DEBUG_PRIME("dma_addr = %pad, size = %zu\n", &cma_obj->paddr, attach->dmabuf->size);



	return &cma_obj->base;

}

drivers/gpu/drm/drm_prime.c

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev, 
		goto fail_detach;

	}



	obj = dev->driver->gem_prime_import_sg_table(dev, dma_buf->size, sgt);

	obj = dev->driver->gem_prime_import_sg_table(dev, attach, sgt);

	if (IS_ERR(obj)) {

		ret = PTR_ERR(obj);

		goto fail_unmap;

drivers/gpu/drm/msm/msm_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj); 
void *msm_gem_prime_vmap(struct drm_gem_object *obj);

void msm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);

struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev,

		size_t size, struct sg_table *sg);

		struct dma_buf_attachment *attach, struct sg_table *sg);

int msm_gem_prime_pin(struct drm_gem_object *obj);

void msm_gem_prime_unpin(struct drm_gem_object *obj);

void *msm_gem_vaddr_locked(struct drm_gem_object *obj);

drivers/gpu/drm/msm/msm_gem_prime.c

+3 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "msm_drv.h"

#include "msm_gem.h"



#include <linux/dma-buf.h>



struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj)

{
@@ -37,9 +38,9 @@ void msm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr) 
}



struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev,

		size_t size, struct sg_table *sg)

		struct dma_buf_attachment *attach, struct sg_table *sg)

{

	return msm_gem_import(dev, size, sg);

	return msm_gem_import(dev, attach->dmabuf->size, sg);

}



int msm_gem_prime_pin(struct drm_gem_object *obj)

drivers/gpu/drm/nouveau/nouveau_gem.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct reservation_object *nouveau_gem_prime_res_obj(struct drm_gem_object *); 
extern void nouveau_gem_prime_unpin(struct drm_gem_object *);

extern struct sg_table *nouveau_gem_prime_get_sg_table(struct drm_gem_object *);

extern struct drm_gem_object *nouveau_gem_prime_import_sg_table(

	struct drm_device *, size_t size, struct sg_table *);

	struct drm_device *, struct dma_buf_attachment *, struct sg_table *);

extern void *nouveau_gem_prime_vmap(struct drm_gem_object *);

extern void nouveau_gem_prime_vunmap(struct drm_gem_object *, void *);