From 74137ffcd1dfd6537bbfdd1d1149942412280e9e Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 20 Aug 2015 14:54:08 +1000 Subject: [PATCH] drm/nouveau/msvld: cosmetic changes This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs --- .../gpu/drm/nouveau/nvkm/engine/msvld/g98.c | 24 +++++++---------- .../gpu/drm/nouveau/nvkm/engine/msvld/gf100.c | 26 ++++++++----------- .../gpu/drm/nouveau/nvkm/engine/msvld/gk104.c | 26 ++++++++----------- 3 files changed, 32 insertions(+), 44 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c index c8a6b4ef52a1..055bc2141f6b 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c @@ -24,10 +24,6 @@ #include #include -struct g98_msvld_priv { - struct nvkm_falcon base; -}; - /******************************************************************************* * MSVLD object classes ******************************************************************************/ @@ -64,15 +60,15 @@ g98_msvld_cclass = { static int g98_msvld_init(struct nvkm_object *object) { - struct g98_msvld_priv *priv = (void *)object; + struct nvkm_falcon *msvld = (void *)object; int ret; - ret = nvkm_falcon_init(&priv->base); + ret = nvkm_falcon_init(msvld); if (ret) return ret; - nv_wr32(priv, 0x084010, 0x0000ffd2); - nv_wr32(priv, 0x08401c, 0x0000fff2); + nv_wr32(msvld, 0x084010, 0x0000ffd2); + nv_wr32(msvld, 0x08401c, 0x0000fff2); return 0; } @@ -81,18 +77,18 @@ g98_msvld_ctor(struct nvkm_object *parent, struct nvkm_object *engine, struct nvkm_oclass *oclass, void *data, u32 size, struct nvkm_object **pobject) { - struct g98_msvld_priv *priv; + struct nvkm_falcon *msvld; int ret; ret = nvkm_falcon_create(parent, engine, oclass, 0x084000, true, - "PMSVLD", "msvld", &priv); - *pobject = nv_object(priv); + "PMSVLD", "msvld", &msvld); + *pobject = nv_object(msvld); if (ret) return ret; - nv_subdev(priv)->unit = 0x04008000; - nv_engine(priv)->cclass = &g98_msvld_cclass; - nv_engine(priv)->sclass = g98_msvld_sclass; + nv_subdev(msvld)->unit = 0x04008000; + nv_engine(msvld)->cclass = &g98_msvld_cclass; + nv_engine(msvld)->sclass = g98_msvld_sclass; return 0; } diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c index b8d1e0f521ef..0730198daea7 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c @@ -24,10 +24,6 @@ #include #include -struct gf100_msvld_priv { - struct nvkm_falcon base; -}; - /******************************************************************************* * MSVLD object classes ******************************************************************************/ @@ -62,15 +58,15 @@ gf100_msvld_cclass = { static int gf100_msvld_init(struct nvkm_object *object) { - struct gf100_msvld_priv *priv = (void *)object; + struct nvkm_falcon *msvld = (void *)object; int ret; - ret = nvkm_falcon_init(&priv->base); + ret = nvkm_falcon_init(msvld); if (ret) return ret; - nv_wr32(priv, 0x084010, 0x0000fff2); - nv_wr32(priv, 0x08401c, 0x0000fff2); + nv_wr32(msvld, 0x084010, 0x0000fff2); + nv_wr32(msvld, 0x08401c, 0x0000fff2); return 0; } @@ -79,19 +75,19 @@ gf100_msvld_ctor(struct nvkm_object *parent, struct nvkm_object *engine, struct nvkm_oclass *oclass, void *data, u32 size, struct nvkm_object **pobject) { - struct gf100_msvld_priv *priv; + struct nvkm_falcon *msvld; int ret; ret = nvkm_falcon_create(parent, engine, oclass, 0x084000, true, - "PMSVLD", "msvld", &priv); - *pobject = nv_object(priv); + "PMSVLD", "msvld", &msvld); + *pobject = nv_object(msvld); if (ret) return ret; - nv_subdev(priv)->unit = 0x00008000; - nv_subdev(priv)->intr = nvkm_falcon_intr; - nv_engine(priv)->cclass = &gf100_msvld_cclass; - nv_engine(priv)->sclass = gf100_msvld_sclass; + nv_subdev(msvld)->unit = 0x00008000; + nv_subdev(msvld)->intr = nvkm_falcon_intr; + nv_engine(msvld)->cclass = &gf100_msvld_cclass; + nv_engine(msvld)->sclass = gf100_msvld_sclass; return 0; } diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c index a0b0927834df..e19ebfdaae6a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c @@ -24,10 +24,6 @@ #include #include -struct gk104_msvld_priv { - struct nvkm_falcon base; -}; - /******************************************************************************* * MSVLD object classes ******************************************************************************/ @@ -62,15 +58,15 @@ gk104_msvld_cclass = { static int gk104_msvld_init(struct nvkm_object *object) { - struct gk104_msvld_priv *priv = (void *)object; + struct nvkm_falcon *msvld = (void *)object; int ret; - ret = nvkm_falcon_init(&priv->base); + ret = nvkm_falcon_init(msvld); if (ret) return ret; - nv_wr32(priv, 0x084010, 0x0000fff2); - nv_wr32(priv, 0x08401c, 0x0000fff2); + nv_wr32(msvld, 0x084010, 0x0000fff2); + nv_wr32(msvld, 0x08401c, 0x0000fff2); return 0; } @@ -79,19 +75,19 @@ gk104_msvld_ctor(struct nvkm_object *parent, struct nvkm_object *engine, struct nvkm_oclass *oclass, void *data, u32 size, struct nvkm_object **pobject) { - struct gk104_msvld_priv *priv; + struct nvkm_falcon *msvld; int ret; ret = nvkm_falcon_create(parent, engine, oclass, 0x084000, true, - "PMSVLD", "msvld", &priv); - *pobject = nv_object(priv); + "PMSVLD", "msvld", &msvld); + *pobject = nv_object(msvld); if (ret) return ret; - nv_subdev(priv)->unit = 0x00008000; - nv_subdev(priv)->intr = nvkm_falcon_intr; - nv_engine(priv)->cclass = &gk104_msvld_cclass; - nv_engine(priv)->sclass = gk104_msvld_sclass; + nv_subdev(msvld)->unit = 0x00008000; + nv_subdev(msvld)->intr = nvkm_falcon_intr; + nv_engine(msvld)->cclass = &gk104_msvld_cclass; + nv_engine(msvld)->sclass = gk104_msvld_sclass; return 0; } -- 2.20.1