diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:07 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:11 +1000 |
| commit | fd166a1832db138f22ad95eacd0879af30742f57 (patch) | |
| tree | efe505adef9a7e3ecf1bf0d67d1ddae94b381022 /drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c | |
| parent | e2f1cf253e0cf5b64fa6fee439aeeda49c6f09d8 (diff) | |
| download | blackbird-obmc-linux-fd166a1832db138f22ad95eacd0879af30742f57.tar.gz blackbird-obmc-linux-fd166a1832db138f22ad95eacd0879af30742f57.zip | |
drm/nouveau/disp: cosmetic changes
This is purely preparation for upcoming commits, there should be no
code changes here.
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 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c index 891d1e7bf7d2..67d3cf99e0b5 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c @@ -49,20 +49,20 @@ gt215_hda_eld(NV50_DISP_MTHD_V1) if (size && args->v0.data[0]) { if (outp->info.type == DCB_OUTPUT_DP) { - nv_mask(priv, 0x61c1e0 + soff, 0x8000000d, 0x80000001); - nv_wait(priv, 0x61c1e0 + soff, 0x80000000, 0x00000000); + nv_mask(disp, 0x61c1e0 + soff, 0x8000000d, 0x80000001); + nv_wait(disp, 0x61c1e0 + soff, 0x80000000, 0x00000000); } for (i = 0; i < size; i++) - nv_wr32(priv, 0x61c440 + soff, (i << 8) | args->v0.data[0]); + nv_wr32(disp, 0x61c440 + soff, (i << 8) | args->v0.data[0]); for (; i < 0x60; i++) - nv_wr32(priv, 0x61c440 + soff, (i << 8)); - nv_mask(priv, 0x61c448 + soff, 0x80000003, 0x80000003); + nv_wr32(disp, 0x61c440 + soff, (i << 8)); + nv_mask(disp, 0x61c448 + soff, 0x80000003, 0x80000003); } else { if (outp->info.type == DCB_OUTPUT_DP) { - nv_mask(priv, 0x61c1e0 + soff, 0x80000001, 0x80000000); - nv_wait(priv, 0x61c1e0 + soff, 0x80000000, 0x00000000); + nv_mask(disp, 0x61c1e0 + soff, 0x80000001, 0x80000000); + nv_wait(disp, 0x61c1e0 + soff, 0x80000000, 0x00000000); } - nv_mask(priv, 0x61c448 + soff, 0x80000003, 0x80000000 | !!size); + nv_mask(disp, 0x61c448 + soff, 0x80000003, 0x80000000 | !!size); } return 0; |
