Commit 73529dff authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fifo: use type+inst to determine context pointer offsets 



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

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

+4 −4
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ g84_fifo_chan_ntfy(struct nvkm_fifo_chan *chan, u32 type, 
static int

g84_fifo_chan_engine_addr(struct nvkm_engine *engine)

{

	switch (engine->subdev.index) {

	switch (engine->subdev.type) {

	case NVKM_ENGINE_DMAOBJ:

	case NVKM_ENGINE_SW    : return -1;

	case NVKM_ENGINE_GR    : return 0x0020;
@@ -59,7 +59,7 @@ g84_fifo_chan_engine_addr(struct nvkm_engine *engine) 
	case NVKM_ENGINE_MSVLD : return 0x0080;

	case NVKM_ENGINE_CIPHER:

	case NVKM_ENGINE_SEC   : return 0x00a0;

	case NVKM_ENGINE_CE0   : return 0x00c0;

	case NVKM_ENGINE_CE    : return 0x00c0;

	default:

		WARN_ON(1);

		return -1;
@@ -157,14 +157,14 @@ g84_fifo_chan_object_ctor(struct nvkm_fifo_chan *base, 
	u32 handle = object->handle;

	u32 context;



	switch (object->engine->subdev.index) {

	switch (object->engine->subdev.type) {

	case NVKM_ENGINE_DMAOBJ:

	case NVKM_ENGINE_SW    : context = 0x00000000; break;

	case NVKM_ENGINE_GR    : context = 0x00100000; break;

	case NVKM_ENGINE_MPEG  :

	case NVKM_ENGINE_MSPPP : context = 0x00200000; break;

	case NVKM_ENGINE_ME    :

	case NVKM_ENGINE_CE0   : context = 0x00300000; break;

	case NVKM_ENGINE_CE    : context = 0x00300000; break;

	case NVKM_ENGINE_VP    :

	case NVKM_ENGINE_MSPDEC: context = 0x00400000; break;

	case NVKM_ENGINE_CIPHER:

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

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
static int

nv50_fifo_chan_engine_addr(struct nvkm_engine *engine)

{

	switch (engine->subdev.index) {

	switch (engine->subdev.type) {

	case NVKM_ENGINE_DMAOBJ:

	case NVKM_ENGINE_SW    : return -1;

	case NVKM_ENGINE_GR    : return 0x0000;
@@ -170,7 +170,7 @@ nv50_fifo_chan_object_ctor(struct nvkm_fifo_chan *base, 
	u32 handle = object->handle;

	u32 context;



	switch (object->engine->subdev.index) {

	switch (object->engine->subdev.type) {

	case NVKM_ENGINE_DMAOBJ:

	case NVKM_ENGINE_SW    : context = 0x00000000; break;

	case NVKM_ENGINE_GR    : context = 0x00100000; break;

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

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ nv04_fifo_dma_object_ctor(struct nvkm_fifo_chan *base, 
	u32 handle  = object->handle;

	int hash;



	switch (object->engine->subdev.index) {

	switch (object->engine->subdev.type) {

	case NVKM_ENGINE_DMAOBJ:

	case NVKM_ENGINE_SW    : context |= 0x00000000; break;

	case NVKM_ENGINE_GR    : context |= 0x00010000; break;

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

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
static bool

nv40_fifo_dma_engine(struct nvkm_engine *engine, u32 *reg, u32 *ctx)

{

	switch (engine->subdev.index) {

	switch (engine->subdev.type) {

	case NVKM_ENGINE_DMAOBJ:

	case NVKM_ENGINE_SW:

		return false;
@@ -157,7 +157,7 @@ nv40_fifo_dma_object_ctor(struct nvkm_fifo_chan *base, 
	u32 handle  = object->handle;

	int hash;



	switch (object->engine->subdev.index) {

	switch (object->engine->subdev.type) {

	case NVKM_ENGINE_DMAOBJ:

	case NVKM_ENGINE_SW    : context |= 0x00000000; break;

	case NVKM_ENGINE_GR    : context |= 0x00100000; break;

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

+2 −3
Original line number Diff line number Diff line
@@ -52,11 +52,10 @@ gf100_fifo_chan_ntfy(struct nvkm_fifo_chan *chan, u32 type, 
static u32

gf100_fifo_gpfifo_engine_addr(struct nvkm_engine *engine)

{

	switch (engine->subdev.index) {

	switch (engine->subdev.type) {

	case NVKM_ENGINE_SW    : return 0;

	case NVKM_ENGINE_GR    : return 0x0210;

	case NVKM_ENGINE_CE0   : return 0x0230;

	case NVKM_ENGINE_CE1   : return 0x0240;

	case NVKM_ENGINE_CE    : return 0x0230 + (engine->subdev.inst * 0x10);

	case NVKM_ENGINE_MSPDEC: return 0x0250;

	case NVKM_ENGINE_MSPPP : return 0x0260;

	case NVKM_ENGINE_MSVLD : return 0x0270;