No functional change. Justs finish the migration from drm_vblank_*(dev, pipe) to drm_crtc_vblank_*(crtc)
Signed-off-by: Rodrigo Vivi rodrigo.vivi@intel.com --- drivers/gpu/drm/nouveau/nouveau_display.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index afbf557..148bd40 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -390,11 +390,11 @@ nouveau_display_fini(struct drm_device *dev) struct nouveau_display *disp = nouveau_display(dev); struct nouveau_drm *drm = nouveau_drm(dev); struct drm_connector *connector; - int head; + struct drm_crtc *crtc;
/* Make sure that drm and hw vblank irqs get properly disabled. */ - for (head = 0; head < dev->mode_config.num_crtc; head++) - drm_vblank_off(dev, head); + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) + drm_crtc_vblank_off(crtc);
/* disable flip completion events */ nvif_notify_put(&drm->flip); @@ -647,13 +647,18 @@ nouveau_display_resume(struct drm_device *dev, bool runtime)
drm_helper_resume_force_mode(dev);
- /* Make sure that drm and hw vblank irqs get resumed if needed. */ + for (head = 0; head < dev->mode_config.num_crtc; head++) - drm_vblank_on(dev, head); +
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
+ /* Make sure that drm and hw vblank + * irqs get resumed if needed. + */ + drm_crtc_vblank_on(crtc); + if (!nv_crtc->cursor.nvbo) continue;