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

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

drm/nouveau: remove dev_priv->init_state and friends 



Nouveau will no longer load at all if card initialisation fails, so all
these checks are unnecessary.

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

drivers/gpu/drm/nouveau/nouveau_bo.c

+1 −2
Original line number Diff line number Diff line
@@ -711,8 +711,7 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, bool intr, 
		return ret;



	/* Software copy if the card isn't up and running yet. */

	if (dev_priv->init_state != NOUVEAU_CARD_INIT_DONE ||

	    !dev_priv->channel) {

	if (!dev_priv->channel) {

		ret = ttm_bo_move_memcpy(bo, evict, no_wait_reserve, no_wait_gpu, new_mem);

		goto out;

	}

drivers/gpu/drm/nouveau/nouveau_channel.c

+0 −3
Original line number Diff line number Diff line
@@ -369,8 +369,6 @@ nouveau_ioctl_fifo_alloc(struct drm_device *dev, void *data, 
	struct nouveau_channel *chan;

	int ret;



	NOUVEAU_CHECK_INITIALISED_WITH_RETURN;



	if (dev_priv->engine.graph.accel_blocked)

		return -ENODEV;
@@ -419,7 +417,6 @@ nouveau_ioctl_fifo_free(struct drm_device *dev, void *data, 
	struct drm_nouveau_channel_free *cfree = data;

	struct nouveau_channel *chan;



	NOUVEAU_CHECK_INITIALISED_WITH_RETURN;

	NOUVEAU_GET_USER_CHANNEL_WITH_RETURN(cfree->channel, file_priv, chan);



	nouveau_channel_free(chan);

drivers/gpu/drm/nouveau/nouveau_drv.h

+0 −13
Original line number Diff line number Diff line
@@ -492,11 +492,6 @@ enum nouveau_card_type { 


struct drm_nouveau_private {

	struct drm_device *dev;

	enum {

		NOUVEAU_CARD_INIT_DOWN,

		NOUVEAU_CARD_INIT_DONE,

		NOUVEAU_CARD_INIT_FAILED

	} init_state;



	/* the card type, takes NV_* as values */

	enum nouveau_card_type card_type;
@@ -649,14 +644,6 @@ nouveau_bo_ref(struct nouveau_bo *ref, struct nouveau_bo **pnvbo) 
	return 0;

}



#define NOUVEAU_CHECK_INITIALISED_WITH_RETURN do {            \

	struct drm_nouveau_private *nv = dev->dev_private;    \

	if (nv->init_state != NOUVEAU_CARD_INIT_DONE) {       \

		NV_ERROR(dev, "called without init\n");       \

		return -EINVAL;                               \

	}                                                     \

} while (0)



#define NOUVEAU_GET_USER_CHANNEL_WITH_RETURN(id, cl, ch) do {    \

	struct drm_nouveau_private *nv = dev->dev_private;       \

	if (!nouveau_channel_owner(dev, (cl), (id))) {           \

drivers/gpu/drm/nouveau/nouveau_gem.c

+0 −9
Original line number Diff line number Diff line
@@ -137,8 +137,6 @@ nouveau_gem_ioctl_new(struct drm_device *dev, void *data, 
	uint32_t flags = 0;

	int ret = 0;



	NOUVEAU_CHECK_INITIALISED_WITH_RETURN;



	if (unlikely(dev_priv->ttm.bdev.dev_mapping == NULL))

		dev_priv->ttm.bdev.dev_mapping = dev_priv->dev->dev_mapping;
@@ -580,7 +578,6 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data, 
	struct nouveau_fence *fence = NULL;

	int i, j, ret = 0, do_reloc = 0;



	NOUVEAU_CHECK_INITIALISED_WITH_RETURN;

	NOUVEAU_GET_USER_CHANNEL_WITH_RETURN(req->channel, file_priv, chan);



	req->vram_available = dev_priv->fb_aper_free;
@@ -760,8 +757,6 @@ nouveau_gem_ioctl_cpu_prep(struct drm_device *dev, void *data, 
	bool no_wait = !!(req->flags & NOUVEAU_GEM_CPU_PREP_NOWAIT);

	int ret = -EINVAL;



	NOUVEAU_CHECK_INITIALISED_WITH_RETURN;



	gem = drm_gem_object_lookup(dev, file_priv, req->handle);

	if (!gem)

		return ret;
@@ -800,8 +795,6 @@ nouveau_gem_ioctl_cpu_fini(struct drm_device *dev, void *data, 
	struct nouveau_bo *nvbo;

	int ret = -EINVAL;



	NOUVEAU_CHECK_INITIALISED_WITH_RETURN;



	gem = drm_gem_object_lookup(dev, file_priv, req->handle);

	if (!gem)

		return ret;
@@ -827,8 +820,6 @@ nouveau_gem_ioctl_info(struct drm_device *dev, void *data, 
	struct drm_gem_object *gem;

	int ret;



	NOUVEAU_CHECK_INITIALISED_WITH_RETURN;



	gem = drm_gem_object_lookup(dev, file_priv, req->handle);

	if (!gem)

		return -EINVAL;

drivers/gpu/drm/nouveau/nouveau_notifier.c

+0 −1
Original line number Diff line number Diff line
@@ -184,7 +184,6 @@ nouveau_ioctl_notifier_alloc(struct drm_device *dev, void *data, 
	struct nouveau_channel *chan;

	int ret;



	NOUVEAU_CHECK_INITIALISED_WITH_RETURN;

	NOUVEAU_GET_USER_CHANNEL_WITH_RETURN(na->channel, file_priv, chan);



	ret = nouveau_notifier_alloc(chan, na->handle, na->size, &na->offset);