diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-11-12 12:57:54 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-12-21 19:01:36 +1000 |
| commit | 4acd42939867df4596ae3b433ec1f80e0c461038 (patch) | |
| tree | 1e171839c671506f12e1a70a5126c596cfc7d7ad /drivers | |
| parent | 2eac77b793196b97a35f9c5579411eb0aa085047 (diff) | |
| download | linux-4acd42939867df4596ae3b433ec1f80e0c461038.tar.gz linux-4acd42939867df4596ae3b433ec1f80e0c461038.tar.bz2 linux-4acd42939867df4596ae3b433ec1f80e0c461038.zip | |
drm/nvd0/disp: make it clearer that the cursor regs are pio evo channels
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvd0_display.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c index 3179f2a9ed23..0c788ebe09ab 100644 --- a/drivers/gpu/drm/nouveau/nvd0_display.c +++ b/drivers/gpu/drm/nouveau/nvd0_display.c @@ -163,6 +163,12 @@ evo_fini_dma(struct drm_device *dev, int ch) nv_mask(dev, 0x6100a0, (1 << ch), 0x00000000); } +static inline void +evo_piow(struct drm_device *dev, int ch, u16 mthd, u32 data) +{ + nv_wr32(dev, 0x640000 + (ch * 0x1000) + mthd, data); +} + static int evo_init_pio(struct drm_device *dev, int ch) { @@ -616,10 +622,10 @@ static int nvd0_crtc_cursor_move(struct drm_crtc *crtc, int x, int y) { struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); - const u32 data = (y << 16) | x; + int ch = EVO_CURS(nv_crtc->index); - nv_wr32(crtc->dev, 0x64d084 + (nv_crtc->index * 0x1000), data); - nv_wr32(crtc->dev, 0x64d080 + (nv_crtc->index * 0x1000), 0x00000000); + evo_piow(crtc->dev, ch, 0x0084, (y << 16) | x); + evo_piow(crtc->dev, ch, 0x0080, 0x00000000); return 0; } |