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

Commit e6585cab authored by Ilia Mirkin's avatar Ilia Mirkin Committed by Ben Skeggs
Browse files

drm/nv31/mpeg: store chan singleton in engine, use it for dispatch 



This makes nv31+ able to actually perform the nv_call, since previously
the inst was not available.

Signed-off-by: default avatarIlia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 912de74c

drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c

+16 −11
Original line number Original line Diff line number Diff line
@@ -147,6 +147,8 @@ nv31_mpeg_context_ctor(struct nouveau_object *parent, 
	if (ret)

	if (ret)

		return ret;

		return ret;





	priv->chan = chan;



	return 0;

	return 0;

}

}
@@ -155,8 +157,11 @@ nv31_mpeg_context_dtor(struct nouveau_object *object) 
{

{

	struct nv31_mpeg_priv *priv = (void *)object->engine;

	struct nv31_mpeg_priv *priv = (void *)object->engine;

	struct nv31_mpeg_chan *chan = (void *)object;

	struct nv31_mpeg_chan *chan = (void *)object;

	atomic_dec(&priv->refcount);



	WARN_ON(priv->chan != chan);

	priv->chan = NULL;

	nouveau_object_destroy(&chan->base);

	nouveau_object_destroy(&chan->base);

	atomic_dec(&priv->refcount);

}

}





struct nouveau_oclass

struct nouveau_oclass
@@ -189,20 +194,19 @@ void 
nv31_mpeg_intr(struct nouveau_subdev *subdev)

nv31_mpeg_intr(struct nouveau_subdev *subdev)

{

{

	struct nouveau_fifo *pfifo = nouveau_fifo(subdev);

	struct nouveau_fifo *pfifo = nouveau_fifo(subdev);

	struct nouveau_engine *engine = nv_engine(subdev);

	struct nouveau_object *engctx;

	struct nouveau_handle *handle;

	struct nouveau_handle *handle;

	struct nv31_mpeg_priv *priv = (void *)subdev;

	struct nv31_mpeg_priv *priv = (void *)subdev;

	u32 inst = nv_rd32(priv, 0x00b318) & 0x000fffff;

	struct nouveau_object *engctx = &priv->chan->base;

	u32 stat = nv_rd32(priv, 0x00b100);

	u32 stat = nv_rd32(priv, 0x00b100);

	u32 type = nv_rd32(priv, 0x00b230);

	u32 type = nv_rd32(priv, 0x00b230);

	u32 mthd = nv_rd32(priv, 0x00b234);

	u32 mthd = nv_rd32(priv, 0x00b234);

	u32 data = nv_rd32(priv, 0x00b238);

	u32 data = nv_rd32(priv, 0x00b238);

	u32 show = stat;

	u32 show = stat;

	int chid;

	int chid = pfifo->chid(pfifo, engctx);





	engctx = nouveau_engctx_get(engine, inst);

	if (engctx)

	chid   = pfifo->chid(pfifo, engctx);

		if (nouveau_object_inc(engctx))

			engctx = NULL;





	if (stat & 0x01000000) {

	if (stat & 0x01000000) {

		/* happens on initial binding of the object */

		/* happens on initial binding of the object */
@@ -211,7 +215,7 @@ nv31_mpeg_intr(struct nouveau_subdev *subdev) 
			show &= ~0x01000000;

			show &= ~0x01000000;

		}

		}





		if (type == 0x00000010) {

		if (type == 0x00000010 && engctx) {

			handle = nouveau_handle_get_class(engctx, 0x3174);

			handle = nouveau_handle_get_class(engctx, 0x3174);

			if (handle && !nv_call(handle->object, mthd, data))

			if (handle && !nv_call(handle->object, mthd, data))

				show &= ~0x01000000;

				show &= ~0x01000000;
@@ -224,12 +228,13 @@ nv31_mpeg_intr(struct nouveau_subdev *subdev) 




	if (show) {

	if (show) {

		nv_error(priv,

		nv_error(priv,

			 "ch %d [0x%08x %s] 0x%08x 0x%08x 0x%08x 0x%08x\n",

			 "ch %d [%s] 0x%08x 0x%08x 0x%08x 0x%08x\n",

			 chid, inst << 4, nouveau_client_name(engctx), stat,

			 chid, nouveau_client_name(engctx), stat,

			 type, mthd, data);

			 type, mthd, data);

	}

	}





	nouveau_engctx_put(engctx);

	if (engctx)

		WARN_ON(nouveau_object_dec(engctx, false));

}

}





static int

static int

drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.h

+5 −4
Original line number Original line Diff line number Diff line
@@ -3,13 +3,14 @@ 




#include <engine/mpeg.h>

#include <engine/mpeg.h>





struct nv31_mpeg_chan {

	struct nouveau_object base;

};



struct nv31_mpeg_priv {

struct nv31_mpeg_priv {

	struct nouveau_mpeg base;

	struct nouveau_mpeg base;

	atomic_t refcount;

	atomic_t refcount;

};

	struct nv31_mpeg_chan *chan;



struct nv31_mpeg_chan {

	struct nouveau_object base;

};

};





#endif
 
#endif