Commit f2d85ad1 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/msvld: switch to device pri macros

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 320ca251
...@@ -61,14 +61,15 @@ static int ...@@ -61,14 +61,15 @@ static int
g98_msvld_init(struct nvkm_object *object) g98_msvld_init(struct nvkm_object *object)
{ {
struct nvkm_falcon *msvld = (void *)object; struct nvkm_falcon *msvld = (void *)object;
struct nvkm_device *device = msvld->engine.subdev.device;
int ret; int ret;
ret = nvkm_falcon_init(msvld); ret = nvkm_falcon_init(msvld);
if (ret) if (ret)
return ret; return ret;
nv_wr32(msvld, 0x084010, 0x0000ffd2); nvkm_wr32(device, 0x084010, 0x0000ffd2);
nv_wr32(msvld, 0x08401c, 0x0000fff2); nvkm_wr32(device, 0x08401c, 0x0000fff2);
return 0; return 0;
} }
......
...@@ -59,14 +59,15 @@ static int ...@@ -59,14 +59,15 @@ static int
gf100_msvld_init(struct nvkm_object *object) gf100_msvld_init(struct nvkm_object *object)
{ {
struct nvkm_falcon *msvld = (void *)object; struct nvkm_falcon *msvld = (void *)object;
struct nvkm_device *device = msvld->engine.subdev.device;
int ret; int ret;
ret = nvkm_falcon_init(msvld); ret = nvkm_falcon_init(msvld);
if (ret) if (ret)
return ret; return ret;
nv_wr32(msvld, 0x084010, 0x0000fff2); nvkm_wr32(device, 0x084010, 0x0000fff2);
nv_wr32(msvld, 0x08401c, 0x0000fff2); nvkm_wr32(device, 0x08401c, 0x0000fff2);
return 0; return 0;
} }
......
...@@ -59,14 +59,15 @@ static int ...@@ -59,14 +59,15 @@ static int
gk104_msvld_init(struct nvkm_object *object) gk104_msvld_init(struct nvkm_object *object)
{ {
struct nvkm_falcon *msvld = (void *)object; struct nvkm_falcon *msvld = (void *)object;
struct nvkm_device *device = msvld->engine.subdev.device;
int ret; int ret;
ret = nvkm_falcon_init(msvld); ret = nvkm_falcon_init(msvld);
if (ret) if (ret)
return ret; return ret;
nv_wr32(msvld, 0x084010, 0x0000fff2); nvkm_wr32(device, 0x084010, 0x0000fff2);
nv_wr32(msvld, 0x08401c, 0x0000fff2); nvkm_wr32(device, 0x08401c, 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