Commit 62742b5e authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fifo: add chan bind()/unbind() 



- stops programming (non-existent) runl id field on bind(), from maxwell

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent 3a6bc9c2

drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ struct nvkm_cctx { 
};



struct nvkm_chan_func {

	void (*bind)(struct nvkm_chan *);

	void (*unbind)(struct nvkm_chan *);



	void *(*dtor)(struct nvkm_fifo_chan *);

	void (*init)(struct nvkm_fifo_chan *);

	void (*fini)(struct nvkm_fifo_chan *);

drivers/gpu/drm/nouveau/nvkm/engine/fifo/chang84.c

+1 −14
Original line number Diff line number Diff line
@@ -166,23 +166,10 @@ g84_fifo_chan_object_ctor(struct nvkm_fifo_chan *base, 
	return nvkm_ramht_insert(chan->ramht, object, 0, 4, handle, context);

}



static void

g84_fifo_chan_init(struct nvkm_fifo_chan *base)

{

	struct nv50_fifo_chan *chan = nv50_fifo_chan(base);

	struct nv50_fifo *fifo = chan->fifo;

	struct nvkm_device *device = fifo->base.engine.subdev.device;

	u64 addr = chan->ramfc->addr >> 8;

	u32 chid = chan->base.chid;



	nvkm_wr32(device, 0x002600 + (chid * 4), 0x80000000 | addr);

	nv50_fifo_runlist_update(fifo);

}



static const struct nvkm_fifo_chan_func

g84_fifo_chan_func = {

	.dtor = nv50_fifo_chan_dtor,

	.init = g84_fifo_chan_init,

	.init = nv50_fifo_chan_init,

	.fini = nv50_fifo_chan_fini,

	.engine_ctor = g84_fifo_chan_engine_ctor,

	.engine_dtor = nv50_fifo_chan_engine_dtor,

drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv50.c

+2 −4
Original line number Diff line number Diff line
@@ -194,19 +194,17 @@ nv50_fifo_chan_fini(struct nvkm_fifo_chan *base) 
	/* remove channel from runlist, fifo will unload context */

	nvkm_mask(device, 0x002600 + (chid * 4), 0x80000000, 0x00000000);

	nv50_fifo_runlist_update(fifo);

	nvkm_wr32(device, 0x002600 + (chid * 4), 0x00000000);

}



static void

void

nv50_fifo_chan_init(struct nvkm_fifo_chan *base)

{

	struct nv50_fifo_chan *chan = nv50_fifo_chan(base);

	struct nv50_fifo *fifo = chan->fifo;

	struct nvkm_device *device = fifo->base.engine.subdev.device;

	u64 addr = chan->ramfc->addr >> 12;

	u32 chid = chan->base.chid;



	nvkm_wr32(device, 0x002600 + (chid * 4), 0x80000000 | addr);

	nvkm_mask(device, 0x002600 + (chid * 4), 0x80000000, 0x80000000);

	nv50_fifo_runlist_update(fifo);

}

drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv50.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ struct nv50_fifo_chan { 
int nv50_fifo_chan_ctor(struct nv50_fifo *, u64 vmm, u64 push,

			const struct nvkm_oclass *, struct nv50_fifo_chan *);

void *nv50_fifo_chan_dtor(struct nvkm_fifo_chan *);

void nv50_fifo_chan_init(struct nvkm_fifo_chan *);

void nv50_fifo_chan_fini(struct nvkm_fifo_chan *);

struct nvkm_gpuobj **nv50_fifo_chan_engine(struct nv50_fifo_chan *, struct nvkm_engine *);

void nv50_fifo_chan_engine_dtor(struct nvkm_fifo_chan *, struct nvkm_engine *);

drivers/gpu/drm/nouveau/nvkm/engine/fifo/g84.c

+13 −0
Original line number Diff line number Diff line
@@ -21,16 +21,29 @@ 
 *

 * Authors: Ben Skeggs

 */

#include "cgrp.h"

#include "chan.h"

#include "runl.h"



#include <core/gpuobj.h>



#include "nv50.h"

#include "channv50.h"



#include <nvif/class.h>



static void

g84_chan_bind(struct nvkm_chan *chan)

{

	struct nvkm_device *device = chan->cgrp->runl->fifo->engine.subdev.device;



	nvkm_wr32(device, 0x002600 + (chan->id * 4), nv50_fifo_chan(chan)->ramfc->addr >> 8);

}



const struct nvkm_chan_func

g84_chan = {

	.bind = g84_chan_bind,

	.unbind = nv50_chan_unbind,

};



const struct nvkm_engn_func