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

Commit 7375c95b authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: remove 'chan' argument from nouveau_bo_new 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent e758a311

drivers/gpu/drm/nouveau/nouveau_bo.c

+3 −5
Original line number Diff line number Diff line
@@ -87,9 +87,9 @@ nouveau_bo_fixup_align(struct nouveau_bo *nvbo, u32 flags, 
}



int

nouveau_bo_new(struct drm_device *dev, struct nouveau_channel *chan,

	       int size, int align, uint32_t flags, uint32_t tile_mode,

	       uint32_t tile_flags, struct nouveau_bo **pnvbo)

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

	       uint32_t flags, uint32_t tile_mode, uint32_t tile_flags,

	       struct nouveau_bo **pnvbo)

{

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct nouveau_bo *nvbo;
@@ -123,7 +123,6 @@ nouveau_bo_new(struct drm_device *dev, struct nouveau_channel *chan, 
		}

	}



	nvbo->channel = chan;

	ret = ttm_bo_init(&dev_priv->ttm.bdev, &nvbo->bo, size,

			  ttm_bo_type_device, &nvbo->placement,

			  align >> PAGE_SHIFT, 0, false, NULL, size,
@@ -132,7 +131,6 @@ nouveau_bo_new(struct drm_device *dev, struct nouveau_channel *chan, 
		/* ttm will call nouveau_bo_del_ttm if it fails.. */

		return ret;

	}

	nvbo->channel = NULL;



	*pnvbo = nvbo;

	return 0;

drivers/gpu/drm/nouveau/nouveau_channel.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ nouveau_channel_pushbuf_init(struct nouveau_channel *chan) 
	int ret;



	/* allocate buffer object */

	ret = nouveau_bo_new(dev, NULL, 65536, 0, mem, 0, 0, &chan->pushbuf_bo);

	ret = nouveau_bo_new(dev, 65536, 0, mem, 0, 0, &chan->pushbuf_bo);

	if (ret)

		goto out;

drivers/gpu/drm/nouveau/nouveau_drv.h

+3 −4
Original line number Diff line number Diff line
@@ -1270,10 +1270,9 @@ extern int nv04_crtc_create(struct drm_device *, int index); 


/* nouveau_bo.c */

extern struct ttm_bo_driver nouveau_bo_driver;

extern int nouveau_bo_new(struct drm_device *, struct nouveau_channel *,

			  int size, int align, uint32_t flags,

			  uint32_t tile_mode, uint32_t tile_flags,

			  struct nouveau_bo **);

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

			  uint32_t flags, uint32_t tile_mode,

			  uint32_t tile_flags, struct nouveau_bo **);

extern int nouveau_bo_pin(struct nouveau_bo *, uint32_t flags);

extern int nouveau_bo_unpin(struct nouveau_bo *);

extern int nouveau_bo_map(struct nouveau_bo *);

drivers/gpu/drm/nouveau/nouveau_fence.c

+1 −1
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ nouveau_fence_init(struct drm_device *dev) 


	/* Create a shared VRAM heap for cross-channel sync. */

	if (USE_SEMA(dev)) {

		ret = nouveau_bo_new(dev, NULL, size, 0, TTM_PL_FLAG_VRAM,

		ret = nouveau_bo_new(dev, size, 0, TTM_PL_FLAG_VRAM,

				     0, 0, &dev_priv->fence.bo);

		if (ret)

			return ret;

drivers/gpu/drm/nouveau/nouveau_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ nouveau_gem_new(struct drm_device *dev, int size, int align, uint32_t domain, 
	if (!flags || domain & NOUVEAU_GEM_DOMAIN_CPU)

		flags |= TTM_PL_FLAG_SYSTEM;



	ret = nouveau_bo_new(dev, NULL, size, align, flags, tile_mode,

	ret = nouveau_bo_new(dev, size, align, flags, tile_mode,

			     tile_flags, pnvbo);

	if (ret)

		return ret;