diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-07-11 16:08:25 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-03 13:12:48 +1000 |
| commit | 5a5c7432bbbd2e318dff107b4ff960ab543a7cef (patch) | |
| tree | c7c9e87c882d15488df66257ec11bc62ed2c0d58 /drivers/gpu/drm/nouveau/nv50_display.c | |
| parent | 7d9115dee978e8540734c456c925d71a37752b8d (diff) | |
drm/nouveau/timer: port to subdev interfaces
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_display.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index e7cd8216d11..ccbb03ead8e 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -88,8 +88,6 @@ nv50_display_late_takedown(struct drm_device *dev) int nv50_display_sync(struct drm_device *dev) { - struct drm_nouveau_private *dev_priv = dev->dev_private; - struct nouveau_timer_engine *ptimer = &dev_priv->engine.timer; struct nv50_display *disp = nv50_display(dev); struct nouveau_channel *evo = disp->master; u64 start; @@ -107,11 +105,11 @@ nv50_display_sync(struct drm_device *dev) nv_wo32(disp->ntfy, 0x000, 0x00000000); FIRE_RING (evo); - start = ptimer->read(dev); + start = nv_timer_read(dev); do { if (nv_ro32(disp->ntfy, 0x000)) return 0; - } while (ptimer->read(dev) - start < 2000000000ULL); + } while (nv_timer_read(dev) - start < 2000000000ULL); } return -EBUSY; |