hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau/msvld: switch to device pri macros 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2015-08-20 14:54:10 +10:00
parent 320ca25131
commit f2d85ad1a6
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c
View File

@ -61,14 +61,15 @@ static int
g98_msvld_init(struct nvkm_object *object)
{
struct nvkm_falcon *msvld = (void *)object;
struct nvkm_device *device = msvld->engine.subdev.device;
int ret;
ret = nvkm_falcon_init(msvld);
if (ret)
return ret;
nv_wr32(msvld, 0x084010, 0x0000ffd2);
nv_wr32(msvld, 0x08401c, 0x0000fff2);
nvkm_wr32(device, 0x084010, 0x0000ffd2);
nvkm_wr32(device, 0x08401c, 0x0000fff2);
return 0;
}

5
drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c
View File

@ -59,14 +59,15 @@ static int
gf100_msvld_init(struct nvkm_object *object)
{
struct nvkm_falcon *msvld = (void *)object;
struct nvkm_device *device = msvld->engine.subdev.device;
int ret;
ret = nvkm_falcon_init(msvld);
if (ret)
return ret;
nv_wr32(msvld, 0x084010, 0x0000fff2);
nv_wr32(msvld, 0x08401c, 0x0000fff2);
nvkm_wr32(device, 0x084010, 0x0000fff2);
nvkm_wr32(device, 0x08401c, 0x0000fff2);
return 0;
}

5
drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c
View File

@ -59,14 +59,15 @@ static int
gk104_msvld_init(struct nvkm_object *object)
{
struct nvkm_falcon *msvld = (void *)object;
struct nvkm_device *device = msvld->engine.subdev.device;
int ret;
ret = nvkm_falcon_init(msvld);
if (ret)
return ret;
nv_wr32(msvld, 0x084010, 0x0000fff2);
nv_wr32(msvld, 0x08401c, 0x0000fff2);
nvkm_wr32(device, 0x084010, 0x0000fff2);
nvkm_wr32(device, 0x08401c, 0x0000fff2);
return 0;
}