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

Commit 2703c21a authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nv50/gr: move to exec engine interfaces 



This needs a massive cleanup, but to catch bugs from the interface changes
vs the engine code cleanup, this will be done later.

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

drivers/gpu/drm/nouveau/nouveau_channel.c

+2 −1
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ nouveau_channel_put_unlocked(struct nouveau_channel **pchan) 


	/* destroy the engine specific contexts */

	pfifo->destroy_context(chan);

	if (pgraph->destroy_context)

		pgraph->destroy_context(chan);

	for (i = 0; i < NVOBJ_ENGINE_NR; i++) {

		if (chan->engctx[i])

drivers/gpu/drm/nouveau/nouveau_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state) 
	pfifo->reassign(dev, false);

	pfifo->disable(dev);

	pfifo->unload_context(dev);

	if (pgraph->unload_context)

		pgraph->unload_context(dev);



	ret = pinstmem->suspend(dev);

drivers/gpu/drm/nouveau/nouveau_drv.h

+1 −11
Original line number Diff line number Diff line
@@ -1189,18 +1189,8 @@ extern void nv40_grctx_init(struct nouveau_grctx *); 
extern void nv40_graph_set_tile_region(struct drm_device *dev, int i);



/* nv50_graph.c */

extern int  nv50_graph_init(struct drm_device *);

extern void nv50_graph_takedown(struct drm_device *);

extern void nv50_graph_fifo_access(struct drm_device *, bool);

extern struct nouveau_channel *nv50_graph_channel(struct drm_device *);

extern int  nv50_graph_create_context(struct nouveau_channel *);

extern void nv50_graph_destroy_context(struct nouveau_channel *);

extern int  nv50_graph_load_context(struct nouveau_channel *);

extern int  nv50_graph_unload_context(struct drm_device *);

extern int  nv50_graph_object_new(struct nouveau_channel *, u32, u16);

extern int  nv50_graph_create(struct drm_device *);

extern int  nv50_grctx_init(struct nouveau_grctx *);

extern void nv50_graph_tlb_flush(struct drm_device *dev);

extern void nv84_graph_tlb_flush(struct drm_device *dev);

extern struct nouveau_enum nv50_data_error_names[];



/* nvc0_graph.c */

drivers/gpu/drm/nouveau/nouveau_object.c

+13 −11
Original line number Diff line number Diff line
@@ -636,6 +636,7 @@ nouveau_gpuobj_gr_new(struct nouveau_channel *chan, u32 handle, int class) 
	return -EINVAL;



found:

	if (!dev_priv->eng[oc->engine]) {

		switch (oc->engine) {

		case NVOBJ_ENGINE_SW:

			return nouveau_gpuobj_sw_new(chan, handle, class);
@@ -649,6 +650,7 @@ nouveau_gpuobj_gr_new(struct nouveau_channel *chan, u32 handle, int class) 


			return pgraph->object_new(chan, handle, class);

		}

	}



	if (!chan->engctx[oc->engine]) {

		ret = dev_priv->eng[oc->engine]->context_new(chan, oc->engine);

drivers/gpu/drm/nouveau/nouveau_state.c

+10 −15
Original line number Diff line number Diff line
@@ -363,20 +363,10 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) 
		engine->timer.takedown		= nv04_timer_takedown;

		engine->fb.init			= nv50_fb_init;

		engine->fb.takedown		= nv50_fb_takedown;

		engine->graph.init		= nv50_graph_init;

		engine->graph.takedown		= nv50_graph_takedown;

		engine->graph.fifo_access	= nv50_graph_fifo_access;

		engine->graph.channel		= nv50_graph_channel;

		engine->graph.create_context	= nv50_graph_create_context;

		engine->graph.destroy_context	= nv50_graph_destroy_context;

		engine->graph.load_context	= nv50_graph_load_context;

		engine->graph.unload_context	= nv50_graph_unload_context;

		engine->graph.object_new	= nv50_graph_object_new;

		if (dev_priv->chipset == 0x50 ||

		    dev_priv->chipset == 0xac)

			engine->graph.tlb_flush	= nv50_graph_tlb_flush;

		else

			engine->graph.tlb_flush	= nv84_graph_tlb_flush;

		engine->graph.init		= nouveau_stub_init;

		engine->graph.takedown		= nouveau_stub_takedown;

		engine->graph.fifo_access	= nvc0_graph_fifo_access;

		engine->graph.channel		= nvc0_graph_channel;

		engine->fifo.channels		= 128;

		engine->fifo.init		= nv50_fifo_init;

		engine->fifo.takedown		= nv50_fifo_takedown;
@@ -635,6 +625,9 @@ nouveau_card_init(struct drm_device *dev) 
	if (ret)

		goto out_timer;



	if (dev_priv->card_type == NV_50)

		nv50_graph_create(dev);



	switch (dev_priv->chipset) {

	case 0x84:

	case 0x86:
@@ -712,6 +705,8 @@ nouveau_card_init(struct drm_device *dev) 
out_engine:

	if (!nouveau_noaccel) {

		for (e = e - 1; e >= 0; e--) {

			if (!dev_priv->eng[e])

				continue;

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

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

		}