[PATCH 07/13] drm/sti: Store correct CRTC index in events

[Thierry Reding]

On Wed, Aug 12, 2015 at 05:26:01PM +0200, Benjamin Gaignard wrote:
> The fix look good however it enter in conflict with the large rework
> we have done to support atomic.
> The pull request for this has been send.
> Would it be ok for you if we include your patch in the your next
> series of patches ?

Sure, I can keep carrying this and rebase on your changes when they've
landed.

Thierry

> 2015-08-12 17:00 GMT+02:00 Thierry Reding <thierry.reding at gmail.com>:
> > From: Thierry Reding <treding at nvidia.com>
> >
> > A negative pipe causes a special case to be triggered for drivers that
> > don't have proper VBLANK support. STi does support VBLANKs, so there is
> > no need for the fallback code.
> >
> > Cc: Benjamin Gaignard <benjamin.gaignard at linaro.org>
> > Signed-off-by: Thierry Reding <treding at nvidia.com>
> > ---
> >  drivers/gpu/drm/sti/sti_drm_crtc.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/sti/sti_drm_crtc.c b/drivers/gpu/drm/sti/sti_drm_crtc.c
> > index 26e63bf14efe..67279cc74348 100644
> > --- a/drivers/gpu/drm/sti/sti_drm_crtc.c
> > +++ b/drivers/gpu/drm/sti/sti_drm_crtc.c
> > @@ -234,7 +234,7 @@ int sti_drm_crtc_vblank_cb(struct notifier_block *nb,
> >
> >         spin_lock_irqsave(&drm_dev->event_lock, flags);
> >         if (compo->mixer[*crtc]->pending_event) {
> > -               drm_send_vblank_event(drm_dev, -1,
> > +               drm_send_vblank_event(drm_dev, *crtc,
> >                                 compo->mixer[*crtc]->pending_event);
> >                 drm_vblank_put(drm_dev, *crtc);
> >                 compo->mixer[*crtc]->pending_event = NULL;
> > --
> > 2.4.5
> >
> 
> 
> 
> -- 
> Benjamin Gaignard
> 
> Graphic Working Group
> 
> Linaro.org │ Open source software for ARM SoCs
> 
> Follow Linaro: Facebook | Twitter | Blog
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20150813/d8ee7324/attachment.sig>