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/dacnv50.c | |
| parent | e2f1cf253e0cf5b64fa6fee439aeeda49c6f09d8 (diff) | |
| download | blackbird-op-linux-fd166a1832db138f22ad95eacd0879af30742f57.tar.gz blackbird-op-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/dacnv50.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/dacnv50.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dacnv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dacnv50.c index 0f7d1ec4d37e..f64dec917f85 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dacnv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dacnv50.c @@ -53,9 +53,9 @@ nv50_dac_power(NV50_DISP_MTHD_V1) } else return ret; - nv_wait(priv, 0x61a004 + doff, 0x80000000, 0x00000000); - nv_mask(priv, 0x61a004 + doff, 0xc000007f, 0x80000000 | stat); - nv_wait(priv, 0x61a004 + doff, 0x80000000, 0x00000000); + nv_wait(disp, 0x61a004 + doff, 0x80000000, 0x00000000); + nv_mask(disp, 0x61a004 + doff, 0xc000007f, 0x80000000 | stat); + nv_wait(disp, 0x61a004 + doff, 0x80000000, 0x00000000); return 0; } @@ -79,18 +79,18 @@ nv50_dac_sense(NV50_DISP_MTHD_V1) } else return ret; - nv_mask(priv, 0x61a004 + doff, 0x807f0000, 0x80150000); - nv_wait(priv, 0x61a004 + doff, 0x80000000, 0x00000000); + nv_mask(disp, 0x61a004 + doff, 0x807f0000, 0x80150000); + nv_wait(disp, 0x61a004 + doff, 0x80000000, 0x00000000); - nv_wr32(priv, 0x61a00c + doff, 0x00100000 | loadval); + nv_wr32(disp, 0x61a00c + doff, 0x00100000 | loadval); mdelay(9); udelay(500); - loadval = nv_mask(priv, 0x61a00c + doff, 0xffffffff, 0x00000000); + loadval = nv_mask(disp, 0x61a00c + doff, 0xffffffff, 0x00000000); - nv_mask(priv, 0x61a004 + doff, 0x807f0000, 0x80550000); - nv_wait(priv, 0x61a004 + doff, 0x80000000, 0x00000000); + nv_mask(disp, 0x61a004 + doff, 0x807f0000, 0x80550000); + nv_wait(disp, 0x61a004 + doff, 0x80000000, 0x00000000); - nv_debug(priv, "DAC%d sense: 0x%08x\n", outp->or, loadval); + nv_debug(disp, "DAC%d sense: 0x%08x\n", outp->or, loadval); if (!(loadval & 0x80000000)) return -ETIMEDOUT; |
