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

Commit 67b342ef authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fifo: remove all the "special" engine hooks 



All the places this stuff is actually needed tends to be chipset-specific
anyway, so we're able to just inline the register bashing instead.

The parts of the common code that still directly touch PFIFO temporarily
have conditionals, these will be removed in subsequent commits that will
refactor the fifo modules into engine modules like graph/mpeg etc.

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

drivers/gpu/drm/nouveau/nouveau_channel.c

+8 −4
Original line number Diff line number Diff line
@@ -190,7 +190,8 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret, 
		chan->user_get_hi = 0x60;



	/* disable the fifo caches */

	pfifo->reassign(dev, false);

	if (dev_priv->card_type < NV_C0)

		nv_wr32(dev, NV03_PFIFO_CACHES, 0);



	/* Construct initial RAMFC for new channel */

	ret = pfifo->create_context(chan);
@@ -199,7 +200,8 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret, 
		return ret;

	}



	pfifo->reassign(dev, true);

	if (dev_priv->card_type < NV_C0)

		nv_wr32(dev, NV03_PFIFO_CACHES, 1);



	/* Insert NOPs for NOUVEAU_DMA_SKIPS */

	ret = RING_SPACE(chan, NOUVEAU_DMA_SKIPS);
@@ -304,7 +306,8 @@ nouveau_channel_put_unlocked(struct nouveau_channel **pchan) 
	nouveau_channel_idle(chan);



	/* boot it off the hardware */

	pfifo->reassign(dev, false);

	if (dev_priv->card_type < NV_C0)

		nv_wr32(dev, NV03_PFIFO_CACHES, 0);



	/* destroy the engine specific contexts */

	for (i = NVOBJ_ENGINE_NR - 1; i >= 0; i--) {
@@ -315,7 +318,8 @@ nouveau_channel_put_unlocked(struct nouveau_channel **pchan) 
			pfifo->destroy_context(chan);

	}



	pfifo->reassign(dev, true);

	if (dev_priv->card_type < NV_C0)

		nv_wr32(dev, NV03_PFIFO_CACHES, 1);



	/* aside from its resources, the channel should now be dead,

	 * remove it from the channel list

drivers/gpu/drm/nouveau/nouveau_drv.c

+11 −4
Original line number Diff line number Diff line
@@ -221,8 +221,12 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state) 
			nouveau_channel_idle(chan);

	}



	pfifo->reassign(dev, false);

	pfifo->disable(dev);

	if (dev_priv->card_type < NV_C0) {

		nv_wr32(dev, NV03_PFIFO_CACHES, 0);

		nv_mask(dev, NV04_PFIFO_CACHE1_DMA_PUSH, 0x00000001, 0);

		nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH0, 0);

		nv_mask(dev, NV04_PFIFO_CACHE1_PULL0, 0x00000001, 0);

	}

	pfifo->unload_context(dev);



	for (e = NVOBJ_ENGINE_NR - 1; e >= 0; e--) {
@@ -265,8 +269,11 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state) 
		if (dev_priv->eng[e])

			dev_priv->eng[e]->init(dev, e);

	}

	pfifo->enable(dev);

	pfifo->reassign(dev, true);

	if (dev_priv->card_type < NV_C0) {

		nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH0, 1);

		nv_wr32(dev, NV04_PFIFO_CACHE1_PULL0, 1);

		nv_wr32(dev, NV03_PFIFO_CACHES, 1);

	}

	return ret;

}

drivers/gpu/drm/nouveau/nouveau_drv.h

+1 −20
Original line number Diff line number Diff line
@@ -357,13 +357,6 @@ struct nouveau_fifo_engine { 
	int  (*init)(struct drm_device *);

	void (*takedown)(struct drm_device *);



	void (*disable)(struct drm_device *);

	void (*enable)(struct drm_device *);

	bool (*reassign)(struct drm_device *, bool enable);

	bool (*cache_pull)(struct drm_device *dev, bool enable);



	int  (*channel_id)(struct drm_device *);



	int  (*create_context)(struct nouveau_channel *);

	void (*destroy_context)(struct nouveau_channel *);

	int  (*load_context)(struct nouveau_channel *);
@@ -1193,20 +1186,15 @@ extern void nvc0_fb_takedown(struct drm_device *); 
/* nv04_fifo.c */

extern int  nv04_fifo_init(struct drm_device *);

extern void nv04_fifo_fini(struct drm_device *);

extern void nv04_fifo_disable(struct drm_device *);

extern void nv04_fifo_enable(struct drm_device *);

extern bool nv04_fifo_reassign(struct drm_device *, bool);

extern bool nv04_fifo_cache_pull(struct drm_device *, bool);

extern int  nv04_fifo_channel_id(struct drm_device *);

extern int  nv04_fifo_create_context(struct nouveau_channel *);

extern void nv04_fifo_destroy_context(struct nouveau_channel *);

extern int  nv04_fifo_load_context(struct nouveau_channel *);

extern int  nv04_fifo_unload_context(struct drm_device *);

extern void nv04_fifo_isr(struct drm_device *);

bool nv04_fifo_cache_pull(struct drm_device *, bool enable);



/* nv10_fifo.c */

extern int  nv10_fifo_init(struct drm_device *);

extern int  nv10_fifo_channel_id(struct drm_device *);

extern int  nv10_fifo_create_context(struct nouveau_channel *);

extern int  nv10_fifo_load_context(struct nouveau_channel *);

extern int  nv10_fifo_unload_context(struct drm_device *);
@@ -1220,7 +1208,6 @@ extern int nv40_fifo_unload_context(struct drm_device *); 
/* nv50_fifo.c */

extern int  nv50_fifo_init(struct drm_device *);

extern void nv50_fifo_takedown(struct drm_device *);

extern int  nv50_fifo_channel_id(struct drm_device *);

extern int  nv50_fifo_create_context(struct nouveau_channel *);

extern void nv50_fifo_destroy_context(struct nouveau_channel *);

extern int  nv50_fifo_load_context(struct nouveau_channel *);
@@ -1230,11 +1217,6 @@ extern void nv50_fifo_tlb_flush(struct drm_device *dev); 
/* nvc0_fifo.c */

extern int  nvc0_fifo_init(struct drm_device *);

extern void nvc0_fifo_takedown(struct drm_device *);

extern void nvc0_fifo_disable(struct drm_device *);

extern void nvc0_fifo_enable(struct drm_device *);

extern bool nvc0_fifo_reassign(struct drm_device *, bool);

extern bool nvc0_fifo_cache_pull(struct drm_device *, bool);

extern int  nvc0_fifo_channel_id(struct drm_device *);

extern int  nvc0_fifo_create_context(struct nouveau_channel *);

extern void nvc0_fifo_destroy_context(struct nouveau_channel *);

extern int  nvc0_fifo_load_context(struct nouveau_channel *);
@@ -1243,7 +1225,6 @@ extern int nvc0_fifo_unload_context(struct drm_device *); 
/* nve0_fifo.c */

extern int  nve0_fifo_init(struct drm_device *);

extern void nve0_fifo_takedown(struct drm_device *);

extern int  nve0_fifo_channel_id(struct drm_device *);

extern int  nve0_fifo_create_context(struct nouveau_channel *);

extern void nve0_fifo_destroy_context(struct nouveau_channel *);

extern int  nve0_fifo_unload_context(struct drm_device *);

drivers/gpu/drm/nouveau/nouveau_mem.c

+4 −5
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ nv10_mem_update_tile_region(struct drm_device *dev, 
			    uint32_t size, uint32_t pitch, uint32_t flags)

{

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo;

	struct nouveau_fb_engine *pfb = &dev_priv->engine.fb;

	int i = tile - dev_priv->tile.reg, j;

	unsigned long save;
@@ -65,8 +64,8 @@ nv10_mem_update_tile_region(struct drm_device *dev, 
		pfb->init_tile_region(dev, i, addr, size, pitch, flags);



	spin_lock_irqsave(&dev_priv->context_switch_lock, save);

	pfifo->reassign(dev, false);

	pfifo->cache_pull(dev, false);

	nv_wr32(dev, NV03_PFIFO_CACHES, 0);

	nv04_fifo_cache_pull(dev, false);



	nouveau_wait_for_idle(dev);
@@ -76,8 +75,8 @@ nv10_mem_update_tile_region(struct drm_device *dev, 
			dev_priv->eng[j]->set_tile_region(dev, i);

	}



	pfifo->cache_pull(dev, true);

	pfifo->reassign(dev, true);

	nv04_fifo_cache_pull(dev, true);

	nv_wr32(dev, NV03_PFIFO_CACHES, 1);

	spin_unlock_irqrestore(&dev_priv->context_switch_lock, save);

}

drivers/gpu/drm/nouveau/nouveau_state.c

+0 −41
Original line number Diff line number Diff line
@@ -71,11 +71,6 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) 
		engine->fifo.channels		= 16;

		engine->fifo.init		= nv04_fifo_init;

		engine->fifo.takedown		= nv04_fifo_fini;

		engine->fifo.disable		= nv04_fifo_disable;

		engine->fifo.enable		= nv04_fifo_enable;

		engine->fifo.reassign		= nv04_fifo_reassign;

		engine->fifo.cache_pull		= nv04_fifo_cache_pull;

		engine->fifo.channel_id		= nv04_fifo_channel_id;

		engine->fifo.create_context	= nv04_fifo_create_context;

		engine->fifo.destroy_context	= nv04_fifo_destroy_context;

		engine->fifo.load_context	= nv04_fifo_load_context;
@@ -116,11 +111,6 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) 
		engine->fifo.channels		= 32;

		engine->fifo.init		= nv10_fifo_init;

		engine->fifo.takedown		= nv04_fifo_fini;

		engine->fifo.disable		= nv04_fifo_disable;

		engine->fifo.enable		= nv04_fifo_enable;

		engine->fifo.reassign		= nv04_fifo_reassign;

		engine->fifo.cache_pull		= nv04_fifo_cache_pull;

		engine->fifo.channel_id		= nv10_fifo_channel_id;

		engine->fifo.create_context	= nv10_fifo_create_context;

		engine->fifo.destroy_context	= nv04_fifo_destroy_context;

		engine->fifo.load_context	= nv10_fifo_load_context;
@@ -167,11 +157,6 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) 
		engine->fifo.channels		= 32;

		engine->fifo.init		= nv10_fifo_init;

		engine->fifo.takedown		= nv04_fifo_fini;

		engine->fifo.disable		= nv04_fifo_disable;

		engine->fifo.enable		= nv04_fifo_enable;

		engine->fifo.reassign		= nv04_fifo_reassign;

		engine->fifo.cache_pull		= nv04_fifo_cache_pull;

		engine->fifo.channel_id		= nv10_fifo_channel_id;

		engine->fifo.create_context	= nv10_fifo_create_context;

		engine->fifo.destroy_context	= nv04_fifo_destroy_context;

		engine->fifo.load_context	= nv10_fifo_load_context;
@@ -214,11 +199,6 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) 
		engine->fifo.channels		= 32;

		engine->fifo.init		= nv10_fifo_init;

		engine->fifo.takedown		= nv04_fifo_fini;

		engine->fifo.disable		= nv04_fifo_disable;

		engine->fifo.enable		= nv04_fifo_enable;

		engine->fifo.reassign		= nv04_fifo_reassign;

		engine->fifo.cache_pull		= nv04_fifo_cache_pull;

		engine->fifo.channel_id		= nv10_fifo_channel_id;

		engine->fifo.create_context	= nv10_fifo_create_context;

		engine->fifo.destroy_context	= nv04_fifo_destroy_context;

		engine->fifo.load_context	= nv10_fifo_load_context;
@@ -264,11 +244,6 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) 
		engine->fifo.channels		= 32;

		engine->fifo.init		= nv40_fifo_init;

		engine->fifo.takedown		= nv04_fifo_fini;

		engine->fifo.disable		= nv04_fifo_disable;

		engine->fifo.enable		= nv04_fifo_enable;

		engine->fifo.reassign		= nv04_fifo_reassign;

		engine->fifo.cache_pull		= nv04_fifo_cache_pull;

		engine->fifo.channel_id		= nv10_fifo_channel_id;

		engine->fifo.create_context	= nv40_fifo_create_context;

		engine->fifo.destroy_context	= nv04_fifo_destroy_context;

		engine->fifo.load_context	= nv40_fifo_load_context;
@@ -322,10 +297,6 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) 
		engine->fifo.channels		= 128;

		engine->fifo.init		= nv50_fifo_init;

		engine->fifo.takedown		= nv50_fifo_takedown;

		engine->fifo.disable		= nv04_fifo_disable;

		engine->fifo.enable		= nv04_fifo_enable;

		engine->fifo.reassign		= nv04_fifo_reassign;

		engine->fifo.channel_id		= nv50_fifo_channel_id;

		engine->fifo.create_context	= nv50_fifo_create_context;

		engine->fifo.destroy_context	= nv50_fifo_destroy_context;

		engine->fifo.load_context	= nv50_fifo_load_context;
@@ -397,10 +368,6 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) 
		engine->fifo.channels		= 128;

		engine->fifo.init		= nvc0_fifo_init;

		engine->fifo.takedown		= nvc0_fifo_takedown;

		engine->fifo.disable		= nvc0_fifo_disable;

		engine->fifo.enable		= nvc0_fifo_enable;

		engine->fifo.reassign		= nvc0_fifo_reassign;

		engine->fifo.channel_id		= nvc0_fifo_channel_id;

		engine->fifo.create_context	= nvc0_fifo_create_context;

		engine->fifo.destroy_context	= nvc0_fifo_destroy_context;

		engine->fifo.load_context	= nvc0_fifo_load_context;
@@ -450,10 +417,6 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) 
		engine->fifo.channels		= 128;

		engine->fifo.init		= nvc0_fifo_init;

		engine->fifo.takedown		= nvc0_fifo_takedown;

		engine->fifo.disable		= nvc0_fifo_disable;

		engine->fifo.enable		= nvc0_fifo_enable;

		engine->fifo.reassign		= nvc0_fifo_reassign;

		engine->fifo.channel_id		= nvc0_fifo_channel_id;

		engine->fifo.create_context	= nvc0_fifo_create_context;

		engine->fifo.destroy_context	= nvc0_fifo_destroy_context;

		engine->fifo.load_context	= nvc0_fifo_load_context;
@@ -501,10 +464,6 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) 
		engine->fifo.channels		= 4096;

		engine->fifo.init		= nve0_fifo_init;

		engine->fifo.takedown		= nve0_fifo_takedown;

		engine->fifo.disable		= nvc0_fifo_disable;

		engine->fifo.enable		= nvc0_fifo_enable;

		engine->fifo.reassign		= nvc0_fifo_reassign;

		engine->fifo.channel_id		= nve0_fifo_channel_id;

		engine->fifo.create_context	= nve0_fifo_create_context;

		engine->fifo.destroy_context	= nve0_fifo_destroy_context;

		engine->fifo.load_context	= nvc0_fifo_load_context;