diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 06:54:10 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 04:40:17 +0200 |
| commit | 2fde1f1c343030d169945aa67a0e485b568f1393 (patch) | |
| tree | ad6954a7a03f2322fccc5be490de788e3e6e922c /drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c | |
| parent | drm/nouveau/device: switch to device pri macros (diff) | |
| download | linux-2fde1f1c343030d169945aa67a0e485b568f1393.tar.xz linux-2fde1f1c343030d169945aa67a0e485b568f1393.zip | |
drm/nouveau/disp: switch to device pri macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c index 67d3cf99e0b5..c2ae112225fc 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c @@ -33,6 +33,7 @@ int gt215_hda_eld(NV50_DISP_MTHD_V1) { + struct nvkm_device *device = disp->base.engine.subdev.device; union { struct nv50_disp_sor_hda_eld_v0 v0; } *args = data; @@ -49,20 +50,20 @@ gt215_hda_eld(NV50_DISP_MTHD_V1) if (size && args->v0.data[0]) { if (outp->info.type == DCB_OUTPUT_DP) { - nv_mask(disp, 0x61c1e0 + soff, 0x8000000d, 0x80000001); + nvkm_mask(device, 0x61c1e0 + soff, 0x8000000d, 0x80000001); nv_wait(disp, 0x61c1e0 + soff, 0x80000000, 0x00000000); } for (i = 0; i < size; i++) - nv_wr32(disp, 0x61c440 + soff, (i << 8) | args->v0.data[0]); + nvkm_wr32(device, 0x61c440 + soff, (i << 8) | args->v0.data[0]); for (; i < 0x60; i++) - nv_wr32(disp, 0x61c440 + soff, (i << 8)); - nv_mask(disp, 0x61c448 + soff, 0x80000003, 0x80000003); + nvkm_wr32(device, 0x61c440 + soff, (i << 8)); + nvkm_mask(device, 0x61c448 + soff, 0x80000003, 0x80000003); } else { if (outp->info.type == DCB_OUTPUT_DP) { - nv_mask(disp, 0x61c1e0 + soff, 0x80000001, 0x80000000); + nvkm_mask(device, 0x61c1e0 + soff, 0x80000001, 0x80000000); nv_wait(disp, 0x61c1e0 + soff, 0x80000000, 0x00000000); } - nv_mask(disp, 0x61c448 + soff, 0x80000003, 0x80000000 | !!size); + nvkm_mask(device, 0x61c448 + soff, 0x80000003, 0x80000000 | !!size); } return 0; |