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

Commit 1af7c7dd authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Dave Airlie
Browse files

drm/nouveau: implement prime helper unpin function 



Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
Acked-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 280cf211

drivers/gpu/drm/nouveau/nouveau_drm.c

+1 −0
Original line number Diff line number Diff line
@@ -702,6 +702,7 @@ driver = { 
	.gem_prime_export = drm_gem_prime_export,

	.gem_prime_import = drm_gem_prime_import,

	.gem_prime_pin = nouveau_gem_prime_pin,

	.gem_prime_unpin = nouveau_gem_prime_unpin,

	.gem_prime_get_sg_table = nouveau_gem_prime_get_sg_table,

	.gem_prime_import_sg_table = nouveau_gem_prime_import_sg_table,

	.gem_prime_vmap = nouveau_gem_prime_vmap,

drivers/gpu/drm/nouveau/nouveau_gem.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ extern int nouveau_gem_ioctl_info(struct drm_device *, void *, 
				  struct drm_file *);



extern int nouveau_gem_prime_pin(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 *);

drivers/gpu/drm/nouveau/nouveau_prime.c

+8 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ struct drm_gem_object *nouveau_gem_prime_import_sg_table(struct drm_device *dev, 
int nouveau_gem_prime_pin(struct drm_gem_object *obj)

{

	struct nouveau_bo *nvbo = nouveau_gem_object(obj);

	int ret = 0;

	int ret;



	/* pin buffer into GTT */

	ret = nouveau_bo_pin(nvbo, TTM_PL_FLAG_TT);
@@ -93,3 +93,10 @@ int nouveau_gem_prime_pin(struct drm_gem_object *obj) 


	return 0;

}



void nouveau_gem_prime_unpin(struct drm_gem_object *obj)

{

	struct nouveau_bo *nvbo = nouveau_gem_object(obj);



	nouveau_bo_unpin(nvbo);

}