Commit 54118c74 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/mspdec: switch to device pri macros

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 636e37aa
...@@ -60,14 +60,15 @@ static int ...@@ -60,14 +60,15 @@ static int
g98_mspdec_init(struct nvkm_object *object) g98_mspdec_init(struct nvkm_object *object)
{ {
struct nvkm_falcon *mspdec = (void *)object; struct nvkm_falcon *mspdec = (void *)object;
struct nvkm_device *device = mspdec->engine.subdev.device;
int ret; int ret;
ret = nvkm_falcon_init(mspdec); ret = nvkm_falcon_init(mspdec);
if (ret) if (ret)
return ret; return ret;
nv_wr32(mspdec, 0x085010, 0x0000ffd2); nvkm_wr32(device, 0x085010, 0x0000ffd2);
nv_wr32(mspdec, 0x08501c, 0x0000fff2); nvkm_wr32(device, 0x08501c, 0x0000fff2);
return 0; return 0;
} }
......
...@@ -59,14 +59,15 @@ static int ...@@ -59,14 +59,15 @@ static int
gf100_mspdec_init(struct nvkm_object *object) gf100_mspdec_init(struct nvkm_object *object)
{ {
struct nvkm_falcon *mspdec = (void *)object; struct nvkm_falcon *mspdec = (void *)object;
struct nvkm_device *device = mspdec->engine.subdev.device;
int ret; int ret;
ret = nvkm_falcon_init(mspdec); ret = nvkm_falcon_init(mspdec);
if (ret) if (ret)
return ret; return ret;
nv_wr32(mspdec, 0x085010, 0x0000fff2); nvkm_wr32(device, 0x085010, 0x0000fff2);
nv_wr32(mspdec, 0x08501c, 0x0000fff2); nvkm_wr32(device, 0x08501c, 0x0000fff2);
return 0; return 0;
} }
......
...@@ -58,15 +58,16 @@ gk104_mspdec_cclass = { ...@@ -58,15 +58,16 @@ gk104_mspdec_cclass = {
static int static int
gk104_mspdec_init(struct nvkm_object *object) gk104_mspdec_init(struct nvkm_object *object)
{ {
struct nvkm_falcon *falcon = (void *)object; struct nvkm_falcon *mspdec = (void *)object;
struct nvkm_device *device = mspdec->engine.subdev.device;
int ret; int ret;
ret = nvkm_falcon_init(falcon); ret = nvkm_falcon_init(mspdec);
if (ret) if (ret)
return ret; return ret;
nv_wr32(falcon, 0x085010, 0x0000fff2); nvkm_wr32(device, 0x085010, 0x0000fff2);
nv_wr32(falcon, 0x08501c, 0x0000fff2); nvkm_wr32(device, 0x08501c, 0x0000fff2);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment