evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/nouveau/mspdec: cosmetic changes

Browse source 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2015-08-20 14:54:08 +10:00
parent b19de4f3d7
commit 11271f9f8f
4 changed files with 36 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h
View file

@ -59,12 +59,12 @@ struct nvkm_falcon {
#define nvkm_falcon_destroy(p) \ #define nvkm_falcon_destroy(p) \
nvkm_engine_destroy(&(p)->engine) nvkm_engine_destroy(&(p)->engine)
#define nvkm_falcon_init(p) ({ \ #define nvkm_falcon_init(p) ({ \
struct nvkm_falcon *falcon = (p); \ struct nvkm_falcon *_falcon = (p); \
_nvkm_falcon_init(nv_object(falcon)); \ _nvkm_falcon_init(nv_object(_falcon)); \
}) })
#define nvkm_falcon_fini(p,s) ({ \ #define nvkm_falcon_fini(p,s) ({ \
struct nvkm_falcon *falcon = (p); \ struct nvkm_falcon *_falcon = (p); \
_nvkm_falcon_fini(nv_object(falcon), (s)); \ _nvkm_falcon_fini(nv_object(_falcon), (s)); \
}) })
int nvkm_falcon_create_(struct nvkm_object *, struct nvkm_object *, int nvkm_falcon_create_(struct nvkm_object *, struct nvkm_object *,

24
drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c
View file

@ -24,10 +24,6 @@
#include <engine/mspdec.h> #include <engine/mspdec.h>
#include <engine/falcon.h> #include <engine/falcon.h>
struct g98_mspdec_priv {
struct nvkm_falcon base;
};
/******************************************************************************* /*******************************************************************************
* MSPDEC object classes * MSPDEC object classes
******************************************************************************/ ******************************************************************************/
@ -63,15 +59,15 @@ g98_mspdec_cclass = {
static int static int
g98_mspdec_init(struct nvkm_object *object) g98_mspdec_init(struct nvkm_object *object)
{ {
struct g98_mspdec_priv *priv = (void *)object; struct nvkm_falcon *mspdec = (void *)object;
int ret; int ret;
ret = nvkm_falcon_init(&priv->base); ret = nvkm_falcon_init(mspdec);
if (ret) if (ret)
return ret; return ret;
nv_wr32(priv, 0x085010, 0x0000ffd2); nv_wr32(mspdec, 0x085010, 0x0000ffd2);
nv_wr32(priv, 0x08501c, 0x0000fff2); nv_wr32(mspdec, 0x08501c, 0x0000fff2);
return 0; return 0;
} }
@ -80,18 +76,18 @@ g98_mspdec_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_oclass *oclass, void *data, u32 size, struct nvkm_oclass *oclass, void *data, u32 size,
struct nvkm_object **pobject) struct nvkm_object **pobject)
{ {
struct g98_mspdec_priv *priv; struct nvkm_falcon *mspdec;
int ret; int ret;
ret = nvkm_falcon_create(parent, engine, oclass, 0x085000, true, ret = nvkm_falcon_create(parent, engine, oclass, 0x085000, true,
"PMSPDEC", "mspdec", &priv); "PMSPDEC", "mspdec", &mspdec);
*pobject = nv_object(priv); *pobject = nv_object(mspdec);
if (ret) if (ret)
return ret; return ret;
nv_subdev(priv)->unit = 0x01020000; nv_subdev(mspdec)->unit = 0x01020000;
nv_engine(priv)->cclass = &g98_mspdec_cclass; nv_engine(mspdec)->cclass = &g98_mspdec_cclass;
nv_engine(priv)->sclass = g98_mspdec_sclass; nv_engine(mspdec)->sclass = g98_mspdec_sclass;
return 0; return 0;
} }

26
drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c
View file

@ -24,10 +24,6 @@
#include <engine/mspdec.h> #include <engine/mspdec.h>
#include <engine/falcon.h> #include <engine/falcon.h>
struct gf100_mspdec_priv {
struct nvkm_falcon base;
};
/******************************************************************************* /*******************************************************************************
* MSPDEC object classes * MSPDEC object classes
******************************************************************************/ ******************************************************************************/
@ -62,15 +58,15 @@ gf100_mspdec_cclass = {
static int static int
gf100_mspdec_init(struct nvkm_object *object) gf100_mspdec_init(struct nvkm_object *object)
{ {
struct gf100_mspdec_priv *priv = (void *)object; struct nvkm_falcon *mspdec = (void *)object;
int ret; int ret;
ret = nvkm_falcon_init(&priv->base); ret = nvkm_falcon_init(mspdec);
if (ret) if (ret)
return ret; return ret;
nv_wr32(priv, 0x085010, 0x0000fff2); nv_wr32(mspdec, 0x085010, 0x0000fff2);
nv_wr32(priv, 0x08501c, 0x0000fff2); nv_wr32(mspdec, 0x08501c, 0x0000fff2);
return 0; 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_oclass *oclass, void *data, u32 size,
struct nvkm_object **pobject) struct nvkm_object **pobject)
{ {
struct gf100_mspdec_priv *priv; struct nvkm_falcon *mspdec;
int ret; int ret;
ret = nvkm_falcon_create(parent, engine, oclass, 0x085000, true, ret = nvkm_falcon_create(parent, engine, oclass, 0x085000, true,
"PMSPDEC", "mspdec", &priv); "PMSPDEC", "mspdec", &mspdec);
*pobject = nv_object(priv); *pobject = nv_object(mspdec);
if (ret) if (ret)
return ret; return ret;
nv_subdev(priv)->unit = 0x00020000; nv_subdev(mspdec)->unit = 0x00020000;
nv_subdev(priv)->intr = nvkm_falcon_intr; nv_subdev(mspdec)->intr = nvkm_falcon_intr;
nv_engine(priv)->cclass = &gf100_mspdec_cclass; nv_engine(mspdec)->cclass = &gf100_mspdec_cclass;
nv_engine(priv)->sclass = gf100_mspdec_sclass; nv_engine(mspdec)->sclass = gf100_mspdec_sclass;
return 0; return 0;
} }

26
drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c
View file

@ -24,10 +24,6 @@
#include <engine/mspdec.h> #include <engine/mspdec.h>
#include <engine/falcon.h> #include <engine/falcon.h>
struct gk104_mspdec_priv {
struct nvkm_falcon base;
};
/******************************************************************************* /*******************************************************************************
* MSPDEC object classes * MSPDEC object classes
******************************************************************************/ ******************************************************************************/
@ -62,15 +58,15 @@ gk104_mspdec_cclass = {
static int static int
gk104_mspdec_init(struct nvkm_object *object) gk104_mspdec_init(struct nvkm_object *object)
{ {
struct gk104_mspdec_priv *priv = (void *)object; struct nvkm_falcon *falcon = (void *)object;
int ret; int ret;
ret = nvkm_falcon_init(&priv->base); ret = nvkm_falcon_init(falcon);
if (ret) if (ret)
return ret; return ret;
nv_wr32(priv, 0x085010, 0x0000fff2); nv_wr32(falcon, 0x085010, 0x0000fff2);
nv_wr32(priv, 0x08501c, 0x0000fff2); nv_wr32(falcon, 0x08501c, 0x0000fff2);
return 0; return 0;
} }
@ -79,19 +75,19 @@ gk104_mspdec_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_oclass *oclass, void *data, u32 size, struct nvkm_oclass *oclass, void *data, u32 size,
struct nvkm_object **pobject) struct nvkm_object **pobject)
{ {
struct gk104_mspdec_priv *priv; struct nvkm_falcon *falcon;
int ret; int ret;
ret = nvkm_falcon_create(parent, engine, oclass, 0x085000, true, ret = nvkm_falcon_create(parent, engine, oclass, 0x085000, true,
"PMSPDEC", "mspdec", &priv); "PMSPDEC", "mspdec", &falcon);
*pobject = nv_object(priv); *pobject = nv_object(falcon);
if (ret) if (ret)
return ret; return ret;
nv_subdev(priv)->unit = 0x00020000; nv_subdev(falcon)->unit = 0x00020000;
nv_subdev(priv)->intr = nvkm_falcon_intr; nv_subdev(falcon)->intr = nvkm_falcon_intr;
nv_engine(priv)->cclass = &gk104_mspdec_cclass; nv_engine(falcon)->cclass = &gk104_mspdec_cclass;
nv_engine(priv)->sclass = gk104_mspdec_sclass; nv_engine(falcon)->sclass = gk104_mspdec_sclass;
return 0; return 0;
} }