UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nouveau/mspdec: 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 636e37aa97
commit 54118c74fb
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,14 +60,15 @@ static int
g98_mspdec_init(struct nvkm_object *object)
{
struct nvkm_falcon *mspdec = (void *)object;
struct nvkm_device *device = mspdec->engine.subdev.device;
int ret;
ret = nvkm_falcon_init(mspdec);
if (ret)
return ret;
nv_wr32(mspdec, 0x085010, 0x0000ffd2);
nv_wr32(mspdec, 0x08501c, 0x0000fff2);
nvkm_wr32(device, 0x085010, 0x0000ffd2);
nvkm_wr32(device, 0x08501c, 0x0000fff2);
return 0;
}

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

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

9
drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c
View File

@ -58,15 +58,16 @@ gk104_mspdec_cclass = {
static int
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;
ret = nvkm_falcon_init(falcon);
ret = nvkm_falcon_init(mspdec);
if (ret)
return ret;
nv_wr32(falcon, 0x085010, 0x0000fff2);
nv_wr32(falcon, 0x08501c, 0x0000fff2);
nvkm_wr32(device, 0x085010, 0x0000fff2);
nvkm_wr32(device, 0x08501c, 0x0000fff2);
return 0;
}