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

drm/nv40/mpeg: use the nv31-provided classes 



Since nv40 only covers pre-nv44 now, it can use the nv31-provided
functions.

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

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

+2 −10
Original line number Diff line number Diff line
@@ -34,15 +34,7 @@ 


#include <engine/fifo.h>

#include <engine/mpeg.h>



struct nv31_mpeg_priv {

	struct nouveau_mpeg base;

	atomic_t refcount;

};



struct nv31_mpeg_chan {

	struct nouveau_object base;

};

#include <engine/mpeg/nv31.h>



/*******************************************************************************

 * MPEG object classes
@@ -167,7 +159,7 @@ nv31_mpeg_context_dtor(struct nouveau_object *object) 
	nouveau_object_destroy(&chan->base);

}



static struct nouveau_oclass

struct nouveau_oclass

nv31_mpeg_cclass = {

	.handle = NV_ENGCTX(MPEG, 0x31),

	.ofuncs = &(struct nouveau_ofuncs) {

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

0 → 100644
+15 −0
Original line number Diff line number Diff line 
#ifndef __NV31_MPEG_H__

#define __NV31_MPEG_H__



#include <engine/mpeg.h>



struct nv31_mpeg_priv {

	struct nouveau_mpeg base;

	atomic_t refcount;

};



struct nv31_mpeg_chan {

	struct nouveau_object base;

};



#endif

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

+4 −64
Original line number Diff line number Diff line
@@ -31,67 +31,7 @@ 
#include <subdev/instmem.h>



#include <engine/mpeg.h>

#include <engine/graph/nv40.h>



struct nv40_mpeg_priv {

	struct nouveau_mpeg base;

};



struct nv40_mpeg_chan {

	struct nouveau_mpeg_chan base;

};



/*******************************************************************************

 * PMPEG context

 ******************************************************************************/



static int

nv40_mpeg_context_ctor(struct nouveau_object *parent,

		       struct nouveau_object *engine,

		       struct nouveau_oclass *oclass, void *data, u32 size,

		       struct nouveau_object **pobject)

{

	struct nv40_mpeg_chan *chan;

	int ret;



	ret = nouveau_mpeg_context_create(parent, engine, oclass, NULL,

					  264 * 4, 16,

					  NVOBJ_FLAG_ZERO_ALLOC, &chan);

	*pobject = nv_object(chan);

	if (ret)

		return ret;



	nv_wo32(&chan->base.base, 0x78, 0x02001ec1);

	return 0;

}



static int

nv40_mpeg_context_fini(struct nouveau_object *object, bool suspend)

{



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

	struct nv40_mpeg_chan *chan = (void *)object;

	u32 inst = 0x80000000 | nv_gpuobj(chan)->addr >> 4;



	nv_mask(priv, 0x00b32c, 0x00000001, 0x00000000);

	if (nv_rd32(priv, 0x00b318) == inst)

		nv_mask(priv, 0x00b318, 0x80000000, 0x00000000);

	nv_mask(priv, 0x00b32c, 0x00000001, 0x00000001);

	return 0;

}



static struct nouveau_oclass

nv40_mpeg_cclass = {

	.handle = NV_ENGCTX(MPEG, 0x40),

	.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = nv40_mpeg_context_ctor,

		.dtor = _nouveau_mpeg_context_dtor,

		.init = _nouveau_mpeg_context_init,

		.fini = nv40_mpeg_context_fini,

		.rd32 = _nouveau_mpeg_context_rd32,

		.wr32 = _nouveau_mpeg_context_wr32,

	},

};

#include <engine/mpeg/nv31.h>



/*******************************************************************************

 * PMPEG engine/subdev functions
@@ -100,7 +40,7 @@ nv40_mpeg_cclass = { 
static void

nv40_mpeg_intr(struct nouveau_subdev *subdev)

{

	struct nv40_mpeg_priv *priv = (void *)subdev;

	struct nv31_mpeg_priv *priv = (void *)subdev;

	u32 stat;



	if ((stat = nv_rd32(priv, 0x00b100)))
@@ -117,7 +57,7 @@ nv40_mpeg_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	       struct nouveau_oclass *oclass, void *data, u32 size,

	       struct nouveau_object **pobject)

{

	struct nv40_mpeg_priv *priv;

	struct nv31_mpeg_priv *priv;

	int ret;



	ret = nouveau_mpeg_create(parent, engine, oclass, &priv);
@@ -127,7 +67,7 @@ nv40_mpeg_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 


	nv_subdev(priv)->unit = 0x00000002;

	nv_subdev(priv)->intr = nv40_mpeg_intr;

	nv_engine(priv)->cclass = &nv40_mpeg_cclass;

	nv_engine(priv)->cclass = &nv31_mpeg_cclass;

	nv_engine(priv)->sclass = nv31_mpeg_sclass;

	nv_engine(priv)->tile_prog = nv31_mpeg_tile_prog;

	return 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ extern struct nouveau_oclass nv40_mpeg_oclass; 
extern struct nouveau_oclass nv44_mpeg_oclass;

extern struct nouveau_oclass nv50_mpeg_oclass;

extern struct nouveau_oclass nv84_mpeg_oclass;



extern struct nouveau_oclass nv31_mpeg_cclass;

extern struct nouveau_oclass nv31_mpeg_sclass[];

void nv31_mpeg_intr(struct nouveau_subdev *);

void nv31_mpeg_tile_prog(struct nouveau_engine *, int);