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

Commit f6d4e621 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: remove 'chan' argument from nouveau_gem_new 



Userspace hasn't passed us a channel_hint for a long long time now, and
there isn't actually a need to do so anymore anyway.

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

drivers/gpu/drm/nouveau/nouveau_drv.h

+3 −4
Original line number Diff line number Diff line
@@ -1324,10 +1324,9 @@ static inline struct nouveau_fence *nouveau_fence_ref(struct nouveau_fence *obj) 
}



/* nouveau_gem.c */

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

			   int size, int align, uint32_t domain,

			   uint32_t tile_mode, uint32_t tile_flags,

			   struct nouveau_bo **);

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

			   uint32_t domain, uint32_t tile_mode,

			   uint32_t tile_flags, struct nouveau_bo **);

extern int nouveau_gem_object_new(struct drm_gem_object *);

extern void nouveau_gem_object_del(struct drm_gem_object *);

extern int nouveau_gem_ioctl_new(struct drm_device *, void *,

drivers/gpu/drm/nouveau/nouveau_fbcon.c

+2 −2
Original line number Diff line number Diff line
@@ -296,8 +296,8 @@ nouveau_fbcon_create(struct nouveau_fbdev *nfbdev, 
	size = mode_cmd.pitch * mode_cmd.height;

	size = roundup(size, PAGE_SIZE);



	ret = nouveau_gem_new(dev, dev_priv->channel, size, 0,

			      NOUVEAU_GEM_DOMAIN_VRAM, 0, 0x0000, &nvbo);

	ret = nouveau_gem_new(dev, size, 0, NOUVEAU_GEM_DOMAIN_VRAM,

			      0, 0x0000, &nvbo);

	if (ret) {

		NV_ERROR(dev, "failed to allocate framebuffer\n");

		goto out;

drivers/gpu/drm/nouveau/nouveau_gem.c

+5 −14
Original line number Diff line number Diff line
@@ -60,9 +60,9 @@ nouveau_gem_object_del(struct drm_gem_object *gem) 
}



int

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

		int size, int align, uint32_t domain, uint32_t tile_mode,

		uint32_t tile_flags, struct nouveau_bo **pnvbo)

nouveau_gem_new(struct drm_device *dev, int size, int align, uint32_t domain,

		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;
@@ -76,7 +76,7 @@ nouveau_gem_new(struct drm_device *dev, struct nouveau_channel *chan, 
	if (!flags || domain & NOUVEAU_GEM_DOMAIN_CPU)

		flags |= TTM_PL_FLAG_SYSTEM;



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

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

			     tile_flags, pnvbo);

	if (ret)

		return ret;
@@ -127,7 +127,6 @@ nouveau_gem_ioctl_new(struct drm_device *dev, void *data, 
	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct drm_nouveau_gem_new *req = data;

	struct nouveau_bo *nvbo = NULL;

	struct nouveau_channel *chan = NULL;

	int ret = 0;



	if (unlikely(dev_priv->ttm.bdev.dev_mapping == NULL))
@@ -138,17 +137,9 @@ nouveau_gem_ioctl_new(struct drm_device *dev, void *data, 
		return -EINVAL;

	}



	if (req->channel_hint) {

		chan = nouveau_channel_get(file_priv, req->channel_hint);

		if (IS_ERR(chan))

			return PTR_ERR(chan);

	}



	ret = nouveau_gem_new(dev, chan, req->info.size, req->align,

	ret = nouveau_gem_new(dev, req->info.size, req->align,

			      req->info.domain, req->info.tile_mode,

			      req->info.tile_flags, &nvbo);

	if (chan)

		nouveau_channel_put(&chan);

	if (ret)

		return ret;

drivers/gpu/drm/nouveau/nouveau_notifier.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ nouveau_notifier_init_channel(struct nouveau_channel *chan) 
		ttmpl = TTM_PL_FLAG_TT;

	}



	ret = nouveau_gem_new(dev, NULL, PAGE_SIZE, 0, flags, 0, 0, &ntfy);

	ret = nouveau_gem_new(dev, PAGE_SIZE, 0, flags, 0, 0, &ntfy);

	if (ret)

		return ret;