Message ID | 1460656118-16766-4-git-send-email-gustavo@padovan.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Thu, Apr 14, 2016 at 10:48:15AM -0700, Gustavo Padovan wrote: > From: Gustavo Padovan <gustavo.padovan@collabora.co.uk> > > Replace the legacy drm_send_vblank_event() with the new helper function. > > Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Applied to drm-intel.git, thanks. -Daniel > --- > drivers/gpu/drm/i915/intel_display.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 29aa64b..181ee3c 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -3802,9 +3802,7 @@ static void page_flip_completed(struct intel_crtc *intel_crtc) > intel_crtc->unpin_work = NULL; > > if (work->event) > - drm_send_vblank_event(intel_crtc->base.dev, > - intel_crtc->pipe, > - work->event); > + drm_crtc_send_vblank_event(&intel_crtc->base, work->event); > > drm_crtc_vblank_put(&intel_crtc->base); > > @@ -11699,7 +11697,7 @@ retry: > > if (ret == 0 && event) { > spin_lock_irq(&dev->event_lock); > - drm_send_vblank_event(dev, pipe, event); > + drm_crtc_send_vblank_event(crtc, event); > spin_unlock_irq(&dev->event_lock); > } > } > -- > 2.5.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 29aa64b..181ee3c 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3802,9 +3802,7 @@ static void page_flip_completed(struct intel_crtc *intel_crtc) intel_crtc->unpin_work = NULL; if (work->event) - drm_send_vblank_event(intel_crtc->base.dev, - intel_crtc->pipe, - work->event); + drm_crtc_send_vblank_event(&intel_crtc->base, work->event); drm_crtc_vblank_put(&intel_crtc->base); @@ -11699,7 +11697,7 @@ retry: if (ret == 0 && event) { spin_lock_irq(&dev->event_lock); - drm_send_vblank_event(dev, pipe, event); + drm_crtc_send_vblank_event(crtc, event); spin_unlock_irq(&dev->event_lock); } }