projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/nouveau/falcon: remove object accessor functions
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nvkm
/
engine
/
msvld
/
g98.c
diff --git
a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c
b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c
index c8a6b4ef52a1a2170273317362a61328bf6e0205..5312cd605dd7a00799a83a59e3134831edd6b360 100644
(file)
--- 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 <engine/msvld.h>
#include <engine/falcon.h>
#include <engine/msvld.h>
#include <engine/falcon.h>
-struct g98_msvld_priv {
- struct nvkm_falcon base;
-};
-
/*******************************************************************************
* MSVLD object classes
******************************************************************************/
/*******************************************************************************
* MSVLD object classes
******************************************************************************/
@@
-64,15
+60,16
@@
g98_msvld_cclass = {
static int
g98_msvld_init(struct nvkm_object *object)
{
static int
g98_msvld_init(struct nvkm_object *object)
{
- struct g98_msvld_priv *priv = (void *)object;
+ struct nvkm_falcon *msvld = (void *)object;
+ struct nvkm_device *device = msvld->engine.subdev.device;
int ret;
int ret;
- ret = nvkm_falcon_init(
&priv->base
);
+ ret = nvkm_falcon_init(
msvld
);
if (ret)
return ret;
if (ret)
return ret;
- nv
_wr32(priv
, 0x084010, 0x0000ffd2);
- nv
_wr32(priv
, 0x08401c, 0x0000fff2);
+ nv
km_wr32(device
, 0x084010, 0x0000ffd2);
+ nv
km_wr32(device
, 0x08401c, 0x0000fff2);
return 0;
}
return 0;
}
@@
-81,18
+78,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 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,
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;
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;
}
return 0;
}
@@
-104,7
+101,5
@@
g98_msvld_oclass = {
.dtor = _nvkm_falcon_dtor,
.init = g98_msvld_init,
.fini = _nvkm_falcon_fini,
.dtor = _nvkm_falcon_dtor,
.init = g98_msvld_init,
.fini = _nvkm_falcon_fini,
- .rd32 = _nvkm_falcon_rd32,
- .wr32 = _nvkm_falcon_wr32,
},
};
},
};