diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c index c814a5f65eb0..7c5d01dcf92e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c @@ -24,10 +24,6 @@ #include <engine/mspdec.h> #include <engine/falcon.h> -struct gf100_mspdec_priv { - struct nvkm_falcon base; -}; - /******************************************************************************* * MSPDEC object classes ******************************************************************************/ @@ -62,15 +58,15 @@ gf100_mspdec_cclass = { static int gf100_mspdec_init(struct nvkm_object *object) { - struct gf100_mspdec_priv *priv = (void *)object; + struct nvkm_falcon *mspdec = (void *)object; int ret; - ret = nvkm_falcon_init(&priv->base); + ret = nvkm_falcon_init(mspdec); if (ret) return ret; - nv_wr32(priv, 0x085010, 0x0000fff2); - nv_wr32(priv, 0x08501c, 0x0000fff2); + nv_wr32(mspdec, 0x085010, 0x0000fff2); + nv_wr32(mspdec, 0x08501c, 0x0000fff2); return 0; } @@ -79,19 +75,19 @@ gf100_mspdec_ctor(struct nvkm_object *parent, struct nvkm_object *engine, struct nvkm_oclass *oclass, void *data, u32 size, struct nvkm_object **pobject) { - struct gf100_mspdec_priv *priv; + struct nvkm_falcon *mspdec; int ret; ret = nvkm_falcon_create(parent, engine, oclass, 0x085000, true, - "PMSPDEC", "mspdec", &priv); - *pobject = nv_object(priv); + "PMSPDEC", "mspdec", &mspdec); + *pobject = nv_object(mspdec); if (ret) return ret; - nv_subdev(priv)->unit = 0x00020000; - nv_subdev(priv)->intr = nvkm_falcon_intr; - nv_engine(priv)->cclass = &gf100_mspdec_cclass; - nv_engine(priv)->sclass = gf100_mspdec_sclass; + nv_subdev(mspdec)->unit = 0x00020000; + nv_subdev(mspdec)->intr = nvkm_falcon_intr; + nv_engine(mspdec)->cclass = &gf100_mspdec_cclass; + nv_engine(mspdec)->sclass = gf100_mspdec_sclass; return 0; } |