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

Commit 586ae46d authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nvc0/copy: use nouveau_falcon base class 



Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 8365f2fd

drivers/gpu/drm/nouveau/core/engine/copy/nvc0.c

+53 −73
Original line number Diff line number Diff line
@@ -22,10 +22,9 @@ 
 * Authors: Ben Skeggs

 */



#include <core/os.h>

#include <core/enum.h>

#include <core/falcon.h>

#include <core/class.h>

#include <core/engctx.h>

#include <core/enum.h>



#include <engine/fifo.h>

#include <engine/copy.h>
@@ -33,11 +32,11 @@ 
#include "fuc/nvc0.fuc.h"



struct nvc0_copy_priv {

	struct nouveau_copy base;

	struct nouveau_falcon base;

};



struct nvc0_copy_chan {

	struct nouveau_copy_chan base;

	struct nouveau_falcon_chan base;

};



/*******************************************************************************
@@ -69,7 +68,7 @@ nvc0_copy_context_ctor(struct nouveau_object *parent, 
	struct nvc0_copy_chan *priv;

	int ret;



	ret = nouveau_copy_context_create(parent, engine, oclass, NULL, 256,

	ret = nouveau_falcon_context_create(parent, engine, oclass, NULL, 256,

					    256, NVOBJ_FLAG_ZERO_ALLOC, &priv);

	*pobject = nv_object(priv);

	if (ret)
@@ -81,11 +80,11 @@ nvc0_copy_context_ctor(struct nouveau_object *parent, 
static struct nouveau_ofuncs

nvc0_copy_context_ofuncs = {

	.ctor = nvc0_copy_context_ctor,

	.dtor = _nouveau_copy_context_dtor,

	.init = _nouveau_copy_context_init,

	.fini = _nouveau_copy_context_fini,

	.rd32 = _nouveau_copy_context_rd32,

	.wr32 = _nouveau_copy_context_wr32,

	.dtor = _nouveau_falcon_context_dtor,

	.init = _nouveau_falcon_context_init,

	.fini = _nouveau_falcon_context_fini,

	.rd32 = _nouveau_falcon_context_rd32,

	.wr32 = _nouveau_falcon_context_wr32,

};



static struct nouveau_oclass
@@ -117,17 +116,16 @@ nvc0_copy_intr(struct nouveau_subdev *subdev) 
	struct nouveau_fifo *pfifo = nouveau_fifo(subdev);

	struct nouveau_engine *engine = nv_engine(subdev);

	struct nouveau_object *engctx;

	int idx = nv_engidx(nv_object(subdev)) - NVDEV_ENGINE_COPY0;

	struct nvc0_copy_priv *priv = (void *)subdev;

	u32 disp = nv_rd32(priv, 0x10401c + (idx * 0x1000));

	u32 intr = nv_rd32(priv, 0x104008 + (idx * 0x1000));

	u32 disp = nv_ro32(priv, 0x01c);

	u32 intr = nv_ro32(priv, 0x008);

	u32 stat = intr & disp & ~(disp >> 16);

	u64 inst = nv_rd32(priv, 0x104050 + (idx * 0x1000)) & 0x0fffffff;

	u32 ssta = nv_rd32(priv, 0x104040 + (idx * 0x1000)) & 0x0000ffff;

	u32 addr = nv_rd32(priv, 0x104040 + (idx * 0x1000)) >> 16;

	u64 inst = nv_ro32(priv, 0x050) & 0x0fffffff;

	u32 ssta = nv_ro32(priv, 0x040) & 0x0000ffff;

	u32 addr = nv_ro32(priv, 0x040) >> 16;

	u32 mthd = (addr & 0x07ff) << 2;

	u32 subc = (addr & 0x3800) >> 11;

	u32 data = nv_rd32(priv, 0x104044 + (idx * 0x1000));

	u32 data = nv_ro32(priv, 0x044);

	int chid;



	engctx = nouveau_engctx_get(engine, inst);
@@ -138,18 +136,32 @@ nvc0_copy_intr(struct nouveau_subdev *subdev) 
		nouveau_enum_print(nvc0_copy_isr_error_name, ssta);

		printk("] ch %d [0x%010llx] subc %d mthd 0x%04x data 0x%08x\n",

		       chid, (u64)inst << 12, subc, mthd, data);

		nv_wr32(priv, 0x104004 + (idx * 0x1000), 0x00000040);

		nv_wo32(priv, 0x004, 0x00000040);

		stat &= ~0x00000040;

	}



	if (stat) {

		nv_error(priv, "unhandled intr 0x%08x\n", stat);

		nv_wr32(priv, 0x104004 + (idx * 0x1000), stat);

		nv_wo32(priv, 0x004, stat);

	}



	nouveau_engctx_put(engctx);

}



static int

nvc0_copy_init(struct nouveau_object *object)

{

	struct nvc0_copy_priv *priv = (void *)object;

	int ret;



	ret = nouveau_falcon_init(&priv->base);

	if (ret)

		return ret;



	nv_wo32(priv, 0x084, nv_engidx(object) - NVDEV_ENGINE_COPY0);

	return 0;

}



static int

nvc0_copy0_ctor(struct nouveau_object *parent, struct nouveau_object *engine,

		struct nouveau_oclass *oclass, void *data, u32 size,
@@ -161,7 +173,8 @@ nvc0_copy0_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	if (nv_rd32(parent, 0x022500) & 0x00000100)

		return -ENODEV;



	ret = nouveau_copy_create(parent, engine, oclass, true, 0, &priv);

	ret = nouveau_falcon_create(parent, engine, oclass, 0x104000, true,

				    "PCE0", "copy0", &priv);

	*pobject = nv_object(priv);

	if (ret)

		return ret;
@@ -170,6 +183,10 @@ nvc0_copy0_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	nv_subdev(priv)->intr = nvc0_copy_intr;

	nv_engine(priv)->cclass = &nvc0_copy0_cclass;

	nv_engine(priv)->sclass = nvc0_copy0_sclass;

	nv_falcon(priv)->code.data = nvc0_pcopy_code;

	nv_falcon(priv)->code.size = sizeof(nvc0_pcopy_code);

	nv_falcon(priv)->data.data = nvc0_pcopy_data;

	nv_falcon(priv)->data.size = sizeof(nvc0_pcopy_data);

	return 0;

}
@@ -184,7 +201,8 @@ nvc0_copy1_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	if (nv_rd32(parent, 0x022500) & 0x00000200)

		return -ENODEV;



	ret = nouveau_copy_create(parent, engine, oclass, true, 1, &priv);

	ret = nouveau_falcon_create(parent, engine, oclass, 0x105000, true,

				    "PCE1", "copy1", &priv);

	*pobject = nv_object(priv);

	if (ret)

		return ret;
@@ -193,63 +211,23 @@ nvc0_copy1_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	nv_subdev(priv)->intr = nvc0_copy_intr;

	nv_engine(priv)->cclass = &nvc0_copy1_cclass;

	nv_engine(priv)->sclass = nvc0_copy1_sclass;

	nv_falcon(priv)->code.data = nvc0_pcopy_code;

	nv_falcon(priv)->code.size = sizeof(nvc0_pcopy_code);

	nv_falcon(priv)->data.data = nvc0_pcopy_data;

	nv_falcon(priv)->data.size = sizeof(nvc0_pcopy_data);

	return 0;

}



static int

nvc0_copy_init(struct nouveau_object *object)

{

	int idx = nv_engidx(object) - NVDEV_ENGINE_COPY0;

	struct nvc0_copy_priv *priv = (void *)object;

	int ret, i;



	ret = nouveau_copy_init(&priv->base);

	if (ret)

		return ret;



	/* disable all interrupts */

	nv_wr32(priv, 0x104014 + (idx * 0x1000), 0xffffffff);



	/* upload ucode */

	nv_wr32(priv, 0x1041c0 + (idx * 0x1000), 0x01000000);

	for (i = 0; i < sizeof(nvc0_pcopy_data) / 4; i++)

		nv_wr32(priv, 0x1041c4 + (idx * 0x1000), nvc0_pcopy_data[i]);



	nv_wr32(priv, 0x104180 + (idx * 0x1000), 0x01000000);

	for (i = 0; i < sizeof(nvc0_pcopy_code) / 4; i++) {

		if ((i & 0x3f) == 0)

			nv_wr32(priv, 0x104188 + (idx * 0x1000), i >> 6);

		nv_wr32(priv, 0x104184 + (idx * 0x1000), nvc0_pcopy_code[i]);

	}



	/* start it running */

	nv_wr32(priv, 0x104084 + (idx * 0x1000), idx);

	nv_wr32(priv, 0x10410c + (idx * 0x1000), 0x00000000);

	nv_wr32(priv, 0x104104 + (idx * 0x1000), 0x00000000); /* ENTRY */

	nv_wr32(priv, 0x104100 + (idx * 0x1000), 0x00000002); /* TRIGGER */

	return 0;

}



static int

nvc0_copy_fini(struct nouveau_object *object, bool suspend)

{

	int idx = nv_engidx(object) - NVDEV_ENGINE_COPY0;

	struct nvc0_copy_priv *priv = (void *)object;



	nv_mask(priv, 0x104048 + (idx * 0x1000), 0x00000003, 0x00000000);

	nv_wr32(priv, 0x104014 + (idx * 0x1000), 0xffffffff);



	return nouveau_copy_fini(&priv->base, suspend);

}



struct nouveau_oclass

nvc0_copy0_oclass = {

	.handle = NV_ENGINE(COPY0, 0xc0),

	.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = nvc0_copy0_ctor,

		.dtor = _nouveau_copy_dtor,

		.dtor = _nouveau_falcon_dtor,

		.init = nvc0_copy_init,

		.fini = nvc0_copy_fini,

		.fini = _nouveau_falcon_fini,

		.rd32 = _nouveau_falcon_rd32,

		.wr32 = _nouveau_falcon_wr32,

	},

};
@@ -258,8 +236,10 @@ nvc0_copy1_oclass = { 
	.handle = NV_ENGINE(COPY1, 0xc0),

	.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = nvc0_copy1_ctor,

		.dtor = _nouveau_copy_dtor,

		.dtor = _nouveau_falcon_dtor,

		.init = nvc0_copy_init,

		.fini = nvc0_copy_fini,

		.fini = _nouveau_falcon_fini,

		.rd32 = _nouveau_falcon_rd32,

		.wr32 = _nouveau_falcon_wr32,

	},

};