diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2021-02-04 01:33:53 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2021-02-11 04:49:55 +0300 |
| commit | fcc08a7c0ded8c75b00e67c3d14907389a568a57 (patch) | |
| tree | 1f4e0b619b84eb161379ce90553357119f7ea5f4 /drivers/gpu/drm/nouveau/nvkm/subdev/devinit | |
| parent | d07be5d788624a14607177dedbd563cda3363141 (diff) | |
| download | linux-fcc08a7c0ded8c75b00e67c3d14907389a568a57.tar.xz | |
drm/nouveau/bsp,vp: switch to instanced constructor
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/devinit')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c index 44513a474f74..cd4a5b356472 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c @@ -36,15 +36,15 @@ g84_devinit_disable(struct nvkm_devinit *init) if (!(r001540 & 0x40000000)) { disable |= (1ULL << NVKM_ENGINE_MPEG); - disable |= (1ULL << NVKM_ENGINE_VP); - disable |= (1ULL << NVKM_ENGINE_BSP); + nvkm_subdev_disable(device, NVKM_ENGINE_VP, 0); + nvkm_subdev_disable(device, NVKM_ENGINE_BSP, 0); disable |= (1ULL << NVKM_ENGINE_CIPHER); } if (!(r00154c & 0x00000004)) disable |= (1ULL << NVKM_ENGINE_DISP); if (!(r00154c & 0x00000020)) - disable |= (1ULL << NVKM_ENGINE_BSP); + nvkm_subdev_disable(device, NVKM_ENGINE_BSP, 0); if (!(r00154c & 0x00000040)) disable |= (1ULL << NVKM_ENGINE_CIPHER); |