diff mbox

[05/14] drm/msm: use drm_crtc_send_vblank_event()

Message ID 1460656118-16766-5-git-send-email-gustavo@padovan.org (mailing list archive)
State New, archived
Headers show

Commit Message

Gustavo Padovan April 14, 2016, 5:48 p.m. UTC
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>
---
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 2 +-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Rob Clark April 14, 2016, 8:51 p.m. UTC | #1
On Thu, Apr 14, 2016 at 1:48 PM, Gustavo Padovan <gustavo@padovan.org> 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>

thanks, shall I take this via msm-next for 4.7, I assume?  Looks like
no dependency on drm-core patches that haven't already landed?

Reviewed-by: Rob Clark <robdclark@gmail.com>

> ---
>  drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 2 +-
>  drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
> index e233acf..3a48889 100644
> --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
> +++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
> @@ -121,7 +121,7 @@ static void complete_flip(struct drm_crtc *crtc, struct drm_file *file)
>                 if (!file || (event->base.file_priv == file)) {
>                         mdp4_crtc->event = NULL;
>                         DBG("%s: send event: %p", mdp4_crtc->name, event);
> -                       drm_send_vblank_event(dev, mdp4_crtc->id, event);
> +                       drm_crtc_send_vblank_event(crtc, event);
>                 }
>         }
>         spin_unlock_irqrestore(&dev->event_lock, flags);
> diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
> index 9673b95..ce779d9 100644
> --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
> +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
> @@ -149,7 +149,7 @@ static void complete_flip(struct drm_crtc *crtc, struct drm_file *file)
>                 if (!file || (event->base.file_priv == file)) {
>                         mdp5_crtc->event = NULL;
>                         DBG("%s: send event: %p", mdp5_crtc->name, event);
> -                       drm_send_vblank_event(dev, mdp5_crtc->id, event);
> +                       drm_crtc_send_vblank_event(crtc, event);
>                 }
>         }
>         spin_unlock_irqrestore(&dev->event_lock, flags);
> --
> 2.5.5
>
Gustavo Padovan April 19, 2016, 2:02 p.m. UTC | #2
Hi Rob,

2016-04-14 Rob Clark <robdclark@gmail.com>:

> On Thu, Apr 14, 2016 at 1:48 PM, Gustavo Padovan <gustavo@padovan.org> 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>
> 
> thanks, shall I take this via msm-next for 4.7, I assume?  Looks like
> no dependency on drm-core patches that haven't already landed?

I'd say you could take it, Otherwise we will have to wait everyone's ack
to get this through drm-next I think.

	Gustavo
Daniel Vetter April 20, 2016, 11:13 a.m. UTC | #3
On Tue, Apr 19, 2016 at 11:02:50AM -0300, Gustavo Padovan wrote:
> Hi Rob,
> 
> 2016-04-14 Rob Clark <robdclark@gmail.com>:
> 
> > On Thu, Apr 14, 2016 at 1:48 PM, Gustavo Padovan <gustavo@padovan.org> 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>
> > 
> > thanks, shall I take this via msm-next for 4.7, I assume?  Looks like
> > no dependency on drm-core patches that haven't already landed?
> 
> I'd say you could take it, Otherwise we will have to wait everyone's ack
> to get this through drm-next I think.

I'll probably mass-apply the leftovers to drm-misc in 2-3 weeks latest.
Fastest way to get stuff like this in, and if driver maintainers don't
pipe up by then ... their problem imo ;-)
-Daniel
Daniel Vetter May 2, 2016, 3:04 p.m. UTC | #4
On Thu, Apr 14, 2016 at 04:51:06PM -0400, Rob Clark wrote:
> On Thu, Apr 14, 2016 at 1:48 PM, Gustavo Padovan <gustavo@padovan.org> 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>
> 
> thanks, shall I take this via msm-next for 4.7, I assume?  Looks like
> no dependency on drm-core patches that haven't already landed?
> 
> Reviewed-by: Rob Clark <robdclark@gmail.com>

Applied to drm-misc, thanks.
-Daniel

> 
> > ---
> >  drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 2 +-
> >  drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
> > index e233acf..3a48889 100644
> > --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
> > +++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
> > @@ -121,7 +121,7 @@ static void complete_flip(struct drm_crtc *crtc, struct drm_file *file)
> >                 if (!file || (event->base.file_priv == file)) {
> >                         mdp4_crtc->event = NULL;
> >                         DBG("%s: send event: %p", mdp4_crtc->name, event);
> > -                       drm_send_vblank_event(dev, mdp4_crtc->id, event);
> > +                       drm_crtc_send_vblank_event(crtc, event);
> >                 }
> >         }
> >         spin_unlock_irqrestore(&dev->event_lock, flags);
> > diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
> > index 9673b95..ce779d9 100644
> > --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
> > +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
> > @@ -149,7 +149,7 @@ static void complete_flip(struct drm_crtc *crtc, struct drm_file *file)
> >                 if (!file || (event->base.file_priv == file)) {
> >                         mdp5_crtc->event = NULL;
> >                         DBG("%s: send event: %p", mdp5_crtc->name, event);
> > -                       drm_send_vblank_event(dev, mdp5_crtc->id, event);
> > +                       drm_crtc_send_vblank_event(crtc, event);
> >                 }
> >         }
> >         spin_unlock_irqrestore(&dev->event_lock, flags);
> > --
> > 2.5.5
> >
diff mbox

Patch

diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
index e233acf..3a48889 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
@@ -121,7 +121,7 @@  static void complete_flip(struct drm_crtc *crtc, struct drm_file *file)
 		if (!file || (event->base.file_priv == file)) {
 			mdp4_crtc->event = NULL;
 			DBG("%s: send event: %p", mdp4_crtc->name, event);
-			drm_send_vblank_event(dev, mdp4_crtc->id, event);
+			drm_crtc_send_vblank_event(crtc, event);
 		}
 	}
 	spin_unlock_irqrestore(&dev->event_lock, flags);
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
index 9673b95..ce779d9 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
@@ -149,7 +149,7 @@  static void complete_flip(struct drm_crtc *crtc, struct drm_file *file)
 		if (!file || (event->base.file_priv == file)) {
 			mdp5_crtc->event = NULL;
 			DBG("%s: send event: %p", mdp5_crtc->name, event);
-			drm_send_vblank_event(dev, mdp5_crtc->id, event);
+			drm_crtc_send_vblank_event(crtc, event);
 		}
 	}
 	spin_unlock_irqrestore(&dev->event_lock, flags);