Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1416232

[PATCH 03/10] drm: remove legacy drm_arm_vblank_event()

Show all headers | View raw

From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

We don't have any user of this function anymore, let's remove it.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
 drivers/gpu/drm/drm_irq.c | 39 ++++++++-------------------------------
 include/drm/drmP.h        |  2 --
 2 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 6eb17a2..38cc782 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -1001,34 +1001,6 @@ static void send_vblank_event(struct drm_device *dev,
 }
 
 /**
- * drm_arm_vblank_event - arm vblank event after pageflip
- * @dev: DRM device
- * @pipe: CRTC index
- * @e: the event to prepare to send
- *
- * A lot of drivers need to generate vblank events for the very next vblank
- * interrupt. For example when the page flip interrupt happens when the page
- * flip gets armed, but not when it actually executes within the next vblank
- * period. This helper function implements exactly the required vblank arming
- * behaviour.
- *
- * Caller must hold event lock. Caller must also hold a vblank reference for
- * the event @e, which will be dropped when the next vblank arrives.
- *
- * This is the legacy version of drm_crtc_arm_vblank_event().
- */
-void drm_arm_vblank_event(struct drm_device *dev, unsigned int pipe,
-			  struct drm_pending_vblank_event *e)
-{
-	assert_spin_locked(&dev->event_lock);
-
-	e->pipe = pipe;
-	e->event.sequence = drm_vblank_count(dev, pipe);
-	list_add_tail(&e->base.link, &dev->vblank_event_list);
-}
-EXPORT_SYMBOL(drm_arm_vblank_event);
-
-/**
  * drm_crtc_arm_vblank_event - arm vblank event after pageflip
  * @crtc: the source CRTC of the vblank event
  * @e: the event to send
@@ -1041,13 +1013,18 @@ EXPORT_SYMBOL(drm_arm_vblank_event);
  *
  * Caller must hold event lock. Caller must also hold a vblank reference for
  * the event @e, which will be dropped when the next vblank arrives.
- *
- * This is the native KMS version of drm_arm_vblank_event().
  */
 void drm_crtc_arm_vblank_event(struct drm_crtc *crtc,
 			       struct drm_pending_vblank_event *e)
 {
-	drm_arm_vblank_event(crtc->dev, drm_crtc_index(crtc), e);
+	struct drm_device *dev = crtc->dev;
+	unsigned int pipe = drm_crtc_index(crtc);
+
+	assert_spin_locked(&dev->event_lock);
+
+	e->pipe = pipe;
+	e->event.sequence = drm_vblank_count(dev, pipe);
+	list_add_tail(&e->base.link, &dev->vblank_event_list);
 }
 EXPORT_SYMBOL(drm_crtc_arm_vblank_event);
 
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 5aff206..924b4fd 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -971,8 +971,6 @@ extern u32 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc,
 					  struct timeval *vblanktime);
 extern void drm_crtc_send_vblank_event(struct drm_crtc *crtc,
 				       struct drm_pending_vblank_event *e);
-extern void drm_arm_vblank_event(struct drm_device *dev, unsigned int pipe,
-				 struct drm_pending_vblank_event *e);
 extern void drm_crtc_arm_vblank_event(struct drm_crtc *crtc,
 				      struct drm_pending_vblank_event *e);
 extern bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe);
-- 
2.5.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 01/10] drm/nouveau: replace legacy vblank helpers Gustavo Padovan <gustavo@padovan.org> - 2016-06-07 16:10 +0200
  [PATCH 09/10] drm/amdgpu: use crtc directly in drm_crtc_vblank_put() Gustavo Padovan <gustavo@padovan.org> - 2016-06-07 16:10 +0200
  [PATCH 03/10] drm: remove legacy drm_arm_vblank_event() Gustavo Padovan <gustavo@padovan.org> - 2016-06-07 16:10 +0200
  [PATCH 10/10] drm/radeon: use crtc directly in drm_crtc_vblank_put() Gustavo Padovan <gustavo@padovan.org> - 2016-06-07 16:10 +0200
  [PATCH 04/10] drm: make drm_vblank_{get,put}() static Gustavo Padovan <gustavo@padovan.org> - 2016-06-07 16:10 +0200
  [PATCH 06/10] drm/amdgpu: use drm_crtc_vblank_{on,off}() Gustavo Padovan <gustavo@padovan.org> - 2016-06-07 16:10 +0200
    Re: [PATCH 06/10] drm/amdgpu: use drm_crtc_vblank_{on,off}() Michel Dänzer <michel@daenzer.net> - 2016-06-08 06:00 +0200
  [PATCH 08/10] drm/radeon: use drm_crtc_vblank_{on,off}() Gustavo Padovan <gustavo@padovan.org> - 2016-06-07 16:10 +0200
  [PATCH 02/10] drm: remove legacy drm_send_vblank_event() Gustavo Padovan <gustavo@padovan.org> - 2016-06-07 16:10 +0200
  [PATCH 07/10] drm/gma500: use drm_crtc_vblank_{on,off}() Gustavo Padovan <gustavo@padovan.org> - 2016-06-07 16:20 +0200
    Re: [PATCH 07/10] drm/gma500: use drm_crtc_vblank_{on,off}() Patrik Jakobsson <patrik.r.jakobsson@gmail.com> - 2016-06-07 17:00 +0200
  [PATCH 05/10] drm: make drm_vblank_count_and_time() static Gustavo Padovan <gustavo@padovan.org> - 2016-06-07 16:20 +0200
    Re: [PATCH 05/10] drm: make drm_vblank_count_and_time() static Gustavo Padovan <gustavo@padovan.org> - 2016-06-07 17:00 +0200

csiph-web