| Message ID | 1386758111-3446-27-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Dec 11, 2013 at 11:34 AM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > This has the nice advantage that we'll get rid of a DRM_WAIT_ON user > for free. > > Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> > Cc: Alan Cox <alan@linux.intel.com> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/gma500/psb_irq.c | 15 --------------- > 1 file changed, 15 deletions(-) > > diff --git a/drivers/gpu/drm/gma500/psb_irq.c b/drivers/gpu/drm/gma500/psb_irq.c > index a9bb34704738..f883f9e4c524 100644 > --- a/drivers/gpu/drm/gma500/psb_irq.c > +++ b/drivers/gpu/drm/gma500/psb_irq.c > @@ -450,21 +450,6 @@ int psb_irq_disable_dpst(struct drm_device *dev) > return 0; > } > > -#ifdef PSB_FIXME > -static int psb_vblank_do_wait(struct drm_device *dev, > - unsigned int *sequence, atomic_t *counter) > -{ > - unsigned int cur_vblank; > - int ret = 0; > - DRM_WAIT_ON(ret, dev->vblank.queue, 3 * HZ, > - (((cur_vblank = atomic_read(counter)) > - - *sequence) <= (1 << 23))); > - *sequence = cur_vblank; > - > - return ret; > -} > -#endif > - > /* > * It is used to enable VBLANK interrupt > */ > -- > 1.8.4.3 > Yes, that can just go away. Thanks. Acked-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
diff --git a/drivers/gpu/drm/gma500/psb_irq.c b/drivers/gpu/drm/gma500/psb_irq.c index a9bb34704738..f883f9e4c524 100644 --- a/drivers/gpu/drm/gma500/psb_irq.c +++ b/drivers/gpu/drm/gma500/psb_irq.c @@ -450,21 +450,6 @@ int psb_irq_disable_dpst(struct drm_device *dev) return 0; } -#ifdef PSB_FIXME -static int psb_vblank_do_wait(struct drm_device *dev, - unsigned int *sequence, atomic_t *counter) -{ - unsigned int cur_vblank; - int ret = 0; - DRM_WAIT_ON(ret, dev->vblank.queue, 3 * HZ, - (((cur_vblank = atomic_read(counter)) - - *sequence) <= (1 << 23))); - *sequence = cur_vblank; - - return ret; -} -#endif - /* * It is used to enable VBLANK interrupt */
This has the nice advantage that we'll get rid of a DRM_WAIT_ON user for free. Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> Cc: Alan Cox <alan@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/gma500/psb_irq.c | 15 --------------- 1 file changed, 15 deletions(-)