subject:"\[PATCH\] drm\: Factor\-out drm_emit_vblank

[PATCH] drm: Factor-out drm_emit_vblank_event code. (v2)

2011-05-02 Thread Christopher James Halse Rogers

On Fri, 2011-04-29 at 17:55 +0200, Marcin Slusarz wrote:
> On Fri, Apr 29, 2011 at 01:57:10PM +1000, christopher.halse.rogers at 
> canonical.com wrote:
> > From: Christopher James Halse Rogers  > canonical.com>
> > 
> > v2: Also pull out the drm_vblank_put call.
> > Signed-off-by: Christopher James Halse Rogers  > canonical.com>
> > ---
> >  drivers/gpu/drm/drm_irq.c |   44 
> > ++--
> >  1 files changed, 18 insertions(+), 26 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> > index 982ca8c..da56685 100644
> > --- a/drivers/gpu/drm/drm_irq.c
> > +++ b/drivers/gpu/drm/drm_irq.c
> > @@ -931,6 +931,20 @@ void drm_vblank_put(struct drm_device *dev, int crtc)
> >  }
> >  EXPORT_SYMBOL(drm_vblank_put);
> >  
> > +static void drm_emit_vblank_event (struct drm_device *dev,
> > +  struct drm_pending_vblank_event *e,
> > +  unsigned int seq, struct timeval *now)
> > +{
> > +   e->event.sequence = seq;
> > +   e->event.tv_sec = now->tv_sec;
> > +   e->event.tv_usec = now->tv_usec;
> > +   drm_vblank_put(dev, e->pipe);
> > +   list_move_tail(&e->base.link, &e->base.file_priv->event_list);
> > +   wake_up_interruptible(&e->base.file_priv->event_wait);
> > +   trace_drm_vblank_event_delivered(e->base.pid, e->pipe,
> > +e->event.sequence);
> > +}
> > +
> >  void drm_vblank_off(struct drm_device *dev, int crtc)
> >  {
> > struct drm_pending_vblank_event *e, *t;
> > @@ -951,14 +965,7 @@ void drm_vblank_off(struct drm_device *dev, int crtc)
> >   wanted %d, current %d\n",
> >   e->event.sequence, seq);
> >  
> > -   e->event.sequence = seq;
> > -   e->event.tv_sec = now.tv_sec;
> > -   e->event.tv_usec = now.tv_usec;
> > -   drm_vblank_put(dev, e->pipe);
> > -   list_move_tail(&e->base.link, &e->base.file_priv->event_list);
> > -   wake_up_interruptible(&e->base.file_priv->event_wait);
> > -   trace_drm_vblank_event_delivered(e->base.pid, e->pipe,
> > -e->event.sequence);
> > +   drm_emit_vblank_event(dev, e, seq, &now);
> > }
> >  
> > WARN_ON(atomic_read(&dev->vblank_refcount[crtc]) != 0);
> > @@ -1104,18 +,10 @@ static int drm_queue_vblank_event(struct drm_device 
> > *dev, int pipe,
> >   vblwait->request.sequence);
> >  
> > e->event.sequence = vblwait->request.sequence;
> > +   list_add_tail(&e->base.link, &dev->vblank_event_list);
> 
> Is &dev->vblank_event_list == &e->base.file_priv->event_list?
> If they are not equal this is changing the behavior...

This gets moved to e->base.file_priv->event_list in
drm_emit_vblank_event ().  So it's doing a bit of useless work setting a
couple of pointers, but this doesn't change the behaviour.

> 
> > if ((seq - vblwait->request.sequence) <= (1 << 23)) {
> > -   e->event.sequence = seq;
> > -   e->event.tv_sec = now.tv_sec;
> > -   e->event.tv_usec = now.tv_usec;
> > -   drm_vblank_put(dev, pipe);
> > -   list_add_tail(&e->base.link, &e->base.file_priv->event_list);
> > -   wake_up_interruptible(&e->base.file_priv->event_wait);
> > -   vblwait->reply.sequence = seq;
> 
> Is it OK to drop this substitution?

Ahem.  No, it's not.  That's an overzealous delete key going off.  Hm.
Either the clients I was testing don't care about the reply, or the
clients I was testing always set _DRM_BLANK_NEXTONMISS.  I think it's
the latter.

Updated patch coming.

> 
> > -   trace_drm_vblank_event_delivered(current->pid, pipe,
> > -vblwait->request.sequence);
> > +   drm_emit_vblank_event(dev, e, seq, &now);
> > } else {
> > -   list_add_tail(&e->base.link, &dev->vblank_event_list);
> > vblwait->reply.sequence = vblwait->request.sequence;
> > }
> >  
> > @@ -1249,14 +1248,7 @@ void drm_handle_vblank_events(struct drm_device 
> > *dev, int crtc)
> > DRM_DEBUG("vblank event on %d, current %d\n",
> >   e->event.sequence, seq);
> >  
> > -   e->event.sequence = seq;
> > -   e->event.tv_sec = now.tv_sec;
> > -   e->event.tv_usec = now.tv_usec;
> > -   drm_vblank_put(dev, e->pipe);
> > -   list_move_tail(&e->base.link, &e->base.file_priv->event_list);
> > -   wake_up_interruptible(&e->base.file_priv->event_wait);
> > -   trace_drm_vblank_event_delivered(e->base.pid, e->pipe,
> > -e->event.sequence);
> > +   drm_emit_vblank_event(dev, e, seq, &now);
> > }
> >  
> > spin_unlock_irqrestore(&dev->event_lock, flags);
> > -- 


-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-si

Re: [PATCH] drm: Factor-out drm_emit_vblank_event code. (v2)

2011-05-01 Thread Christopher James Halse Rogers

On Fri, 2011-04-29 at 17:55 +0200, Marcin Slusarz wrote:
> On Fri, Apr 29, 2011 at 01:57:10PM +1000, 
> christopher.halse.rog...@canonical.com wrote:
> > From: Christopher James Halse Rogers 
> > 
> > 
> > v2: Also pull out the drm_vblank_put call.
> > Signed-off-by: Christopher James Halse Rogers 
> > 
> > ---
> >  drivers/gpu/drm/drm_irq.c |   44 
> > ++--
> >  1 files changed, 18 insertions(+), 26 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> > index 982ca8c..da56685 100644
> > --- a/drivers/gpu/drm/drm_irq.c
> > +++ b/drivers/gpu/drm/drm_irq.c
> > @@ -931,6 +931,20 @@ void drm_vblank_put(struct drm_device *dev, int crtc)
> >  }
> >  EXPORT_SYMBOL(drm_vblank_put);
> >  
> > +static void drm_emit_vblank_event (struct drm_device *dev,
> > +  struct drm_pending_vblank_event *e,
> > +  unsigned int seq, struct timeval *now)
> > +{
> > +   e->event.sequence = seq;
> > +   e->event.tv_sec = now->tv_sec;
> > +   e->event.tv_usec = now->tv_usec;
> > +   drm_vblank_put(dev, e->pipe);
> > +   list_move_tail(&e->base.link, &e->base.file_priv->event_list);
> > +   wake_up_interruptible(&e->base.file_priv->event_wait);
> > +   trace_drm_vblank_event_delivered(e->base.pid, e->pipe,
> > +e->event.sequence);
> > +}
> > +
> >  void drm_vblank_off(struct drm_device *dev, int crtc)
> >  {
> > struct drm_pending_vblank_event *e, *t;
> > @@ -951,14 +965,7 @@ void drm_vblank_off(struct drm_device *dev, int crtc)
> >   wanted %d, current %d\n",
> >   e->event.sequence, seq);
> >  
> > -   e->event.sequence = seq;
> > -   e->event.tv_sec = now.tv_sec;
> > -   e->event.tv_usec = now.tv_usec;
> > -   drm_vblank_put(dev, e->pipe);
> > -   list_move_tail(&e->base.link, &e->base.file_priv->event_list);
> > -   wake_up_interruptible(&e->base.file_priv->event_wait);
> > -   trace_drm_vblank_event_delivered(e->base.pid, e->pipe,
> > -e->event.sequence);
> > +   drm_emit_vblank_event(dev, e, seq, &now);
> > }
> >  
> > WARN_ON(atomic_read(&dev->vblank_refcount[crtc]) != 0);
> > @@ -1104,18 +,10 @@ static int drm_queue_vblank_event(struct drm_device 
> > *dev, int pipe,
> >   vblwait->request.sequence);
> >  
> > e->event.sequence = vblwait->request.sequence;
> > +   list_add_tail(&e->base.link, &dev->vblank_event_list);
> 
> Is &dev->vblank_event_list == &e->base.file_priv->event_list?
> If they are not equal this is changing the behavior...

This gets moved to e->base.file_priv->event_list in
drm_emit_vblank_event ().  So it's doing a bit of useless work setting a
couple of pointers, but this doesn't change the behaviour.

> 
> > if ((seq - vblwait->request.sequence) <= (1 << 23)) {
> > -   e->event.sequence = seq;
> > -   e->event.tv_sec = now.tv_sec;
> > -   e->event.tv_usec = now.tv_usec;
> > -   drm_vblank_put(dev, pipe);
> > -   list_add_tail(&e->base.link, &e->base.file_priv->event_list);
> > -   wake_up_interruptible(&e->base.file_priv->event_wait);
> > -   vblwait->reply.sequence = seq;
> 
> Is it OK to drop this substitution?

Ahem.  No, it's not.  That's an overzealous delete key going off.  Hm.
Either the clients I was testing don't care about the reply, or the
clients I was testing always set _DRM_BLANK_NEXTONMISS.  I think it's
the latter.

Updated patch coming.

> 
> > -   trace_drm_vblank_event_delivered(current->pid, pipe,
> > -vblwait->request.sequence);
> > +   drm_emit_vblank_event(dev, e, seq, &now);
> > } else {
> > -   list_add_tail(&e->base.link, &dev->vblank_event_list);
> > vblwait->reply.sequence = vblwait->request.sequence;
> > }
> >  
> > @@ -1249,14 +1248,7 @@ void drm_handle_vblank_events(struct drm_device 
> > *dev, int crtc)
> > DRM_DEBUG("vblank event on %d, current %d\n",
> >   e->event.sequence, seq);
> >  
> > -   e->event.sequence = seq;
> > -   e->event.tv_sec = now.tv_sec;
> > -   e->event.tv_usec = now.tv_usec;
> > -   drm_vblank_put(dev, e->pipe);
> > -   list_move_tail(&e->base.link, &e->base.file_priv->event_list);
> > -   wake_up_interruptible(&e->base.file_priv->event_wait);
> > -   trace_drm_vblank_event_delivered(e->base.pid, e->pipe,
> > -e->event.sequence);
> > +   drm_emit_vblank_event(dev, e, seq, &now);
> > }
> >  
> > spin_unlock_irqrestore(&dev->event_lock, flags);
> > -- 




signature.asc
Description: This is a digitally signed message part
___
dri-devel mailing list
dri-devel

[PATCH] drm: Factor-out drm_emit_vblank_event code. (v2)

2011-04-29 Thread Marcin Slusarz

On Fri, Apr 29, 2011 at 01:57:10PM +1000, christopher.halse.rogers at 
canonical.com wrote:
> From: Christopher James Halse Rogers  canonical.com>
> 
> v2: Also pull out the drm_vblank_put call.
> Signed-off-by: Christopher James Halse Rogers  canonical.com>
> ---
>  drivers/gpu/drm/drm_irq.c |   44 ++--
>  1 files changed, 18 insertions(+), 26 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> index 982ca8c..da56685 100644
> --- a/drivers/gpu/drm/drm_irq.c
> +++ b/drivers/gpu/drm/drm_irq.c
> @@ -931,6 +931,20 @@ void drm_vblank_put(struct drm_device *dev, int crtc)
>  }
>  EXPORT_SYMBOL(drm_vblank_put);
>  
> +static void drm_emit_vblank_event (struct drm_device *dev,
> +struct drm_pending_vblank_event *e,
> +unsigned int seq, struct timeval *now)
> +{
> + e->event.sequence = seq;
> + e->event.tv_sec = now->tv_sec;
> + e->event.tv_usec = now->tv_usec;
> + drm_vblank_put(dev, e->pipe);
> + list_move_tail(&e->base.link, &e->base.file_priv->event_list);
> + wake_up_interruptible(&e->base.file_priv->event_wait);
> + trace_drm_vblank_event_delivered(e->base.pid, e->pipe,
> +  e->event.sequence);
> +}
> +
>  void drm_vblank_off(struct drm_device *dev, int crtc)
>  {
>   struct drm_pending_vblank_event *e, *t;
> @@ -951,14 +965,7 @@ void drm_vblank_off(struct drm_device *dev, int crtc)
> wanted %d, current %d\n",
> e->event.sequence, seq);
>  
> - e->event.sequence = seq;
> - e->event.tv_sec = now.tv_sec;
> - e->event.tv_usec = now.tv_usec;
> - drm_vblank_put(dev, e->pipe);
> - list_move_tail(&e->base.link, &e->base.file_priv->event_list);
> - wake_up_interruptible(&e->base.file_priv->event_wait);
> - trace_drm_vblank_event_delivered(e->base.pid, e->pipe,
> -  e->event.sequence);
> + drm_emit_vblank_event(dev, e, seq, &now);
>   }
>  
>   WARN_ON(atomic_read(&dev->vblank_refcount[crtc]) != 0);
> @@ -1104,18 +,10 @@ static int drm_queue_vblank_event(struct drm_device 
> *dev, int pipe,
> vblwait->request.sequence);
>  
>   e->event.sequence = vblwait->request.sequence;
> + list_add_tail(&e->base.link, &dev->vblank_event_list);

Is &dev->vblank_event_list == &e->base.file_priv->event_list?
If they are not equal this is changing the behavior...

>   if ((seq - vblwait->request.sequence) <= (1 << 23)) {
> - e->event.sequence = seq;
> - e->event.tv_sec = now.tv_sec;
> - e->event.tv_usec = now.tv_usec;
> - drm_vblank_put(dev, pipe);
> - list_add_tail(&e->base.link, &e->base.file_priv->event_list);
> - wake_up_interruptible(&e->base.file_priv->event_wait);
> - vblwait->reply.sequence = seq;

Is it OK to drop this substitution?

> - trace_drm_vblank_event_delivered(current->pid, pipe,
> -  vblwait->request.sequence);
> + drm_emit_vblank_event(dev, e, seq, &now);
>   } else {
> - list_add_tail(&e->base.link, &dev->vblank_event_list);
>   vblwait->reply.sequence = vblwait->request.sequence;
>   }
>  
> @@ -1249,14 +1248,7 @@ void drm_handle_vblank_events(struct drm_device *dev, 
> int crtc)
>   DRM_DEBUG("vblank event on %d, current %d\n",
> e->event.sequence, seq);
>  
> - e->event.sequence = seq;
> - e->event.tv_sec = now.tv_sec;
> - e->event.tv_usec = now.tv_usec;
> - drm_vblank_put(dev, e->pipe);
> - list_move_tail(&e->base.link, &e->base.file_priv->event_list);
> - wake_up_interruptible(&e->base.file_priv->event_wait);
> - trace_drm_vblank_event_delivered(e->base.pid, e->pipe,
> -  e->event.sequence);
> + drm_emit_vblank_event(dev, e, seq, &now);
>   }
>  
>   spin_unlock_irqrestore(&dev->event_lock, flags);
> --

[PATCH] drm: Factor-out drm_emit_vblank_event code. (v2)

2011-04-29 Thread christopher.halse.rog...@canonical.com

From: Christopher James Halse Rogers 

v2: Also pull out the drm_vblank_put call.
Signed-off-by: Christopher James Halse Rogers 
---
 drivers/gpu/drm/drm_irq.c |   44 ++--
 1 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 982ca8c..da56685 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -931,6 +931,20 @@ void drm_vblank_put(struct drm_device *dev, int crtc)
 }
 EXPORT_SYMBOL(drm_vblank_put);

+static void drm_emit_vblank_event (struct drm_device *dev,
+  struct drm_pending_vblank_event *e,
+  unsigned int seq, struct timeval *now)
+{
+   e->event.sequence = seq;
+   e->event.tv_sec = now->tv_sec;
+   e->event.tv_usec = now->tv_usec;
+   drm_vblank_put(dev, e->pipe);
+   list_move_tail(&e->base.link, &e->base.file_priv->event_list);
+   wake_up_interruptible(&e->base.file_priv->event_wait);
+   trace_drm_vblank_event_delivered(e->base.pid, e->pipe,
+e->event.sequence);
+}
+
 void drm_vblank_off(struct drm_device *dev, int crtc)
 {
struct drm_pending_vblank_event *e, *t;
@@ -951,14 +965,7 @@ void drm_vblank_off(struct drm_device *dev, int crtc)
  wanted %d, current %d\n",
  e->event.sequence, seq);

-   e->event.sequence = seq;
-   e->event.tv_sec = now.tv_sec;
-   e->event.tv_usec = now.tv_usec;
-   drm_vblank_put(dev, e->pipe);
-   list_move_tail(&e->base.link, &e->base.file_priv->event_list);
-   wake_up_interruptible(&e->base.file_priv->event_wait);
-   trace_drm_vblank_event_delivered(e->base.pid, e->pipe,
-e->event.sequence);
+   drm_emit_vblank_event(dev, e, seq, &now);
}

WARN_ON(atomic_read(&dev->vblank_refcount[crtc]) != 0);
@@ -1104,18 +,10 @@ static int drm_queue_vblank_event(struct drm_device 
*dev, int pipe,
  vblwait->request.sequence);

e->event.sequence = vblwait->request.sequence;
+   list_add_tail(&e->base.link, &dev->vblank_event_list);
if ((seq - vblwait->request.sequence) <= (1 << 23)) {
-   e->event.sequence = seq;
-   e->event.tv_sec = now.tv_sec;
-   e->event.tv_usec = now.tv_usec;
-   drm_vblank_put(dev, pipe);
-   list_add_tail(&e->base.link, &e->base.file_priv->event_list);
-   wake_up_interruptible(&e->base.file_priv->event_wait);
-   vblwait->reply.sequence = seq;
-   trace_drm_vblank_event_delivered(current->pid, pipe,
-vblwait->request.sequence);
+   drm_emit_vblank_event(dev, e, seq, &now);
} else {
-   list_add_tail(&e->base.link, &dev->vblank_event_list);
vblwait->reply.sequence = vblwait->request.sequence;
}

@@ -1249,14 +1248,7 @@ void drm_handle_vblank_events(struct drm_device *dev, 
int crtc)
DRM_DEBUG("vblank event on %d, current %d\n",
  e->event.sequence, seq);

-   e->event.sequence = seq;
-   e->event.tv_sec = now.tv_sec;
-   e->event.tv_usec = now.tv_usec;
-   drm_vblank_put(dev, e->pipe);
-   list_move_tail(&e->base.link, &e->base.file_priv->event_list);
-   wake_up_interruptible(&e->base.file_priv->event_wait);
-   trace_drm_vblank_event_delivered(e->base.pid, e->pipe,
-e->event.sequence);
+   drm_emit_vblank_event(dev, e, seq, &now);
}

spin_unlock_irqrestore(&dev->event_lock, flags);
-- 
1.7.4.1

Re: [PATCH] drm: Factor-out drm_emit_vblank_event code. (v2)

2011-04-29 Thread Marcin Slusarz

On Fri, Apr 29, 2011 at 01:57:10PM +1000, 
christopher.halse.rog...@canonical.com wrote:
> From: Christopher James Halse Rogers 
> 
> v2: Also pull out the drm_vblank_put call.
> Signed-off-by: Christopher James Halse Rogers 
> 
> ---
>  drivers/gpu/drm/drm_irq.c |   44 ++--
>  1 files changed, 18 insertions(+), 26 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> index 982ca8c..da56685 100644
> --- a/drivers/gpu/drm/drm_irq.c
> +++ b/drivers/gpu/drm/drm_irq.c
> @@ -931,6 +931,20 @@ void drm_vblank_put(struct drm_device *dev, int crtc)
>  }
>  EXPORT_SYMBOL(drm_vblank_put);
>  
> +static void drm_emit_vblank_event (struct drm_device *dev,
> +struct drm_pending_vblank_event *e,
> +unsigned int seq, struct timeval *now)
> +{
> + e->event.sequence = seq;
> + e->event.tv_sec = now->tv_sec;
> + e->event.tv_usec = now->tv_usec;
> + drm_vblank_put(dev, e->pipe);
> + list_move_tail(&e->base.link, &e->base.file_priv->event_list);
> + wake_up_interruptible(&e->base.file_priv->event_wait);
> + trace_drm_vblank_event_delivered(e->base.pid, e->pipe,
> +  e->event.sequence);
> +}
> +
>  void drm_vblank_off(struct drm_device *dev, int crtc)
>  {
>   struct drm_pending_vblank_event *e, *t;
> @@ -951,14 +965,7 @@ void drm_vblank_off(struct drm_device *dev, int crtc)
> wanted %d, current %d\n",
> e->event.sequence, seq);
>  
> - e->event.sequence = seq;
> - e->event.tv_sec = now.tv_sec;
> - e->event.tv_usec = now.tv_usec;
> - drm_vblank_put(dev, e->pipe);
> - list_move_tail(&e->base.link, &e->base.file_priv->event_list);
> - wake_up_interruptible(&e->base.file_priv->event_wait);
> - trace_drm_vblank_event_delivered(e->base.pid, e->pipe,
> -  e->event.sequence);
> + drm_emit_vblank_event(dev, e, seq, &now);
>   }
>  
>   WARN_ON(atomic_read(&dev->vblank_refcount[crtc]) != 0);
> @@ -1104,18 +,10 @@ static int drm_queue_vblank_event(struct drm_device 
> *dev, int pipe,
> vblwait->request.sequence);
>  
>   e->event.sequence = vblwait->request.sequence;
> + list_add_tail(&e->base.link, &dev->vblank_event_list);

Is &dev->vblank_event_list == &e->base.file_priv->event_list?
If they are not equal this is changing the behavior...

>   if ((seq - vblwait->request.sequence) <= (1 << 23)) {
> - e->event.sequence = seq;
> - e->event.tv_sec = now.tv_sec;
> - e->event.tv_usec = now.tv_usec;
> - drm_vblank_put(dev, pipe);
> - list_add_tail(&e->base.link, &e->base.file_priv->event_list);
> - wake_up_interruptible(&e->base.file_priv->event_wait);
> - vblwait->reply.sequence = seq;

Is it OK to drop this substitution?

> - trace_drm_vblank_event_delivered(current->pid, pipe,
> -  vblwait->request.sequence);
> + drm_emit_vblank_event(dev, e, seq, &now);
>   } else {
> - list_add_tail(&e->base.link, &dev->vblank_event_list);
>   vblwait->reply.sequence = vblwait->request.sequence;
>   }
>  
> @@ -1249,14 +1248,7 @@ void drm_handle_vblank_events(struct drm_device *dev, 
> int crtc)
>   DRM_DEBUG("vblank event on %d, current %d\n",
> e->event.sequence, seq);
>  
> - e->event.sequence = seq;
> - e->event.tv_sec = now.tv_sec;
> - e->event.tv_usec = now.tv_usec;
> - drm_vblank_put(dev, e->pipe);
> - list_move_tail(&e->base.link, &e->base.file_priv->event_list);
> - wake_up_interruptible(&e->base.file_priv->event_wait);
> - trace_drm_vblank_event_delivered(e->base.pid, e->pipe,
> -  e->event.sequence);
> + drm_emit_vblank_event(dev, e, seq, &now);
>   }
>  
>   spin_unlock_irqrestore(&dev->event_lock, flags);
> -- 
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH] drm: Factor-out drm_emit_vblank_event code. (v2)

2011-04-29 Thread Michel Dänzer

On Fre, 2011-04-29 at 13:57 +1000, christopher.halse.rogers at canonical.com 
wrote:
> From: Christopher James Halse Rogers  canonical.com>
> 
> v2: Also pull out the drm_vblank_put call.
> Signed-off-by: Christopher James Halse Rogers  canonical.com>

Reviewed-by: Michel D?nzer 


-- 
Earthling Michel D?nzer   |http://www.vmware.com
Libre software enthusiast |  Debian, X and DRI developer

Re: [PATCH] drm: Factor-out drm_emit_vblank_event code. (v2)

2011-04-28 Thread Michel Dänzer

On Fre, 2011-04-29 at 13:57 +1000, christopher.halse.rog...@canonical.com wrote:
> From: Christopher James Halse Rogers 
> 
> v2: Also pull out the drm_vblank_put call.
> Signed-off-by: Christopher James Halse Rogers 
> 

Reviewed-by: Michel Dänzer 


-- 
Earthling Michel Dänzer   |http://www.vmware.com
Libre software enthusiast |  Debian, X and DRI developer
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH] drm: Factor-out drm_emit_vblank_event code. (v2)

2011-04-28 Thread christopher . halse . rogers

From: Christopher James Halse Rogers 

v2: Also pull out the drm_vblank_put call.
Signed-off-by: Christopher James Halse Rogers 

---
 drivers/gpu/drm/drm_irq.c |   44 ++--
 1 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 982ca8c..da56685 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -931,6 +931,20 @@ void drm_vblank_put(struct drm_device *dev, int crtc)
 }
 EXPORT_SYMBOL(drm_vblank_put);
 
+static void drm_emit_vblank_event (struct drm_device *dev,
+  struct drm_pending_vblank_event *e,
+  unsigned int seq, struct timeval *now)
+{
+   e->event.sequence = seq;
+   e->event.tv_sec = now->tv_sec;
+   e->event.tv_usec = now->tv_usec;
+   drm_vblank_put(dev, e->pipe);
+   list_move_tail(&e->base.link, &e->base.file_priv->event_list);
+   wake_up_interruptible(&e->base.file_priv->event_wait);
+   trace_drm_vblank_event_delivered(e->base.pid, e->pipe,
+e->event.sequence);
+}
+
 void drm_vblank_off(struct drm_device *dev, int crtc)
 {
struct drm_pending_vblank_event *e, *t;
@@ -951,14 +965,7 @@ void drm_vblank_off(struct drm_device *dev, int crtc)
  wanted %d, current %d\n",
  e->event.sequence, seq);
 
-   e->event.sequence = seq;
-   e->event.tv_sec = now.tv_sec;
-   e->event.tv_usec = now.tv_usec;
-   drm_vblank_put(dev, e->pipe);
-   list_move_tail(&e->base.link, &e->base.file_priv->event_list);
-   wake_up_interruptible(&e->base.file_priv->event_wait);
-   trace_drm_vblank_event_delivered(e->base.pid, e->pipe,
-e->event.sequence);
+   drm_emit_vblank_event(dev, e, seq, &now);
}
 
WARN_ON(atomic_read(&dev->vblank_refcount[crtc]) != 0);
@@ -1104,18 +,10 @@ static int drm_queue_vblank_event(struct drm_device 
*dev, int pipe,
  vblwait->request.sequence);
 
e->event.sequence = vblwait->request.sequence;
+   list_add_tail(&e->base.link, &dev->vblank_event_list);
if ((seq - vblwait->request.sequence) <= (1 << 23)) {
-   e->event.sequence = seq;
-   e->event.tv_sec = now.tv_sec;
-   e->event.tv_usec = now.tv_usec;
-   drm_vblank_put(dev, pipe);
-   list_add_tail(&e->base.link, &e->base.file_priv->event_list);
-   wake_up_interruptible(&e->base.file_priv->event_wait);
-   vblwait->reply.sequence = seq;
-   trace_drm_vblank_event_delivered(current->pid, pipe,
-vblwait->request.sequence);
+   drm_emit_vblank_event(dev, e, seq, &now);
} else {
-   list_add_tail(&e->base.link, &dev->vblank_event_list);
vblwait->reply.sequence = vblwait->request.sequence;
}
 
@@ -1249,14 +1248,7 @@ void drm_handle_vblank_events(struct drm_device *dev, 
int crtc)
DRM_DEBUG("vblank event on %d, current %d\n",
  e->event.sequence, seq);
 
-   e->event.sequence = seq;
-   e->event.tv_sec = now.tv_sec;
-   e->event.tv_usec = now.tv_usec;
-   drm_vblank_put(dev, e->pipe);
-   list_move_tail(&e->base.link, &e->base.file_priv->event_list);
-   wake_up_interruptible(&e->base.file_priv->event_wait);
-   trace_drm_vblank_event_delivered(e->base.pid, e->pipe,
-e->event.sequence);
+   drm_emit_vblank_event(dev, e, seq, &now);
}
 
spin_unlock_irqrestore(&dev->event_lock, flags);
-- 
1.7.4.1

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH] drm: Factor-out drm_emit_vblank_event code. (v2)

Re: [PATCH] drm: Factor-out drm_emit_vblank_event code. (v2)

[PATCH] drm: Factor-out drm_emit_vblank_event code. (v2)

[PATCH] drm: Factor-out drm_emit_vblank_event code. (v2)

Re: [PATCH] drm: Factor-out drm_emit_vblank_event code. (v2)

[PATCH] drm: Factor-out drm_emit_vblank_event code. (v2)

Re: [PATCH] drm: Factor-out drm_emit_vblank_event code. (v2)

[PATCH] drm: Factor-out drm_emit_vblank_event code. (v2)

8 matches

Site Navigation

Mail list logo

Footer information