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

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

drm/nouveau: export reservation_object from dmabuf to ttm 



Adds an extra argument to nouveau_bo_new, which is only used in nouveau_prime.c.

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

drivers/gpu/drm/nouveau/dispnv04/crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -1127,7 +1127,7 @@ nv04_crtc_create(struct drm_device *dev, int crtc_num) 
	drm_mode_crtc_set_gamma_size(&nv_crtc->base, 256);



	ret = nouveau_bo_new(dev, 64*64*4, 0x100, TTM_PL_FLAG_VRAM,

			     0, 0x0000, NULL, &nv_crtc->cursor.nvbo);

			     0, 0x0000, NULL, NULL, &nv_crtc->cursor.nvbo);

	if (!ret) {

		ret = nouveau_bo_pin(nv_crtc->cursor.nvbo, TTM_PL_FLAG_VRAM);

		if (!ret) {

drivers/gpu/drm/nouveau/nouveau_bo.c

+2 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ nouveau_bo_fixup_align(struct nouveau_bo *nvbo, u32 flags, 
int

nouveau_bo_new(struct drm_device *dev, int size, int align,

	       uint32_t flags, uint32_t tile_mode, uint32_t tile_flags,

	       struct sg_table *sg,

	       struct sg_table *sg, struct reservation_object *robj,

	       struct nouveau_bo **pnvbo)

{

	struct nouveau_drm *drm = nouveau_drm(dev);
@@ -230,7 +230,7 @@ nouveau_bo_new(struct drm_device *dev, int size, int align, 
	ret = ttm_bo_init(&drm->ttm.bdev, &nvbo->bo, size,

			  type, &nvbo->placement,

			  align >> PAGE_SHIFT, false, NULL, acc_size, sg,

			  NULL, nouveau_bo_del_ttm);

			  robj, nouveau_bo_del_ttm);

	if (ret) {

		/* ttm will call nouveau_bo_del_ttm if it fails.. */

		return ret;

drivers/gpu/drm/nouveau/nouveau_bo.h

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ extern struct ttm_bo_driver nouveau_bo_driver; 
void nouveau_bo_move_init(struct nouveau_drm *);

int  nouveau_bo_new(struct drm_device *, int size, int align, u32 flags,

		    u32 tile_mode, u32 tile_flags, struct sg_table *sg,

		    struct reservation_object *robj,

		    struct nouveau_bo **);

int  nouveau_bo_pin(struct nouveau_bo *, u32 flags);

int  nouveau_bo_unpin(struct nouveau_bo *);

drivers/gpu/drm/nouveau/nouveau_chan.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ nouveau_channel_prep(struct nouveau_drm *drm, struct nvif_device *device, 
	if (nouveau_vram_pushbuf)

		target = TTM_PL_FLAG_VRAM;



	ret = nouveau_bo_new(drm->dev, size, 0, target, 0, 0, NULL,

	ret = nouveau_bo_new(drm->dev, size, 0, target, 0, 0, NULL, NULL,

			    &chan->push.buffer);

	if (ret == 0) {

		ret = nouveau_bo_pin(chan->push.buffer, target);

drivers/gpu/drm/nouveau/nouveau_fence.c

+5 −1
Original line number Diff line number Diff line
@@ -216,8 +216,12 @@ nouveau_fence_work(struct fence *fence, 


	work = kmalloc(sizeof(*work), GFP_KERNEL);

	if (!work) {

		/*

		 * this might not be a nouveau fence any more,

		 * so force a lazy wait here

		 */

		WARN_ON(nouveau_fence_wait((struct nouveau_fence *)fence,

					   false, false));

					   true, false));

		goto err;

	}