[PATCH 01/13] drm/irq: Remove negative CRTC index special-case

[PATCH 01/13] drm/irq: Remove negative CRTC index special-case

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

The drm_send_vblank_event() function treats negative CRTC indices as
meaning that a driver doesn't have proper VBLANK handling. This is the
only place where DRM needs negative CRTC indices, so in order to enable
subsequent cleanup, remove this special case and replace it by the more
obvious check for whether or not VBLANK support was initialized.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/gpu/drm/drm_irq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 75647e7f012b..a24658162284 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -934,7 +934,7 @@ void drm_send_vblank_event(struct drm_device *dev, int crtc,
 	struct timeval now;
 	unsigned int seq;
 
-	if (crtc >= 0) {
+	if (dev->num_crtcs > 0) {
 		seq = drm_vblank_count_and_time(dev, crtc, &now);
 	} else {
 		seq = 0;
-- 
2.1.3

[PATCH 02/13] drm/bochs: Store correct CRTC index in events

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

Previously a negative pipe caused a special case to be triggered for
drivers that didn't have proper VBLANK support. The trigger for this
special case is now independent of the pipe, so the correct CRTC index
can now be stored in events.

Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/gpu/drm/bochs/bochs_kms.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c
index 26bcd03a8cb6..c219c1de3722 100644
--- a/drivers/gpu/drm/bochs/bochs_kms.c
+++ b/drivers/gpu/drm/bochs/bochs_kms.c
@@ -113,13 +113,14 @@ static int bochs_crtc_page_flip(struct drm_crtc *crtc,
 	struct bochs_device *bochs =
 		container_of(crtc, struct bochs_device, crtc);
 	struct drm_framebuffer *old_fb = crtc->primary->fb;
+	unsigned int pipe = drm_crtc_index(crtc);
 	unsigned long irqflags;
 
 	crtc->primary->fb = fb;
 	bochs_crtc_mode_set_base(crtc, 0, 0, old_fb);
 	if (event) {
 		spin_lock_irqsave(&bochs->dev->event_lock, irqflags);
-		drm_send_vblank_event(bochs->dev, -1, event);
+		drm_send_vblank_event(bochs->dev, pipe, event);
 		spin_unlock_irqrestore(&bochs->dev->event_lock, irqflags);
 	}
 	return 0;
-- 
2.1.3

[PATCH 03/13] drm/exynos: Store correct CRTC index in events

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

A negative pipe causes a special case to be triggered for drivers that
don't have proper VBLANK support. Exynos does support VBLANKs, so there
is no need for the fallback code.

Cc: Inki Dae <inki.dae@samsung.com>
Cc: Joonyoung Shim <jy0922.shim@samsung.com>
Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/gpu/drm/exynos/exynos_drm_crtc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index 7615bb1b76de..f20fa537945c 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -537,7 +537,7 @@ void exynos_drm_crtc_finish_pageflip(struct drm_device *dev, int pipe)
 			continue;
 
 		list_del(&e->base.link);
-		drm_send_vblank_event(dev, -1, e);
+		drm_send_vblank_event(dev, pipe, e);
 		drm_vblank_put(dev, pipe);
 		atomic_set(&exynos_crtc->pending_flip, 0);
 		wake_up(&exynos_crtc->pending_flip_queue);
-- 
2.1.3

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

[PATCH 04/13] drm/imx: Make pipe number unsigned

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

There's no reason whatsoever why this should ever be negative.

Cc: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/gpu/drm/imx/imx-drm-core.c | 4 ++--
 drivers/gpu/drm/imx/imx-drm.h      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
index b250130debc8..c52eccc58a95 100644
--- a/drivers/gpu/drm/imx/imx-drm-core.c
+++ b/drivers/gpu/drm/imx/imx-drm-core.c
@@ -44,7 +44,7 @@ struct imx_drm_device {
 
 struct imx_drm_crtc {
 	struct drm_crtc				*crtc;
-	int					pipe;
+	unsigned int				pipe;
 	struct imx_drm_crtc_helper_funcs	imx_drm_helper_funcs;
 	struct device_node			*port;
 };
@@ -52,7 +52,7 @@ struct imx_drm_crtc {
 static int legacyfb_depth = 16;
 module_param(legacyfb_depth, int, 0444);
 
-int imx_drm_crtc_id(struct imx_drm_crtc *crtc)
+unsigned int imx_drm_crtc_id(struct imx_drm_crtc *crtc)
 {
 	return crtc->pipe;
 }
diff --git a/drivers/gpu/drm/imx/imx-drm.h b/drivers/gpu/drm/imx/imx-drm.h
index 7453ae00c412..a15b80319a6a 100644
--- a/drivers/gpu/drm/imx/imx-drm.h
+++ b/drivers/gpu/drm/imx/imx-drm.h
@@ -12,7 +12,7 @@ struct drm_framebuffer;
 struct imx_drm_crtc;
 struct platform_device;
 
-int imx_drm_crtc_id(struct imx_drm_crtc *crtc);
+unsigned int imx_drm_crtc_id(struct imx_drm_crtc *crtc);
 
 struct imx_drm_crtc_helper_funcs {
 	int (*enable_vblank)(struct drm_crtc *crtc);
-- 
2.1.3

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

[PATCH 05/13] drm/imx: Store correct CRTC index in events

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

A negative pipe causes a special case to be triggered for drivers that
don't have proper VBLANK support. i.MX does support VBLANKs, so there is
no need for the fallback code.

Cc: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/gpu/drm/imx/ipuv3-crtc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c
index ebee59cb96d8..df3e8b6101b3 100644
--- a/drivers/gpu/drm/imx/ipuv3-crtc.c
+++ b/drivers/gpu/drm/imx/ipuv3-crtc.c
@@ -209,7 +209,8 @@ static void ipu_crtc_handle_pageflip(struct ipu_crtc *ipu_crtc)
 
 	spin_lock_irqsave(&drm->event_lock, flags);
 	if (ipu_crtc->page_flip_event)
-		drm_send_vblank_event(drm, -1, ipu_crtc->page_flip_event);
+		drm_send_vblank_event(drm, imx_drm_crtc_id(ipu_crtc->imx_crtc),
+				      ipu_crtc->page_flip_event);
 	ipu_crtc->page_flip_event = NULL;
 	imx_drm_crtc_vblank_put(ipu_crtc->imx_crtc);
 	spin_unlock_irqrestore(&drm->event_lock, flags);
-- 
2.1.3

[PATCH 06/13] drm/rockchip: Store correct CRTC index in events

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

A negative pipe causes a special case to be triggered for drivers that
don't have proper VBLANK support. Rockchip does support VBLANKs, so
there is no need for the fallback code.

Cc: Mark Yao <mark.yao@rock-chips.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index e7ca25b3fb38..999616d216ac 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -958,7 +958,7 @@ static void vop_win_state_complete(struct vop_win *vop_win,
 
 	if (state->event) {
 		spin_lock_irqsave(&drm->event_lock, flags);
-		drm_send_vblank_event(drm, -1, state->event);
+		drm_send_vblank_event(drm, vop->pipe, state->event);
 		spin_unlock_irqrestore(&drm->event_lock, flags);
 	}
 
-- 
2.1.3

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

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

[Thierry Reding]

From: Thierry Reding <treding@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@linaro.org>
Signed-off-by: Thierry Reding <treding@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 e6f6ef7c4866..13bfe7bcb167 100644
--- a/drivers/gpu/drm/sti/sti_drm_crtc.c
+++ b/drivers/gpu/drm/sti/sti_drm_crtc.c
@@ -332,7 +332,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.1.3

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

[PATCH 08/13] drm/irq: Check for valid VBLANK before dereference

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

When accessing the array of per-CRTC VBLANK structures we must always
check that the index into the array is valid before dereferencing to
avoid crashing.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/gpu/drm/drm_irq.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index a24658162284..cb207e047505 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -1070,10 +1070,10 @@ void drm_vblank_put(struct drm_device *dev, int crtc)
 {
 	struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
 
-	if (WARN_ON(atomic_read(&vblank->refcount) == 0))
+	if (WARN_ON(crtc >= dev->num_crtcs))
 		return;
 
-	if (WARN_ON(crtc >= dev->num_crtcs))
+	if (WARN_ON(atomic_read(&vblank->refcount) == 0))
 		return;
 
 	/* Last user schedules interrupt disable */
@@ -1356,6 +1356,9 @@ void drm_vblank_post_modeset(struct drm_device *dev, int crtc)
 	if (!dev->num_crtcs)
 		return;
 
+	if (WARN_ON(crtc >= dev->num_crtcs))
+		return;
+
 	if (vblank->inmodeset) {
 		spin_lock_irqsave(&dev->vbl_lock, irqflags);
 		dev->vblank_disable_allowed = true;
-- 
2.1.3

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

[PATCH 09/13] drm/irq: Make pipe unsigned and name consistent

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

Name all references to the pipe number (CRTC index) consistently to make
it easier to distinguish which is a pipe number and which is a pointer
to struct drm_crtc.

While at it also make all references to the pipe number unsigned because
there is no longer any reason why it should ever be negative.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/gpu/drm/drm_irq.c | 319 +++++++++++++++++++++++-----------------------
 include/drm/drmP.h        |  34 ++---
 2 files changed, 179 insertions(+), 174 deletions(-)

diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index cb207e047505..9c32a1d7aec2 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -43,8 +43,8 @@
 #include <linux/export.h>
 
 /* Access macro for slots in vblank timestamp ringbuffer. */
-#define vblanktimestamp(dev, crtc, count) \
-	((dev)->vblank[crtc].time[(count) % DRM_VBLANKTIME_RBSIZE])
+#define vblanktimestamp(dev, pipe, count) \
+	((dev)->vblank[pipe].time[(count) % DRM_VBLANKTIME_RBSIZE])
 
 /* Retry timestamp calculation up to 3 times to satisfy
  * drm_timestamp_precision before giving up.
@@ -57,7 +57,7 @@
 #define DRM_REDUNDANT_VBLIRQ_THRESH_NS 1000000
 
 static bool
-drm_get_last_vbltimestamp(struct drm_device *dev, int crtc,
+drm_get_last_vbltimestamp(struct drm_device *dev, unsigned int pipe,
 			  struct timeval *tvblank, unsigned flags);
 
 static unsigned int drm_timestamp_precision = 20;  /* Default to 20 usecs. */
@@ -77,7 +77,7 @@ module_param_named(timestamp_monotonic, drm_timestamp_monotonic, int, 0600);
 /**
  * drm_update_vblank_count - update the master vblank counter
  * @dev: DRM device
- * @crtc: counter to update
+ * @pipe: counter to update
  *
  * Call back into the driver to update the appropriate vblank counter
  * (specified by @crtc).  Deal with wraparound, if it occurred, and
@@ -90,9 +90,9 @@ module_param_named(timestamp_monotonic, drm_timestamp_monotonic, int, 0600);
  * Note: caller must hold dev->vbl_lock since this reads & writes
  * device vblank fields.
  */
-static void drm_update_vblank_count(struct drm_device *dev, int crtc)
+static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe)
 {
-	struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
 	u32 cur_vblank, diff, tslot;
 	bool rc;
 	struct timeval t_vblank;
@@ -110,21 +110,21 @@ static void drm_update_vblank_count(struct drm_device *dev, int crtc)
 	 * corresponding vblank timestamp.
 	 */
 	do {
-		cur_vblank = dev->driver->get_vblank_counter(dev, crtc);
-		rc = drm_get_last_vbltimestamp(dev, crtc, &t_vblank, 0);
-	} while (cur_vblank != dev->driver->get_vblank_counter(dev, crtc));
+		cur_vblank = dev->driver->get_vblank_counter(dev, pipe);
+		rc = drm_get_last_vbltimestamp(dev, pipe, &t_vblank, 0);
+	} while (cur_vblank != dev->driver->get_vblank_counter(dev, pipe));
 
 	/* Deal with counter wrap */
 	diff = cur_vblank - vblank->last;
 	if (cur_vblank < vblank->last) {
 		diff += dev->max_vblank_count;
 
-		DRM_DEBUG("last_vblank[%d]=0x%x, cur_vblank=0x%x => diff=0x%x\n",
-			  crtc, vblank->last, cur_vblank, diff);
+		DRM_DEBUG("last_vblank[%u]=0x%x, cur_vblank=0x%x => diff=0x%x\n",
+			  pipe, vblank->last, cur_vblank, diff);
 	}
 
-	DRM_DEBUG("updating vblank count on crtc %d, missed %d\n",
-		  crtc, diff);
+	DRM_DEBUG("updating vblank count on crtc %u, missed %d\n",
+		  pipe, diff);
 
 	if (diff == 0)
 		return;
@@ -135,7 +135,7 @@ static void drm_update_vblank_count(struct drm_device *dev, int crtc)
 	 */
 	if (rc) {
 		tslot = atomic_read(&vblank->count) + diff;
-		vblanktimestamp(dev, crtc, tslot) = t_vblank;
+		vblanktimestamp(dev, pipe, tslot) = t_vblank;
 	}
 
 	smp_mb__before_atomic();
@@ -149,9 +149,9 @@ static void drm_update_vblank_count(struct drm_device *dev, int crtc)
  * are preserved, even if there are any spurious vblank irq's after
  * disable.
  */
-static void vblank_disable_and_save(struct drm_device *dev, int crtc)
+static void vblank_disable_and_save(struct drm_device *dev, unsigned int pipe)
 {
-	struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
 	unsigned long irqflags;
 	u32 vblcount;
 	s64 diff_ns;
@@ -179,13 +179,13 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc)
 	 * vblank interrupt is disabled.
 	 */
 	if (!vblank->enabled &&
-	    drm_get_last_vbltimestamp(dev, crtc, &tvblank, 0)) {
-		drm_update_vblank_count(dev, crtc);
+	    drm_get_last_vbltimestamp(dev, pipe, &tvblank, 0)) {
+		drm_update_vblank_count(dev, pipe);
 		spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);
 		return;
 	}
 
-	dev->driver->disable_vblank(dev, crtc);
+	dev->driver->disable_vblank(dev, pipe);
 	vblank->enabled = false;
 
 	/* No further vblank irq's will be processed after
@@ -201,9 +201,9 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc)
 	 * delayed gpu counter increment.
 	 */
 	do {
-		vblank->last = dev->driver->get_vblank_counter(dev, crtc);
-		vblrc = drm_get_last_vbltimestamp(dev, crtc, &tvblank, 0);
-	} while (vblank->last != dev->driver->get_vblank_counter(dev, crtc) && (--count) && vblrc);
+		vblank->last = dev->driver->get_vblank_counter(dev, pipe);
+		vblrc = drm_get_last_vbltimestamp(dev, pipe, &tvblank, 0);
+	} while (vblank->last != dev->driver->get_vblank_counter(dev, pipe) && (--count) && vblrc);
 
 	if (!count)
 		vblrc = 0;
@@ -213,7 +213,7 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc)
 	 */
 	vblcount = atomic_read(&vblank->count);
 	diff_ns = timeval_to_ns(&tvblank) -
-		  timeval_to_ns(&vblanktimestamp(dev, crtc, vblcount));
+		  timeval_to_ns(&vblanktimestamp(dev, pipe, vblcount));
 
 	/* If there is at least 1 msec difference between the last stored
 	 * timestamp and tvblank, then we are currently executing our
@@ -229,7 +229,7 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc)
 	 */
 	if (vblrc && (abs64(diff_ns) > 1000000)) {
 		/* Store new timestamp in ringbuffer. */
-		vblanktimestamp(dev, crtc, vblcount + 1) = tvblank;
+		vblanktimestamp(dev, pipe, vblcount + 1) = tvblank;
 
 		/* Increment cooked vblank count. This also atomically commits
 		 * the timestamp computed above.
@@ -247,15 +247,15 @@ static void vblank_disable_fn(unsigned long arg)
 	struct drm_vblank_crtc *vblank = (void *)arg;
 	struct drm_device *dev = vblank->dev;
 	unsigned long irqflags;
-	int crtc = vblank->crtc;
+	unsigned int pipe = vblank->pipe;
 
 	if (!dev->vblank_disable_allowed)
 		return;
 
 	spin_lock_irqsave(&dev->vbl_lock, irqflags);
 	if (atomic_read(&vblank->refcount) == 0 && vblank->enabled) {
-		DRM_DEBUG("disabling vblank on crtc %d\n", crtc);
-		vblank_disable_and_save(dev, crtc);
+		DRM_DEBUG("disabling vblank on crtc %u\n", pipe);
+		vblank_disable_and_save(dev, pipe);
 	}
 	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
 }
@@ -268,20 +268,20 @@ static void vblank_disable_fn(unsigned long arg)
  */
 void drm_vblank_cleanup(struct drm_device *dev)
 {
-	int crtc;
+	unsigned int pipe;
 	unsigned long irqflags;
 
 	/* Bail if the driver didn't call drm_vblank_init() */
 	if (dev->num_crtcs == 0)
 		return;
 
-	for (crtc = 0; crtc < dev->num_crtcs; crtc++) {
-		struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
+	for (pipe = 0; pipe < dev->num_crtcs; pipe++) {
+		struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
 
 		del_timer_sync(&vblank->disable_timer);
 
 		spin_lock_irqsave(&dev->vbl_lock, irqflags);
-		vblank_disable_and_save(dev, crtc);
+		vblank_disable_and_save(dev, pipe);
 		spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
 	}
 
@@ -293,17 +293,18 @@ EXPORT_SYMBOL(drm_vblank_cleanup);
 
 /**
  * drm_vblank_init - initialize vblank support
- * @dev: drm_device
- * @num_crtcs: number of crtcs supported by @dev
+ * @dev: DRM device
+ * @num_crtcs: number of CRTCs supported by @dev
  *
  * This function initializes vblank support for @num_crtcs display pipelines.
  *
  * Returns:
  * Zero on success or a negative error code on failure.
  */
-int drm_vblank_init(struct drm_device *dev, int num_crtcs)
+int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs)
 {
-	int i, ret = -ENOMEM;
+	int ret = -ENOMEM;
+	unsigned int i;
 
 	spin_lock_init(&dev->vbl_lock);
 	spin_lock_init(&dev->vblank_time_lock);
@@ -318,7 +319,7 @@ int drm_vblank_init(struct drm_device *dev, int num_crtcs)
 		struct drm_vblank_crtc *vblank = &dev->vblank[i];
 
 		vblank->dev = dev;
-		vblank->crtc = i;
+		vblank->pipe = i;
 		init_waitqueue_head(&vblank->queue);
 		setup_timer(&vblank->disable_timer, vblank_disable_fn,
 			    (unsigned long)vblank);
@@ -588,17 +589,17 @@ void drm_calc_timestamping_constants(struct drm_crtc *crtc,
 		if (mode->flags & DRM_MODE_FLAG_INTERLACE)
 			framedur_ns /= 2;
 	} else
-		DRM_ERROR("crtc %d: Can't calculate constants, dotclock = 0!\n",
+		DRM_ERROR("crtc %u: Can't calculate constants, dotclock = 0!\n",
 			  crtc->base.id);
 
 	crtc->pixeldur_ns = pixeldur_ns;
 	crtc->linedur_ns  = linedur_ns;
 	crtc->framedur_ns = framedur_ns;
 
-	DRM_DEBUG("crtc %d: hwmode: htotal %d, vtotal %d, vdisplay %d\n",
+	DRM_DEBUG("crtc %u: hwmode: htotal %d, vtotal %d, vdisplay %d\n",
 		  crtc->base.id, mode->crtc_htotal,
 		  mode->crtc_vtotal, mode->crtc_vdisplay);
-	DRM_DEBUG("crtc %d: clock %d kHz framedur %d linedur %d, pixeldur %d\n",
+	DRM_DEBUG("crtc %u: clock %d kHz framedur %d linedur %d, pixeldur %d\n",
 		  crtc->base.id, dotclock, framedur_ns,
 		  linedur_ns, pixeldur_ns);
 }
@@ -607,7 +608,7 @@ EXPORT_SYMBOL(drm_calc_timestamping_constants);
 /**
  * drm_calc_vbltimestamp_from_scanoutpos - precise vblank timestamp helper
  * @dev: DRM device
- * @crtc: Which CRTC's vblank timestamp to retrieve
+ * @pipe: index of CRTC whose vblank timestamp to retrieve
  * @max_error: Desired maximum allowable error in timestamps (nanosecs)
  *             On return contains true maximum error of timestamp
  * @vblank_time: Pointer to struct timeval which should receive the timestamp
@@ -650,7 +651,8 @@ EXPORT_SYMBOL(drm_calc_timestamping_constants);
  * DRM_VBLANKTIME_INVBL - Timestamp taken while scanout was in vblank interval.
  *
  */
-int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc,
+int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
+					  unsigned int pipe,
 					  int *max_error,
 					  struct timeval *vblank_time,
 					  unsigned flags,
@@ -664,8 +666,8 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc,
 	int framedur_ns, linedur_ns, pixeldur_ns, delta_ns, duration_ns;
 	bool invbl;
 
-	if (crtc < 0 || crtc >= dev->num_crtcs) {
-		DRM_ERROR("Invalid crtc %d\n", crtc);
+	if (pipe >= dev->num_crtcs) {
+		DRM_ERROR("Invalid crtc %u\n", pipe);
 		return -EINVAL;
 	}
 
@@ -684,7 +686,7 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc,
 	 * Happens during initial modesetting of a crtc.
 	 */
 	if (framedur_ns == 0) {
-		DRM_DEBUG("crtc %d: Noop due to uninitialized mode.\n", crtc);
+		DRM_DEBUG("crtc %u: Noop due to uninitialized mode.\n", pipe);
 		return -EAGAIN;
 	}
 
@@ -700,13 +702,13 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc,
 		 * Get vertical and horizontal scanout position vpos, hpos,
 		 * and bounding timestamps stime, etime, pre/post query.
 		 */
-		vbl_status = dev->driver->get_scanout_position(dev, crtc, flags, &vpos,
+		vbl_status = dev->driver->get_scanout_position(dev, pipe, flags, &vpos,
 							       &hpos, &stime, &etime);
 
 		/* Return as no-op if scanout query unsupported or failed. */
 		if (!(vbl_status & DRM_SCANOUTPOS_VALID)) {
-			DRM_DEBUG("crtc %d : scanoutpos query failed [%d].\n",
-				  crtc, vbl_status);
+			DRM_DEBUG("crtc %u : scanoutpos query failed [%d].\n",
+				  pipe, vbl_status);
 			return -EIO;
 		}
 
@@ -720,8 +722,8 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc,
 
 	/* Noisy system timing? */
 	if (i == DRM_TIMESTAMP_MAXRETRIES) {
-		DRM_DEBUG("crtc %d: Noisy timestamp %d us > %d us [%d reps].\n",
-			  crtc, duration_ns/1000, *max_error/1000, i);
+		DRM_DEBUG("crtc %u: Noisy timestamp %d us > %d us [%d reps].\n",
+			  pipe, duration_ns/1000, *max_error/1000, i);
 	}
 
 	/* Return upper bound of timestamp precision error. */
@@ -754,8 +756,8 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc,
 		etime = ktime_sub_ns(etime, delta_ns);
 	*vblank_time = ktime_to_timeval(etime);
 
-	DRM_DEBUG("crtc %d : v %d p(%d,%d)@ %ld.%ld -> %ld.%ld [e %d us, %d rep]\n",
-		  crtc, (int)vbl_status, hpos, vpos,
+	DRM_DEBUG("crtc %u : v %d p(%d,%d)@ %ld.%ld -> %ld.%ld [e %d us, %d rep]\n",
+		  pipe, (int)vbl_status, hpos, vpos,
 		  (long)tv_etime.tv_sec, (long)tv_etime.tv_usec,
 		  (long)vblank_time->tv_sec, (long)vblank_time->tv_usec,
 		  duration_ns/1000, i);
@@ -780,7 +782,7 @@ static struct timeval get_drm_timestamp(void)
  * drm_get_last_vbltimestamp - retrieve raw timestamp for the most recent
  *                             vblank interval
  * @dev: DRM device
- * @crtc: which CRTC's vblank timestamp to retrieve
+ * @pipe: index of CRTC whose vblank timestamp to retrieve
  * @tvblank: Pointer to target struct timeval which should receive the timestamp
  * @flags: Flags to pass to driver:
  *         0 = Default,
@@ -797,7 +799,7 @@ static struct timeval get_drm_timestamp(void)
  * True if timestamp is considered to be very precise, false otherwise.
  */
 static bool
-drm_get_last_vbltimestamp(struct drm_device *dev, int crtc,
+drm_get_last_vbltimestamp(struct drm_device *dev, unsigned int pipe,
 			  struct timeval *tvblank, unsigned flags)
 {
 	int ret;
@@ -807,7 +809,7 @@ drm_get_last_vbltimestamp(struct drm_device *dev, int crtc,
 
 	/* Query driver if possible and precision timestamping enabled. */
 	if (dev->driver->get_vblank_timestamp && (max_error > 0)) {
-		ret = dev->driver->get_vblank_timestamp(dev, crtc, &max_error,
+		ret = dev->driver->get_vblank_timestamp(dev, pipe, &max_error,
 							tvblank, flags);
 		if (ret > 0)
 			return true;
@@ -824,7 +826,7 @@ drm_get_last_vbltimestamp(struct drm_device *dev, int crtc,
 /**
  * drm_vblank_count - retrieve "cooked" vblank counter value
  * @dev: DRM device
- * @crtc: which counter to retrieve
+ * @pipe: index of CRTC for which to retrieve the counter
  *
  * Fetches the "cooked" vblank count value that represents the number of
  * vblank events since the system was booted, including lost events due to
@@ -835,11 +837,11 @@ drm_get_last_vbltimestamp(struct drm_device *dev, int crtc,
  * Returns:
  * The software vblank counter.
  */
-u32 drm_vblank_count(struct drm_device *dev, int crtc)
+u32 drm_vblank_count(struct drm_device *dev, int pipe)
 {
-	struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
 
-	if (WARN_ON(crtc >= dev->num_crtcs))
+	if (WARN_ON(pipe >= dev->num_crtcs))
 		return 0;
 	return atomic_read(&vblank->count);
 }
@@ -865,11 +867,10 @@ u32 drm_crtc_vblank_count(struct drm_crtc *crtc)
 EXPORT_SYMBOL(drm_crtc_vblank_count);
 
 /**
- * drm_vblank_count_and_time - retrieve "cooked" vblank counter value
- * and the system timestamp corresponding to that vblank counter value.
- *
+ * drm_vblank_count_and_time - retrieve "cooked" vblank counter value and the
+ *     system timestamp corresponding to that vblank counter value.
  * @dev: DRM device
- * @crtc: which counter to retrieve
+ * @pipe: index of CRTC whose counter to retrieve
  * @vblanktime: Pointer to struct timeval to receive the vblank timestamp.
  *
  * Fetches the "cooked" vblank count value that represents the number of
@@ -877,13 +878,13 @@ EXPORT_SYMBOL(drm_crtc_vblank_count);
  * modesetting activity. Returns corresponding system timestamp of the time
  * of the vblank interval that corresponds to the current vblank counter value.
  */
-u32 drm_vblank_count_and_time(struct drm_device *dev, int crtc,
+u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
 			      struct timeval *vblanktime)
 {
-	struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
 	u32 cur_vblank;
 
-	if (WARN_ON(crtc >= dev->num_crtcs))
+	if (WARN_ON(pipe >= dev->num_crtcs))
 		return 0;
 
 	/* Read timestamp from slot of _vblank_time ringbuffer
@@ -893,7 +894,7 @@ u32 drm_vblank_count_and_time(struct drm_device *dev, int crtc,
 	 */
 	do {
 		cur_vblank = atomic_read(&vblank->count);
-		*vblanktime = vblanktimestamp(dev, crtc, cur_vblank);
+		*vblanktime = vblanktimestamp(dev, pipe, cur_vblank);
 		smp_rmb();
 	} while (cur_vblank != atomic_read(&vblank->count));
 
@@ -920,7 +921,7 @@ static void send_vblank_event(struct drm_device *dev,
 /**
  * drm_send_vblank_event - helper to send vblank event after pageflip
  * @dev: DRM device
- * @crtc: CRTC in question
+ * @pipe: CRTC index
  * @e: the event to send
  *
  * Updates sequence # and timestamp on event, and sends it to userspace.
@@ -928,20 +929,20 @@ static void send_vblank_event(struct drm_device *dev,
  *
  * This is the legacy version of drm_crtc_send_vblank_event().
  */
-void drm_send_vblank_event(struct drm_device *dev, int crtc,
-		struct drm_pending_vblank_event *e)
+void drm_send_vblank_event(struct drm_device *dev, unsigned int pipe,
+			   struct drm_pending_vblank_event *e)
 {
 	struct timeval now;
 	unsigned int seq;
 
 	if (dev->num_crtcs > 0) {
-		seq = drm_vblank_count_and_time(dev, crtc, &now);
+		seq = drm_vblank_count_and_time(dev, pipe, &now);
 	} else {
 		seq = 0;
 
 		now = get_drm_timestamp();
 	}
-	e->pipe = crtc;
+	e->pipe = pipe;
 	send_vblank_event(dev, e, seq, &now);
 }
 EXPORT_SYMBOL(drm_send_vblank_event);
@@ -966,11 +967,11 @@ EXPORT_SYMBOL(drm_crtc_send_vblank_event);
 /**
  * drm_vblank_enable - enable the vblank interrupt on a CRTC
  * @dev: DRM device
- * @crtc: CRTC in question
+ * @pipe: CRTC index
  */
-static int drm_vblank_enable(struct drm_device *dev, int crtc)
+static int drm_vblank_enable(struct drm_device *dev, unsigned int pipe)
 {
-	struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
 	int ret = 0;
 
 	assert_spin_locked(&dev->vbl_lock);
@@ -985,13 +986,13 @@ static int drm_vblank_enable(struct drm_device *dev, int crtc)
 		 * timestamps. Filtercode in drm_handle_vblank() will
 		 * prevent double-accounting of same vblank interval.
 		 */
-		ret = dev->driver->enable_vblank(dev, crtc);
-		DRM_DEBUG("enabling vblank on crtc %d, ret: %d\n", crtc, ret);
+		ret = dev->driver->enable_vblank(dev, pipe);
+		DRM_DEBUG("enabling vblank on crtc %u, ret: %d\n", pipe, ret);
 		if (ret)
 			atomic_dec(&vblank->refcount);
 		else {
 			vblank->enabled = true;
-			drm_update_vblank_count(dev, crtc);
+			drm_update_vblank_count(dev, pipe);
 		}
 	}
 
@@ -1003,7 +1004,7 @@ static int drm_vblank_enable(struct drm_device *dev, int crtc)
 /**
  * drm_vblank_get - get a reference count on vblank events
  * @dev: DRM device
- * @crtc: which CRTC to own
+ * @pipe: index of CRTC to own
  *
  * Acquire a reference count on vblank events to avoid having them disabled
  * while in use.
@@ -1013,19 +1014,19 @@ static int drm_vblank_enable(struct drm_device *dev, int crtc)
  * Returns:
  * Zero on success, nonzero on failure.
  */
-int drm_vblank_get(struct drm_device *dev, int crtc)
+int drm_vblank_get(struct drm_device *dev, unsigned int pipe)
 {
-	struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
 	unsigned long irqflags;
 	int ret = 0;
 
-	if (WARN_ON(crtc >= dev->num_crtcs))
+	if (WARN_ON(pipe >= dev->num_crtcs))
 		return -EINVAL;
 
 	spin_lock_irqsave(&dev->vbl_lock, irqflags);
 	/* Going from 0->1 means we have to enable interrupts again */
 	if (atomic_add_return(1, &vblank->refcount) == 1) {
-		ret = drm_vblank_enable(dev, crtc);
+		ret = drm_vblank_enable(dev, pipe);
 	} else {
 		if (!vblank->enabled) {
 			atomic_dec(&vblank->refcount);
@@ -1057,20 +1058,20 @@ int drm_crtc_vblank_get(struct drm_crtc *crtc)
 EXPORT_SYMBOL(drm_crtc_vblank_get);
 
 /**
- * drm_vblank_put - give up ownership of vblank events
+ * drm_vblank_put - release ownership of vblank events
  * @dev: DRM device
- * @crtc: which counter to give up
+ * @pipe: index of CRTC to release
  *
  * Release ownership of a given vblank counter, turning off interrupts
  * if possible. Disable interrupts after drm_vblank_offdelay milliseconds.
  *
  * This is the legacy version of drm_crtc_vblank_put().
  */
-void drm_vblank_put(struct drm_device *dev, int crtc)
+void drm_vblank_put(struct drm_device *dev, unsigned int pipe)
 {
-	struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
 
-	if (WARN_ON(crtc >= dev->num_crtcs))
+	if (WARN_ON(pipe >= dev->num_crtcs))
 		return;
 
 	if (WARN_ON(atomic_read(&vblank->refcount) == 0))
@@ -1107,30 +1108,34 @@ EXPORT_SYMBOL(drm_crtc_vblank_put);
 /**
  * drm_wait_one_vblank - wait for one vblank
  * @dev: DRM device
- * @crtc: crtc index
+ * @pipe: CRTC index
  *
  * This waits for one vblank to pass on @crtc, using the irq driver interfaces.
  * It is a failure to call this when the vblank irq for @crtc is disabled, e.g.
  * due to lack of driver support or because the crtc is off.
  */
-void drm_wait_one_vblank(struct drm_device *dev, int crtc)
+void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe)
 {
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
 	int ret;
 	u32 last;
 
-	ret = drm_vblank_get(dev, crtc);
-	if (WARN(ret, "vblank not available on crtc %i, ret=%i\n", crtc, ret))
+	if (WARN_ON(pipe >= dev->num_crtcs))
 		return;
 
-	last = drm_vblank_count(dev, crtc);
+	ret = drm_vblank_get(dev, pipe);
+	if (WARN(ret, "vblank not available on crtc %i, ret=%i\n", pipe, ret))
+		return;
 
-	ret = wait_event_timeout(dev->vblank[crtc].queue,
-				 last != drm_vblank_count(dev, crtc),
+	last = drm_vblank_count(dev, pipe);
+
+	ret = wait_event_timeout(vblank->queue,
+				 last != drm_vblank_count(dev, pipe),
 				 msecs_to_jiffies(100));
 
-	WARN(ret == 0, "vblank wait timed out on crtc %i\n", crtc);
+	WARN(ret == 0, "vblank wait timed out on crtc %i\n", pipe);
 
-	drm_vblank_put(dev, crtc);
+	drm_vblank_put(dev, pipe);
 }
 EXPORT_SYMBOL(drm_wait_one_vblank);
 
@@ -1151,7 +1156,7 @@ EXPORT_SYMBOL(drm_crtc_wait_one_vblank);
 /**
  * drm_vblank_off - disable vblank events on a CRTC
  * @dev: DRM device
- * @crtc: CRTC in question
+ * @pipe: CRTC index
  *
  * Drivers can use this function to shut down the vblank interrupt handling when
  * disabling a crtc. This function ensures that the latest vblank frame count is
@@ -1162,21 +1167,21 @@ EXPORT_SYMBOL(drm_crtc_wait_one_vblank);
  *
  * This is the legacy version of drm_crtc_vblank_off().
  */
-void drm_vblank_off(struct drm_device *dev, int crtc)
+void drm_vblank_off(struct drm_device *dev, unsigned int pipe)
 {
-	struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
 	struct drm_pending_vblank_event *e, *t;
 	struct timeval now;
 	unsigned long irqflags;
 	unsigned int seq;
 
-	if (WARN_ON(crtc >= dev->num_crtcs))
+	if (WARN_ON(pipe >= dev->num_crtcs))
 		return;
 
 	spin_lock_irqsave(&dev->event_lock, irqflags);
 
 	spin_lock(&dev->vbl_lock);
-	vblank_disable_and_save(dev, crtc);
+	vblank_disable_and_save(dev, pipe);
 	wake_up(&vblank->queue);
 
 	/*
@@ -1190,16 +1195,16 @@ void drm_vblank_off(struct drm_device *dev, int crtc)
 	spin_unlock(&dev->vbl_lock);
 
 	/* Send any queued vblank events, lest the natives grow disquiet */
-	seq = drm_vblank_count_and_time(dev, crtc, &now);
+	seq = drm_vblank_count_and_time(dev, pipe, &now);
 
 	list_for_each_entry_safe(e, t, &dev->vblank_event_list, base.link) {
-		if (e->pipe != crtc)
+		if (e->pipe != pipe)
 			continue;
 		DRM_DEBUG("Sending premature vblank event on disable: \
 			  wanted %d, current %d\n",
 			  e->event.sequence, seq);
 		list_del(&e->base.link);
-		drm_vblank_put(dev, e->pipe);
+		drm_vblank_put(dev, pipe);
 		send_vblank_event(dev, e, seq, &now);
 	}
 	spin_unlock_irqrestore(&dev->event_lock, irqflags);
@@ -1228,7 +1233,7 @@ EXPORT_SYMBOL(drm_crtc_vblank_off);
 /**
  * drm_vblank_on - enable vblank events on a CRTC
  * @dev: DRM device
- * @crtc: CRTC in question
+ * @pipe: CRTC index
  *
  * This functions restores the vblank interrupt state captured with
  * drm_vblank_off() again. Note that calls to drm_vblank_on() and
@@ -1237,12 +1242,12 @@ EXPORT_SYMBOL(drm_crtc_vblank_off);
  *
  * This is the legacy version of drm_crtc_vblank_on().
  */
-void drm_vblank_on(struct drm_device *dev, int crtc)
+void drm_vblank_on(struct drm_device *dev, unsigned int pipe)
 {
-	struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
 	unsigned long irqflags;
 
-	if (WARN_ON(crtc >= dev->num_crtcs))
+	if (WARN_ON(pipe >= dev->num_crtcs))
 		return;
 
 	spin_lock_irqsave(&dev->vbl_lock, irqflags);
@@ -1260,7 +1265,7 @@ void drm_vblank_on(struct drm_device *dev, int crtc)
 	 * vblank counter value before and after a modeset
 	 */
 	vblank->last =
-		(dev->driver->get_vblank_counter(dev, crtc) - 1) &
+		(dev->driver->get_vblank_counter(dev, pipe) - 1) &
 		dev->max_vblank_count;
 	/*
 	 * re-enable interrupts if there are users left, or the
@@ -1268,7 +1273,7 @@ void drm_vblank_on(struct drm_device *dev, int crtc)
 	 */
 	if (atomic_read(&vblank->refcount) != 0 ||
 	    (!dev->vblank_disable_immediate && drm_vblank_offdelay == 0))
-		WARN_ON(drm_vblank_enable(dev, crtc));
+		WARN_ON(drm_vblank_enable(dev, pipe));
 	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
 }
 EXPORT_SYMBOL(drm_vblank_on);
@@ -1293,7 +1298,7 @@ EXPORT_SYMBOL(drm_crtc_vblank_on);
 /**
  * drm_vblank_pre_modeset - account for vblanks across mode sets
  * @dev: DRM device
- * @crtc: CRTC in question
+ * @pipe: CRTC index
  *
  * Account for vblank events across mode setting events, which will likely
  * reset the hardware frame counter.
@@ -1313,15 +1318,15 @@ EXPORT_SYMBOL(drm_crtc_vblank_on);
  * Drivers must call drm_vblank_post_modeset() when re-enabling the same crtc
  * again.
  */
-void drm_vblank_pre_modeset(struct drm_device *dev, int crtc)
+void drm_vblank_pre_modeset(struct drm_device *dev, unsigned int pipe)
 {
-	struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
 
 	/* vblank is not initialized (IRQ not installed ?), or has been freed */
 	if (!dev->num_crtcs)
 		return;
 
-	if (WARN_ON(crtc >= dev->num_crtcs))
+	if (WARN_ON(pipe >= dev->num_crtcs))
 		return;
 
 	/*
@@ -1333,7 +1338,7 @@ void drm_vblank_pre_modeset(struct drm_device *dev, int crtc)
 	 */
 	if (!vblank->inmodeset) {
 		vblank->inmodeset = 0x1;
-		if (drm_vblank_get(dev, crtc) == 0)
+		if (drm_vblank_get(dev, pipe) == 0)
 			vblank->inmodeset |= 0x2;
 	}
 }
@@ -1342,21 +1347,21 @@ EXPORT_SYMBOL(drm_vblank_pre_modeset);
 /**
  * drm_vblank_post_modeset - undo drm_vblank_pre_modeset changes
  * @dev: DRM device
- * @crtc: CRTC in question
+ * @pipe: CRTC index
  *
  * This function again drops the temporary vblank reference acquired in
  * drm_vblank_pre_modeset.
  */
-void drm_vblank_post_modeset(struct drm_device *dev, int crtc)
+void drm_vblank_post_modeset(struct drm_device *dev, unsigned int pipe)
 {
-	struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
 	unsigned long irqflags;
 
 	/* vblank is not initialized (IRQ not installed ?), or has been freed */
 	if (!dev->num_crtcs)
 		return;
 
-	if (WARN_ON(crtc >= dev->num_crtcs))
+	if (WARN_ON(pipe >= dev->num_crtcs))
 		return;
 
 	if (vblank->inmodeset) {
@@ -1365,7 +1370,7 @@ void drm_vblank_post_modeset(struct drm_device *dev, int crtc)
 		spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
 
 		if (vblank->inmodeset & 0x2)
-			drm_vblank_put(dev, crtc);
+			drm_vblank_put(dev, pipe);
 
 		vblank->inmodeset = 0;
 	}
@@ -1387,7 +1392,7 @@ int drm_modeset_ctl(struct drm_device *dev, void *data,
 		    struct drm_file *file_priv)
 {
 	struct drm_modeset_ctl *modeset = data;
-	unsigned int crtc;
+	unsigned int pipe;
 
 	/* If drm_vblank_init() hasn't been called yet, just no-op */
 	if (!dev->num_crtcs)
@@ -1397,16 +1402,16 @@ int drm_modeset_ctl(struct drm_device *dev, void *data,
 	if (drm_core_check_feature(dev, DRIVER_MODESET))
 		return 0;
 
-	crtc = modeset->crtc;
-	if (crtc >= dev->num_crtcs)
+	pipe = modeset->crtc;
+	if (pipe >= dev->num_crtcs)
 		return -EINVAL;
 
 	switch (modeset->cmd) {
 	case _DRM_PRE_MODESET:
-		drm_vblank_pre_modeset(dev, crtc);
+		drm_vblank_pre_modeset(dev, pipe);
 		break;
 	case _DRM_POST_MODESET:
-		drm_vblank_post_modeset(dev, crtc);
+		drm_vblank_post_modeset(dev, pipe);
 		break;
 	default:
 		return -EINVAL;
@@ -1415,7 +1420,7 @@ int drm_modeset_ctl(struct drm_device *dev, void *data,
 	return 0;
 }
 
-static int drm_queue_vblank_event(struct drm_device *dev, int pipe,
+static int drm_queue_vblank_event(struct drm_device *dev, unsigned int pipe,
 				  union drm_wait_vblank *vblwait,
 				  struct drm_file *file_priv)
 {
@@ -1469,7 +1474,7 @@ static int drm_queue_vblank_event(struct drm_device *dev, int pipe,
 		vblwait->reply.sequence = vblwait->request.sequence;
 	}
 
-	DRM_DEBUG("event on vblank count %d, current %d, crtc %d\n",
+	DRM_DEBUG("event on vblank count %d, current %d, crtc %u\n",
 		  vblwait->request.sequence, seq, pipe);
 
 	trace_drm_vblank_event_queued(current->pid, pipe,
@@ -1518,7 +1523,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
 	struct drm_vblank_crtc *vblank;
 	union drm_wait_vblank *vblwait = data;
 	int ret;
-	unsigned int flags, seq, crtc, high_crtc;
+	unsigned int flags, seq, pipe, high_pipe;
 
 	if (!dev->irq_enabled)
 		return -EINVAL;
@@ -1537,22 +1542,22 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
 	}
 
 	flags = vblwait->request.type & _DRM_VBLANK_FLAGS_MASK;
-	high_crtc = (vblwait->request.type & _DRM_VBLANK_HIGH_CRTC_MASK);
-	if (high_crtc)
-		crtc = high_crtc >> _DRM_VBLANK_HIGH_CRTC_SHIFT;
+	high_pipe = (vblwait->request.type & _DRM_VBLANK_HIGH_CRTC_MASK);
+	if (high_pipe)
+		pipe = high_pipe >> _DRM_VBLANK_HIGH_CRTC_SHIFT;
 	else
-		crtc = flags & _DRM_VBLANK_SECONDARY ? 1 : 0;
-	if (crtc >= dev->num_crtcs)
+		pipe = flags & _DRM_VBLANK_SECONDARY ? 1 : 0;
+	if (pipe >= dev->num_crtcs)
 		return -EINVAL;
 
-	vblank = &dev->vblank[crtc];
+	vblank = &dev->vblank[pipe];
 
-	ret = drm_vblank_get(dev, crtc);
+	ret = drm_vblank_get(dev, pipe);
 	if (ret) {
 		DRM_DEBUG("failed to acquire vblank counter, %d\n", ret);
 		return ret;
 	}
-	seq = drm_vblank_count(dev, crtc);
+	seq = drm_vblank_count(dev, pipe);
 
 	switch (vblwait->request.type & _DRM_VBLANK_TYPES_MASK) {
 	case _DRM_VBLANK_RELATIVE:
@@ -1569,7 +1574,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
 		/* must hold on to the vblank ref until the event fires
 		 * drm_vblank_put will be called asynchronously
 		 */
-		return drm_queue_vblank_event(dev, crtc, vblwait, file_priv);
+		return drm_queue_vblank_event(dev, pipe, vblwait, file_priv);
 	}
 
 	if ((flags & _DRM_VBLANK_NEXTONMISS) &&
@@ -1577,11 +1582,11 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
 		vblwait->request.sequence = seq + 1;
 	}
 
-	DRM_DEBUG("waiting on vblank count %d, crtc %d\n",
-		  vblwait->request.sequence, crtc);
+	DRM_DEBUG("waiting on vblank count %d, crtc %u\n",
+		  vblwait->request.sequence, pipe);
 	vblank->last_wait = vblwait->request.sequence;
 	DRM_WAIT_ON(ret, vblank->queue, 3 * HZ,
-		    (((drm_vblank_count(dev, crtc) -
+		    (((drm_vblank_count(dev, pipe) -
 		       vblwait->request.sequence) <= (1 << 23)) ||
 		     !vblank->enabled ||
 		     !dev->irq_enabled));
@@ -1589,7 +1594,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
 	if (ret != -EINTR) {
 		struct timeval now;
 
-		vblwait->reply.sequence = drm_vblank_count_and_time(dev, crtc, &now);
+		vblwait->reply.sequence = drm_vblank_count_and_time(dev, pipe, &now);
 		vblwait->reply.tval_sec = now.tv_sec;
 		vblwait->reply.tval_usec = now.tv_usec;
 
@@ -1600,11 +1605,11 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
 	}
 
 done:
-	drm_vblank_put(dev, crtc);
+	drm_vblank_put(dev, pipe);
 	return ret;
 }
 
-static void drm_handle_vblank_events(struct drm_device *dev, int crtc)
+static void drm_handle_vblank_events(struct drm_device *dev, unsigned int pipe)
 {
 	struct drm_pending_vblank_event *e, *t;
 	struct timeval now;
@@ -1612,10 +1617,10 @@ static void drm_handle_vblank_events(struct drm_device *dev, int crtc)
 
 	assert_spin_locked(&dev->event_lock);
 
-	seq = drm_vblank_count_and_time(dev, crtc, &now);
+	seq = drm_vblank_count_and_time(dev, pipe, &now);
 
 	list_for_each_entry_safe(e, t, &dev->vblank_event_list, base.link) {
-		if (e->pipe != crtc)
+		if (e->pipe != pipe)
 			continue;
 		if ((seq - e->event.sequence) > (1<<23))
 			continue;
@@ -1624,26 +1629,26 @@ static void drm_handle_vblank_events(struct drm_device *dev, int crtc)
 			  e->event.sequence, seq);
 
 		list_del(&e->base.link);
-		drm_vblank_put(dev, e->pipe);
+		drm_vblank_put(dev, pipe);
 		send_vblank_event(dev, e, seq, &now);
 	}
 
-	trace_drm_vblank_event(crtc, seq);
+	trace_drm_vblank_event(pipe, seq);
 }
 
 /**
  * drm_handle_vblank - handle a vblank event
  * @dev: DRM device
- * @crtc: where this event occurred
+ * @pipe: index of CRTC where this event occurred
  *
  * Drivers should call this routine in their vblank interrupt handlers to
  * update the vblank counter and send any signals that may be pending.
  *
  * This is the legacy version of drm_crtc_handle_vblank().
  */
-bool drm_handle_vblank(struct drm_device *dev, int crtc)
+bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe)
 {
-	struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
 	u32 vblcount;
 	s64 diff_ns;
 	struct timeval tvblank;
@@ -1652,7 +1657,7 @@ bool drm_handle_vblank(struct drm_device *dev, int crtc)
 	if (!dev->num_crtcs)
 		return false;
 
-	if (WARN_ON(crtc >= dev->num_crtcs))
+	if (WARN_ON(pipe >= dev->num_crtcs))
 		return false;
 
 	spin_lock_irqsave(&dev->event_lock, irqflags);
@@ -1676,11 +1681,11 @@ bool drm_handle_vblank(struct drm_device *dev, int crtc)
 
 	/* Get current timestamp and count. */
 	vblcount = atomic_read(&vblank->count);
-	drm_get_last_vbltimestamp(dev, crtc, &tvblank, DRM_CALLED_FROM_VBLIRQ);
+	drm_get_last_vbltimestamp(dev, pipe, &tvblank, DRM_CALLED_FROM_VBLIRQ);
 
 	/* Compute time difference to timestamp of last vblank */
 	diff_ns = timeval_to_ns(&tvblank) -
-		  timeval_to_ns(&vblanktimestamp(dev, crtc, vblcount));
+		  timeval_to_ns(&vblanktimestamp(dev, pipe, vblcount));
 
 	/* Update vblank timestamp and count if at least
 	 * DRM_REDUNDANT_VBLIRQ_THRESH_NS nanoseconds
@@ -1693,7 +1698,7 @@ bool drm_handle_vblank(struct drm_device *dev, int crtc)
 	 */
 	if (abs64(diff_ns) > DRM_REDUNDANT_VBLIRQ_THRESH_NS) {
 		/* Store new timestamp in ringbuffer. */
-		vblanktimestamp(dev, crtc, vblcount + 1) = tvblank;
+		vblanktimestamp(dev, pipe, vblcount + 1) = tvblank;
 
 		/* Increment cooked vblank count. This also atomically commits
 		 * the timestamp computed above.
@@ -1702,14 +1707,14 @@ bool drm_handle_vblank(struct drm_device *dev, int crtc)
 		atomic_inc(&vblank->count);
 		smp_mb__after_atomic();
 	} else {
-		DRM_DEBUG("crtc %d: Redundant vblirq ignored. diff_ns = %d\n",
-			  crtc, (int) diff_ns);
+		DRM_DEBUG("crtc %u: Redundant vblirq ignored. diff_ns = %d\n",
+			  pipe, (int) diff_ns);
 	}
 
 	spin_unlock(&dev->vblank_time_lock);
 
 	wake_up(&vblank->queue);
-	drm_handle_vblank_events(dev, crtc);
+	drm_handle_vblank_events(dev, pipe);
 
 	spin_unlock_irqrestore(&dev->event_lock, irqflags);
 
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 5b8a8ae86032..de3d3f7091fb 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -786,7 +786,7 @@ struct drm_minor {
  */
 struct drm_pending_vblank_event {
 	struct drm_pending_event base;
-	int pipe;
+	unsigned int pipe;
 	struct drm_event_vblank event;
 };
 
@@ -801,7 +801,7 @@ struct drm_pending_vblank_event {
  * @last: used for wraparound handling (protected by dev->vbl_lock)
  * @last_wait: last VBLANK seqno waited
  * @inmodeset: display driver is setting mode
- * @crtc: CRTC index
+ * @pipe: CRTC index
  * @enabled: so we don't call enable more than once per disable
  */
 struct drm_vblank_crtc {
@@ -814,7 +814,7 @@ struct drm_vblank_crtc {
 	u32 last;
 	u32 last_wait;
 	unsigned int inmodeset;
-	int crtc;
+	unsigned int pipe;
 	bool enabled;
 };
 
@@ -1065,33 +1065,33 @@ void drm_clflush_virt_range(void *addr, unsigned long length);
 extern int drm_irq_install(struct drm_device *dev, int irq);
 extern int drm_irq_uninstall(struct drm_device *dev);
 
-extern int drm_vblank_init(struct drm_device *dev, int num_crtcs);
+extern int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs);
 extern int drm_wait_vblank(struct drm_device *dev, void *data,
 			   struct drm_file *filp);
-extern u32 drm_vblank_count(struct drm_device *dev, int crtc);
+extern u32 drm_vblank_count(struct drm_device *dev, int pipe);
 extern u32 drm_crtc_vblank_count(struct drm_crtc *crtc);
-extern u32 drm_vblank_count_and_time(struct drm_device *dev, int crtc,
+extern u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
 				     struct timeval *vblanktime);
-extern void drm_send_vblank_event(struct drm_device *dev, int crtc,
-				     struct drm_pending_vblank_event *e);
+extern void drm_send_vblank_event(struct drm_device *dev, unsigned int pipe,
+				  struct drm_pending_vblank_event *e);
 extern void drm_crtc_send_vblank_event(struct drm_crtc *crtc,
 				       struct drm_pending_vblank_event *e);
-extern bool drm_handle_vblank(struct drm_device *dev, int crtc);
+extern bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe);
 extern bool drm_crtc_handle_vblank(struct drm_crtc *crtc);
-extern int drm_vblank_get(struct drm_device *dev, int crtc);
-extern void drm_vblank_put(struct drm_device *dev, int crtc);
+extern int drm_vblank_get(struct drm_device *dev, unsigned int pipe);
+extern void drm_vblank_put(struct drm_device *dev, unsigned int pipe);
 extern int drm_crtc_vblank_get(struct drm_crtc *crtc);
 extern void drm_crtc_vblank_put(struct drm_crtc *crtc);
-extern void drm_wait_one_vblank(struct drm_device *dev, int crtc);
+extern void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe);
 extern void drm_crtc_wait_one_vblank(struct drm_crtc *crtc);
-extern void drm_vblank_off(struct drm_device *dev, int crtc);
-extern void drm_vblank_on(struct drm_device *dev, int crtc);
+extern void drm_vblank_off(struct drm_device *dev, unsigned int pipe);
+extern void drm_vblank_on(struct drm_device *dev, unsigned int pipe);
 extern void drm_crtc_vblank_off(struct drm_crtc *crtc);
 extern void drm_crtc_vblank_on(struct drm_crtc *crtc);
 extern void drm_vblank_cleanup(struct drm_device *dev);
 
 extern int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
-						 int crtc, int *max_error,
+						 unsigned int pipe, int *max_error,
 						 struct timeval *vblank_time,
 						 unsigned flags,
 						 const struct drm_crtc *refcrtc,
@@ -1112,8 +1112,8 @@ static inline wait_queue_head_t *drm_crtc_vblank_waitqueue(struct drm_crtc *crtc
 }
 
 /* Modesetting support */
-extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc);
-extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc);
+extern void drm_vblank_pre_modeset(struct drm_device *dev, unsigned int pipe);
+extern void drm_vblank_post_modeset(struct drm_device *dev, unsigned int pipe);
 
 				/* Stub support (drm_stub.h) */
 extern struct drm_master *drm_master_get(struct drm_master *master);
-- 
2.1.3

[PATCH 10/13] drm/irq: Add drm_crtc_vblank_count_and_time()

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

This function is the KMS native variant of drm_vblank_count_and_time().
It takes a struct drm_crtc * instead of a struct drm_device * and an
index of the CRTC.

Eventually the goal is to access vblank data through the CRTC only so
that the per-CRTC data can be moved to struct drm_crtc.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/gpu/drm/drm_irq.c | 23 +++++++++++++++++++++++
 include/drm/drmP.h        |  2 ++
 2 files changed, 25 insertions(+)

diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 9c32a1d7aec2..b34900a8e172 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -877,6 +877,8 @@ EXPORT_SYMBOL(drm_crtc_vblank_count);
  * vblank events since the system was booted, including lost events due to
  * modesetting activity. Returns corresponding system timestamp of the time
  * of the vblank interval that corresponds to the current vblank counter value.
+ *
+ * This is the legacy version of drm_crtc_vblank_count_and_time().
  */
 u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
 			      struct timeval *vblanktime)
@@ -902,6 +904,27 @@ u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
 }
 EXPORT_SYMBOL(drm_vblank_count_and_time);
 
+/**
+ * drm_crtc_vblank_count_and_time - retrieve "cooked" vblank counter value
+ *     and the system timestamp corresponding to that vblank counter value
+ * @crtc: which counter to retrieve
+ * @vblanktime: Pointer to struct timeval to receive the vblank timestamp.
+ *
+ * Fetches the "cooked" vblank count value that represents the number of
+ * vblank events since the system was booted, including lost events due to
+ * modesetting activity. Returns corresponding system timestamp of the time
+ * of the vblank interval that corresponds to the current vblank counter value.
+ *
+ * This is the native KMS version of drm_vblank_count_and_time().
+ */
+u32 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc,
+				   struct timeval *vblanktime)
+{
+	return drm_vblank_count_and_time(crtc->dev, drm_crtc_index(crtc),
+					 vblanktime);
+}
+EXPORT_SYMBOL(drm_crtc_vblank_count_and_time);
+
 static void send_vblank_event(struct drm_device *dev,
 		struct drm_pending_vblank_event *e,
 		unsigned long seq, struct timeval *now)
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index de3d3f7091fb..7baef1dff5f3 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1072,6 +1072,8 @@ extern u32 drm_vblank_count(struct drm_device *dev, int pipe);
 extern u32 drm_crtc_vblank_count(struct drm_crtc *crtc);
 extern u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
 				     struct timeval *vblanktime);
+extern u32 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc,
+					  struct timeval *vblanktime);
 extern void drm_send_vblank_event(struct drm_device *dev, unsigned int pipe,
 				  struct drm_pending_vblank_event *e);
 extern void drm_crtc_send_vblank_event(struct drm_crtc *crtc,
-- 
2.1.3

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

[PATCH 11/13] drm/irq: Document return values more consistently

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

Some of the functions are documented inconsistently. Add Returns:
sections where missing and use consistent style to describe the return
value.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/gpu/drm/drm_irq.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index b34900a8e172..ef5d993f06ee 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -991,6 +991,9 @@ EXPORT_SYMBOL(drm_crtc_send_vblank_event);
  * drm_vblank_enable - enable the vblank interrupt on a CRTC
  * @dev: DRM device
  * @pipe: CRTC index
+ *
+ * Returns:
+ * Zero on success or a negative error code on failure.
  */
 static int drm_vblank_enable(struct drm_device *dev, unsigned int pipe)
 {
@@ -1035,7 +1038,7 @@ static int drm_vblank_enable(struct drm_device *dev, unsigned int pipe)
  * This is the legacy version of drm_crtc_vblank_get().
  *
  * Returns:
- * Zero on success, nonzero on failure.
+ * Zero on success or a negative error code on failure.
  */
 int drm_vblank_get(struct drm_device *dev, unsigned int pipe)
 {
@@ -1072,7 +1075,7 @@ EXPORT_SYMBOL(drm_vblank_get);
  * This is the native kms version of drm_vblank_off().
  *
  * Returns:
- * Zero on success, nonzero on failure.
+ * Zero on success or a negative error code on failure.
  */
 int drm_crtc_vblank_get(struct drm_crtc *crtc)
 {
-- 
2.1.3

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

[PATCH 12/13] drm/irq: Expel legacy API

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

These legacy functions all operate on the struct drm_device * and an
index to the CRTC that they should access. This is bad because it
requires keeping track of a global data structures to resolve the index
to CRTC object lookup. In order to get rid of this global data new APIs
have been introduced that operate directly on these objects. Currently
the new functions still operate on the old data, but the goal is to
eventually move that data into struct drm_crtc. In order to start
conversion of drivers to the new API, move the old API away.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/gpu/drm/Makefile         |    2 +-
 drivers/gpu/drm/drm_internal.h   |    2 +
 drivers/gpu/drm/drm_irq.c        | 1121 +------------------------------------
 drivers/gpu/drm/drm_irq_legacy.c | 1144 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 1165 insertions(+), 1104 deletions(-)
 create mode 100644 drivers/gpu/drm/drm_irq_legacy.c

diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 66e40398b3d3..c0d93beda612 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -5,7 +5,7 @@
 ccflags-y := -Iinclude/drm
 
 drm-y       :=	drm_auth.o drm_bufs.o drm_cache.o \
-		drm_context.o drm_dma.o \
+		drm_context.o drm_dma.o drm_irq_legacy.o \
 		drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
 		drm_lock.o drm_memory.o drm_drv.o drm_vm.o \
 		drm_agpsupport.o drm_scatter.o drm_pci.o \
diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h
index 12a61d706827..61d83b581c8b 100644
--- a/drivers/gpu/drm/drm_internal.h
+++ b/drivers/gpu/drm/drm_internal.h
@@ -22,7 +22,9 @@
  */
 
 /* drm_irq.c */
+extern unsigned int drm_timestamp_precision;
 extern unsigned int drm_timestamp_monotonic;
+extern int drm_vblank_offdelay;
 
 /* drm_fops.c */
 extern struct mutex drm_global_mutex;
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index ef5d993f06ee..37b536c57cd2 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -32,15 +32,13 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <drm/drmP.h>
-#include "drm_trace.h"
-#include "drm_internal.h"
-
+#include <linux/export.h>
 #include <linux/interrupt.h>	/* For task queue support */
 #include <linux/slab.h>
 
-#include <linux/vgaarb.h>
-#include <linux/export.h>
+#include <drm/drmP.h>
+
+#include "drm_trace.h"
 
 /* Access macro for slots in vblank timestamp ringbuffer. */
 #define vblanktimestamp(dev, pipe, count) \
@@ -51,16 +49,7 @@
  */
 #define DRM_TIMESTAMP_MAXRETRIES 3
 
-/* Threshold in nanoseconds for detection of redundant
- * vblank irq in drm_handle_vblank(). 1 msec should be ok.
- */
-#define DRM_REDUNDANT_VBLIRQ_THRESH_NS 1000000
-
-static bool
-drm_get_last_vbltimestamp(struct drm_device *dev, unsigned int pipe,
-			  struct timeval *tvblank, unsigned flags);
-
-static unsigned int drm_timestamp_precision = 20;  /* Default to 20 usecs. */
+unsigned int drm_timestamp_precision = 20;  /* Default to 20 usecs. */
 
 /*
  * Default to use monotonic timestamps for wait-for-vblank and page-flip
@@ -68,492 +57,13 @@ static unsigned int drm_timestamp_precision = 20;  /* Default to 20 usecs. */
  */
 unsigned int drm_timestamp_monotonic = 1;
 
-static int drm_vblank_offdelay = 5000;    /* Default to 5000 msecs. */
+int drm_vblank_offdelay = 5000;    /* Default to 5000 msecs. */
 
 module_param_named(vblankoffdelay, drm_vblank_offdelay, int, 0600);
 module_param_named(timestamp_precision_usec, drm_timestamp_precision, int, 0600);
 module_param_named(timestamp_monotonic, drm_timestamp_monotonic, int, 0600);
 
 /**
- * drm_update_vblank_count - update the master vblank counter
- * @dev: DRM device
- * @pipe: counter to update
- *
- * Call back into the driver to update the appropriate vblank counter
- * (specified by @crtc).  Deal with wraparound, if it occurred, and
- * update the last read value so we can deal with wraparound on the next
- * call if necessary.
- *
- * Only necessary when going from off->on, to account for frames we
- * didn't get an interrupt for.
- *
- * Note: caller must hold dev->vbl_lock since this reads & writes
- * device vblank fields.
- */
-static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe)
-{
-	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
-	u32 cur_vblank, diff, tslot;
-	bool rc;
-	struct timeval t_vblank;
-
-	/*
-	 * Interrupts were disabled prior to this call, so deal with counter
-	 * wrap if needed.
-	 * NOTE!  It's possible we lost a full dev->max_vblank_count events
-	 * here if the register is small or we had vblank interrupts off for
-	 * a long time.
-	 *
-	 * We repeat the hardware vblank counter & timestamp query until
-	 * we get consistent results. This to prevent races between gpu
-	 * updating its hardware counter while we are retrieving the
-	 * corresponding vblank timestamp.
-	 */
-	do {
-		cur_vblank = dev->driver->get_vblank_counter(dev, pipe);
-		rc = drm_get_last_vbltimestamp(dev, pipe, &t_vblank, 0);
-	} while (cur_vblank != dev->driver->get_vblank_counter(dev, pipe));
-
-	/* Deal with counter wrap */
-	diff = cur_vblank - vblank->last;
-	if (cur_vblank < vblank->last) {
-		diff += dev->max_vblank_count;
-
-		DRM_DEBUG("last_vblank[%u]=0x%x, cur_vblank=0x%x => diff=0x%x\n",
-			  pipe, vblank->last, cur_vblank, diff);
-	}
-
-	DRM_DEBUG("updating vblank count on crtc %u, missed %d\n",
-		  pipe, diff);
-
-	if (diff == 0)
-		return;
-
-	/* Reinitialize corresponding vblank timestamp if high-precision query
-	 * available. Skip this step if query unsupported or failed. Will
-	 * reinitialize delayed at next vblank interrupt in that case.
-	 */
-	if (rc) {
-		tslot = atomic_read(&vblank->count) + diff;
-		vblanktimestamp(dev, pipe, tslot) = t_vblank;
-	}
-
-	smp_mb__before_atomic();
-	atomic_add(diff, &vblank->count);
-	smp_mb__after_atomic();
-}
-
-/*
- * Disable vblank irq's on crtc, make sure that last vblank count
- * of hardware and corresponding consistent software vblank counter
- * are preserved, even if there are any spurious vblank irq's after
- * disable.
- */
-static void vblank_disable_and_save(struct drm_device *dev, unsigned int pipe)
-{
-	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
-	unsigned long irqflags;
-	u32 vblcount;
-	s64 diff_ns;
-	bool vblrc;
-	struct timeval tvblank;
-	int count = DRM_TIMESTAMP_MAXRETRIES;
-
-	/* Prevent vblank irq processing while disabling vblank irqs,
-	 * so no updates of timestamps or count can happen after we've
-	 * disabled. Needed to prevent races in case of delayed irq's.
-	 */
-	spin_lock_irqsave(&dev->vblank_time_lock, irqflags);
-
-	/*
-	 * If the vblank interrupt was already disabled update the count
-	 * and timestamp to maintain the appearance that the counter
-	 * has been ticking all along until this time. This makes the
-	 * count account for the entire time between drm_vblank_on() and
-	 * drm_vblank_off().
-	 *
-	 * But only do this if precise vblank timestamps are available.
-	 * Otherwise we might read a totally bogus timestamp since drivers
-	 * lacking precise timestamp support rely upon sampling the system clock
-	 * at vblank interrupt time. Which obviously won't work out well if the
-	 * vblank interrupt is disabled.
-	 */
-	if (!vblank->enabled &&
-	    drm_get_last_vbltimestamp(dev, pipe, &tvblank, 0)) {
-		drm_update_vblank_count(dev, pipe);
-		spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);
-		return;
-	}
-
-	dev->driver->disable_vblank(dev, pipe);
-	vblank->enabled = false;
-
-	/* No further vblank irq's will be processed after
-	 * this point. Get current hardware vblank count and
-	 * vblank timestamp, repeat until they are consistent.
-	 *
-	 * FIXME: There is still a race condition here and in
-	 * drm_update_vblank_count() which can cause off-by-one
-	 * reinitialization of software vblank counter. If gpu
-	 * vblank counter doesn't increment exactly at the leading
-	 * edge of a vblank interval, then we can lose 1 count if
-	 * we happen to execute between start of vblank and the
-	 * delayed gpu counter increment.
-	 */
-	do {
-		vblank->last = dev->driver->get_vblank_counter(dev, pipe);
-		vblrc = drm_get_last_vbltimestamp(dev, pipe, &tvblank, 0);
-	} while (vblank->last != dev->driver->get_vblank_counter(dev, pipe) && (--count) && vblrc);
-
-	if (!count)
-		vblrc = 0;
-
-	/* Compute time difference to stored timestamp of last vblank
-	 * as updated by last invocation of drm_handle_vblank() in vblank irq.
-	 */
-	vblcount = atomic_read(&vblank->count);
-	diff_ns = timeval_to_ns(&tvblank) -
-		  timeval_to_ns(&vblanktimestamp(dev, pipe, vblcount));
-
-	/* If there is at least 1 msec difference between the last stored
-	 * timestamp and tvblank, then we are currently executing our
-	 * disable inside a new vblank interval, the tvblank timestamp
-	 * corresponds to this new vblank interval and the irq handler
-	 * for this vblank didn't run yet and won't run due to our disable.
-	 * Therefore we need to do the job of drm_handle_vblank() and
-	 * increment the vblank counter by one to account for this vblank.
-	 *
-	 * Skip this step if there isn't any high precision timestamp
-	 * available. In that case we can't account for this and just
-	 * hope for the best.
-	 */
-	if (vblrc && (abs64(diff_ns) > 1000000)) {
-		/* Store new timestamp in ringbuffer. */
-		vblanktimestamp(dev, pipe, vblcount + 1) = tvblank;
-
-		/* Increment cooked vblank count. This also atomically commits
-		 * the timestamp computed above.
-		 */
-		smp_mb__before_atomic();
-		atomic_inc(&vblank->count);
-		smp_mb__after_atomic();
-	}
-
-	spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);
-}
-
-static void vblank_disable_fn(unsigned long arg)
-{
-	struct drm_vblank_crtc *vblank = (void *)arg;
-	struct drm_device *dev = vblank->dev;
-	unsigned long irqflags;
-	unsigned int pipe = vblank->pipe;
-
-	if (!dev->vblank_disable_allowed)
-		return;
-
-	spin_lock_irqsave(&dev->vbl_lock, irqflags);
-	if (atomic_read(&vblank->refcount) == 0 && vblank->enabled) {
-		DRM_DEBUG("disabling vblank on crtc %u\n", pipe);
-		vblank_disable_and_save(dev, pipe);
-	}
-	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
-}
-
-/**
- * drm_vblank_cleanup - cleanup vblank support
- * @dev: DRM device
- *
- * This function cleans up any resources allocated in drm_vblank_init.
- */
-void drm_vblank_cleanup(struct drm_device *dev)
-{
-	unsigned int pipe;
-	unsigned long irqflags;
-
-	/* Bail if the driver didn't call drm_vblank_init() */
-	if (dev->num_crtcs == 0)
-		return;
-
-	for (pipe = 0; pipe < dev->num_crtcs; pipe++) {
-		struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
-
-		del_timer_sync(&vblank->disable_timer);
-
-		spin_lock_irqsave(&dev->vbl_lock, irqflags);
-		vblank_disable_and_save(dev, pipe);
-		spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
-	}
-
-	kfree(dev->vblank);
-
-	dev->num_crtcs = 0;
-}
-EXPORT_SYMBOL(drm_vblank_cleanup);
-
-/**
- * drm_vblank_init - initialize vblank support
- * @dev: DRM device
- * @num_crtcs: number of CRTCs supported by @dev
- *
- * This function initializes vblank support for @num_crtcs display pipelines.
- *
- * Returns:
- * Zero on success or a negative error code on failure.
- */
-int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs)
-{
-	int ret = -ENOMEM;
-	unsigned int i;
-
-	spin_lock_init(&dev->vbl_lock);
-	spin_lock_init(&dev->vblank_time_lock);
-
-	dev->num_crtcs = num_crtcs;
-
-	dev->vblank = kcalloc(num_crtcs, sizeof(*dev->vblank), GFP_KERNEL);
-	if (!dev->vblank)
-		goto err;
-
-	for (i = 0; i < num_crtcs; i++) {
-		struct drm_vblank_crtc *vblank = &dev->vblank[i];
-
-		vblank->dev = dev;
-		vblank->pipe = i;
-		init_waitqueue_head(&vblank->queue);
-		setup_timer(&vblank->disable_timer, vblank_disable_fn,
-			    (unsigned long)vblank);
-	}
-
-	DRM_INFO("Supports vblank timestamp caching Rev 2 (21.10.2013).\n");
-
-	/* Driver specific high-precision vblank timestamping supported? */
-	if (dev->driver->get_vblank_timestamp)
-		DRM_INFO("Driver supports precise vblank timestamp query.\n");
-	else
-		DRM_INFO("No driver support for vblank timestamp query.\n");
-
-	dev->vblank_disable_allowed = false;
-
-	return 0;
-
-err:
-	dev->num_crtcs = 0;
-	return ret;
-}
-EXPORT_SYMBOL(drm_vblank_init);
-
-static void drm_irq_vgaarb_nokms(void *cookie, bool state)
-{
-	struct drm_device *dev = cookie;
-
-	if (dev->driver->vgaarb_irq) {
-		dev->driver->vgaarb_irq(dev, state);
-		return;
-	}
-
-	if (!dev->irq_enabled)
-		return;
-
-	if (state) {
-		if (dev->driver->irq_uninstall)
-			dev->driver->irq_uninstall(dev);
-	} else {
-		if (dev->driver->irq_preinstall)
-			dev->driver->irq_preinstall(dev);
-		if (dev->driver->irq_postinstall)
-			dev->driver->irq_postinstall(dev);
-	}
-}
-
-/**
- * drm_irq_install - install IRQ handler
- * @dev: DRM device
- * @irq: IRQ number to install the handler for
- *
- * Initializes the IRQ related data. Installs the handler, calling the driver
- * irq_preinstall() and irq_postinstall() functions before and after the
- * installation.
- *
- * This is the simplified helper interface provided for drivers with no special
- * needs. Drivers which need to install interrupt handlers for multiple
- * interrupts must instead set drm_device->irq_enabled to signal the DRM core
- * that vblank interrupts are available.
- *
- * Returns:
- * Zero on success or a negative error code on failure.
- */
-int drm_irq_install(struct drm_device *dev, int irq)
-{
-	int ret;
-	unsigned long sh_flags = 0;
-
-	if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
-		return -EINVAL;
-
-	if (irq == 0)
-		return -EINVAL;
-
-	/* Driver must have been initialized */
-	if (!dev->dev_private)
-		return -EINVAL;
-
-	if (dev->irq_enabled)
-		return -EBUSY;
-	dev->irq_enabled = true;
-
-	DRM_DEBUG("irq=%d\n", irq);
-
-	/* Before installing handler */
-	if (dev->driver->irq_preinstall)
-		dev->driver->irq_preinstall(dev);
-
-	/* Install handler */
-	if (drm_core_check_feature(dev, DRIVER_IRQ_SHARED))
-		sh_flags = IRQF_SHARED;
-
-	ret = request_irq(irq, dev->driver->irq_handler,
-			  sh_flags, dev->driver->name, dev);
-
-	if (ret < 0) {
-		dev->irq_enabled = false;
-		return ret;
-	}
-
-	if (!drm_core_check_feature(dev, DRIVER_MODESET))
-		vga_client_register(dev->pdev, (void *)dev, drm_irq_vgaarb_nokms, NULL);
-
-	/* After installing handler */
-	if (dev->driver->irq_postinstall)
-		ret = dev->driver->irq_postinstall(dev);
-
-	if (ret < 0) {
-		dev->irq_enabled = false;
-		if (!drm_core_check_feature(dev, DRIVER_MODESET))
-			vga_client_register(dev->pdev, NULL, NULL, NULL);
-		free_irq(irq, dev);
-	} else {
-		dev->irq = irq;
-	}
-
-	return ret;
-}
-EXPORT_SYMBOL(drm_irq_install);
-
-/**
- * drm_irq_uninstall - uninstall the IRQ handler
- * @dev: DRM device
- *
- * Calls the driver's irq_uninstall() function and unregisters the IRQ handler.
- * This should only be called by drivers which used drm_irq_install() to set up
- * their interrupt handler. Other drivers must only reset
- * drm_device->irq_enabled to false.
- *
- * Note that for kernel modesetting drivers it is a bug if this function fails.
- * The sanity checks are only to catch buggy user modesetting drivers which call
- * the same function through an ioctl.
- *
- * Returns:
- * Zero on success or a negative error code on failure.
- */
-int drm_irq_uninstall(struct drm_device *dev)
-{
-	unsigned long irqflags;
-	bool irq_enabled;
-	int i;
-
-	if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
-		return -EINVAL;
-
-	irq_enabled = dev->irq_enabled;
-	dev->irq_enabled = false;
-
-	/*
-	 * Wake up any waiters so they don't hang.
-	 */
-	if (dev->num_crtcs) {
-		spin_lock_irqsave(&dev->vbl_lock, irqflags);
-		for (i = 0; i < dev->num_crtcs; i++) {
-			struct drm_vblank_crtc *vblank = &dev->vblank[i];
-
-			wake_up(&vblank->queue);
-			vblank->enabled = false;
-			vblank->last =
-				dev->driver->get_vblank_counter(dev, i);
-		}
-		spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
-	}
-
-	if (!irq_enabled)
-		return -EINVAL;
-
-	DRM_DEBUG("irq=%d\n", dev->irq);
-
-	if (!drm_core_check_feature(dev, DRIVER_MODESET))
-		vga_client_register(dev->pdev, NULL, NULL, NULL);
-
-	if (dev->driver->irq_uninstall)
-		dev->driver->irq_uninstall(dev);
-
-	free_irq(dev->irq, dev);
-
-	return 0;
-}
-EXPORT_SYMBOL(drm_irq_uninstall);
-
-/*
- * IRQ control ioctl.
- *
- * \param inode device inode.
- * \param file_priv DRM file private.
- * \param cmd command.
- * \param arg user argument, pointing to a drm_control structure.
- * \return zero on success or a negative number on failure.
- *
- * Calls irq_install() or irq_uninstall() according to \p arg.
- */
-int drm_control(struct drm_device *dev, void *data,
-		struct drm_file *file_priv)
-{
-	struct drm_control *ctl = data;
-	int ret = 0, irq;
-
-	/* if we haven't irq we fallback for compatibility reasons -
-	 * this used to be a separate function in drm_dma.h
-	 */
-
-	if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
-		return 0;
-	if (drm_core_check_feature(dev, DRIVER_MODESET))
-		return 0;
-	/* UMS was only ever support on pci devices. */
-	if (WARN_ON(!dev->pdev))
-		return -EINVAL;
-
-	switch (ctl->func) {
-	case DRM_INST_HANDLER:
-		irq = dev->pdev->irq;
-
-		if (dev->if_version < DRM_IF_VERSION(1, 2) &&
-		    ctl->irq != irq)
-			return -EINVAL;
-		mutex_lock(&dev->struct_mutex);
-		ret = drm_irq_install(dev, irq);
-		mutex_unlock(&dev->struct_mutex);
-
-		return ret;
-	case DRM_UNINST_HANDLER:
-		mutex_lock(&dev->struct_mutex);
-		ret = drm_irq_uninstall(dev);
-		mutex_unlock(&dev->struct_mutex);
-
-		return ret;
-	default:
-		return -EINVAL;
-	}
-}
-
-/**
  * drm_calc_timestamping_constants - calculate vblank timestamp constants
  * @crtc: drm_crtc whose timestamp constants should be updated.
  * @mode: display mode containing the scanout timings
@@ -770,83 +280,6 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
 }
 EXPORT_SYMBOL(drm_calc_vbltimestamp_from_scanoutpos);
 
-static struct timeval get_drm_timestamp(void)
-{
-	ktime_t now;
-
-	now = drm_timestamp_monotonic ? ktime_get() : ktime_get_real();
-	return ktime_to_timeval(now);
-}
-
-/**
- * drm_get_last_vbltimestamp - retrieve raw timestamp for the most recent
- *                             vblank interval
- * @dev: DRM device
- * @pipe: index of CRTC whose vblank timestamp to retrieve
- * @tvblank: Pointer to target struct timeval which should receive the timestamp
- * @flags: Flags to pass to driver:
- *         0 = Default,
- *         DRM_CALLED_FROM_VBLIRQ = If function is called from vbl IRQ handler
- *
- * Fetches the system timestamp corresponding to the time of the most recent
- * vblank interval on specified CRTC. May call into kms-driver to
- * compute the timestamp with a high-precision GPU specific method.
- *
- * Returns zero if timestamp originates from uncorrected do_gettimeofday()
- * call, i.e., it isn't very precisely locked to the true vblank.
- *
- * Returns:
- * True if timestamp is considered to be very precise, false otherwise.
- */
-static bool
-drm_get_last_vbltimestamp(struct drm_device *dev, unsigned int pipe,
-			  struct timeval *tvblank, unsigned flags)
-{
-	int ret;
-
-	/* Define requested maximum error on timestamps (nanoseconds). */
-	int max_error = (int) drm_timestamp_precision * 1000;
-
-	/* Query driver if possible and precision timestamping enabled. */
-	if (dev->driver->get_vblank_timestamp && (max_error > 0)) {
-		ret = dev->driver->get_vblank_timestamp(dev, pipe, &max_error,
-							tvblank, flags);
-		if (ret > 0)
-			return true;
-	}
-
-	/* GPU high precision timestamp query unsupported or failed.
-	 * Return current monotonic/gettimeofday timestamp as best estimate.
-	 */
-	*tvblank = get_drm_timestamp();
-
-	return false;
-}
-
-/**
- * drm_vblank_count - retrieve "cooked" vblank counter value
- * @dev: DRM device
- * @pipe: index of CRTC for which to retrieve the counter
- *
- * Fetches the "cooked" vblank count value that represents the number of
- * vblank events since the system was booted, including lost events due to
- * modesetting activity.
- *
- * This is the legacy version of drm_crtc_vblank_count().
- *
- * Returns:
- * The software vblank counter.
- */
-u32 drm_vblank_count(struct drm_device *dev, int pipe)
-{
-	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
-
-	if (WARN_ON(pipe >= dev->num_crtcs))
-		return 0;
-	return atomic_read(&vblank->count);
-}
-EXPORT_SYMBOL(drm_vblank_count);
-
 /**
  * drm_crtc_vblank_count - retrieve "cooked" vblank counter value
  * @crtc: which counter to retrieve
@@ -925,51 +358,6 @@ u32 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc,
 }
 EXPORT_SYMBOL(drm_crtc_vblank_count_and_time);
 
-static void send_vblank_event(struct drm_device *dev,
-		struct drm_pending_vblank_event *e,
-		unsigned long seq, struct timeval *now)
-{
-	WARN_ON_SMP(!spin_is_locked(&dev->event_lock));
-	e->event.sequence = seq;
-	e->event.tv_sec = now->tv_sec;
-	e->event.tv_usec = now->tv_usec;
-
-	list_add_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_send_vblank_event - helper to send vblank event after pageflip
- * @dev: DRM device
- * @pipe: CRTC index
- * @e: the event to send
- *
- * Updates sequence # and timestamp on event, and sends it to userspace.
- * Caller must hold event lock.
- *
- * This is the legacy version of drm_crtc_send_vblank_event().
- */
-void drm_send_vblank_event(struct drm_device *dev, unsigned int pipe,
-			   struct drm_pending_vblank_event *e)
-{
-	struct timeval now;
-	unsigned int seq;
-
-	if (dev->num_crtcs > 0) {
-		seq = drm_vblank_count_and_time(dev, pipe, &now);
-	} else {
-		seq = 0;
-
-		now = get_drm_timestamp();
-	}
-	e->pipe = pipe;
-	send_vblank_event(dev, e, seq, &now);
-}
-EXPORT_SYMBOL(drm_send_vblank_event);
-
 /**
  * drm_crtc_send_vblank_event - helper to send vblank event after pageflip
  * @crtc: the source CRTC of the vblank event
@@ -988,84 +376,6 @@ void drm_crtc_send_vblank_event(struct drm_crtc *crtc,
 EXPORT_SYMBOL(drm_crtc_send_vblank_event);
 
 /**
- * drm_vblank_enable - enable the vblank interrupt on a CRTC
- * @dev: DRM device
- * @pipe: CRTC index
- *
- * Returns:
- * Zero on success or a negative error code on failure.
- */
-static int drm_vblank_enable(struct drm_device *dev, unsigned int pipe)
-{
-	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
-	int ret = 0;
-
-	assert_spin_locked(&dev->vbl_lock);
-
-	spin_lock(&dev->vblank_time_lock);
-
-	if (!vblank->enabled) {
-		/*
-		 * Enable vblank irqs under vblank_time_lock protection.
-		 * All vblank count & timestamp updates are held off
-		 * until we are done reinitializing master counter and
-		 * timestamps. Filtercode in drm_handle_vblank() will
-		 * prevent double-accounting of same vblank interval.
-		 */
-		ret = dev->driver->enable_vblank(dev, pipe);
-		DRM_DEBUG("enabling vblank on crtc %u, ret: %d\n", pipe, ret);
-		if (ret)
-			atomic_dec(&vblank->refcount);
-		else {
-			vblank->enabled = true;
-			drm_update_vblank_count(dev, pipe);
-		}
-	}
-
-	spin_unlock(&dev->vblank_time_lock);
-
-	return ret;
-}
-
-/**
- * drm_vblank_get - get a reference count on vblank events
- * @dev: DRM device
- * @pipe: index of CRTC to own
- *
- * Acquire a reference count on vblank events to avoid having them disabled
- * while in use.
- *
- * This is the legacy version of drm_crtc_vblank_get().
- *
- * Returns:
- * Zero on success or a negative error code on failure.
- */
-int drm_vblank_get(struct drm_device *dev, unsigned int pipe)
-{
-	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
-	unsigned long irqflags;
-	int ret = 0;
-
-	if (WARN_ON(pipe >= dev->num_crtcs))
-		return -EINVAL;
-
-	spin_lock_irqsave(&dev->vbl_lock, irqflags);
-	/* Going from 0->1 means we have to enable interrupts again */
-	if (atomic_add_return(1, &vblank->refcount) == 1) {
-		ret = drm_vblank_enable(dev, pipe);
-	} else {
-		if (!vblank->enabled) {
-			atomic_dec(&vblank->refcount);
-			ret = -EINVAL;
-		}
-	}
-	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
-
-	return ret;
-}
-EXPORT_SYMBOL(drm_vblank_get);
-
-/**
  * drm_crtc_vblank_get - get a reference count on vblank events
  * @crtc: which CRTC to own
  *
@@ -1084,39 +394,6 @@ int drm_crtc_vblank_get(struct drm_crtc *crtc)
 EXPORT_SYMBOL(drm_crtc_vblank_get);
 
 /**
- * drm_vblank_put - release ownership of vblank events
- * @dev: DRM device
- * @pipe: index of CRTC to release
- *
- * Release ownership of a given vblank counter, turning off interrupts
- * if possible. Disable interrupts after drm_vblank_offdelay milliseconds.
- *
- * This is the legacy version of drm_crtc_vblank_put().
- */
-void drm_vblank_put(struct drm_device *dev, unsigned int pipe)
-{
-	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
-
-	if (WARN_ON(pipe >= dev->num_crtcs))
-		return;
-
-	if (WARN_ON(atomic_read(&vblank->refcount) == 0))
-		return;
-
-	/* Last user schedules interrupt disable */
-	if (atomic_dec_and_test(&vblank->refcount)) {
-		if (drm_vblank_offdelay == 0)
-			return;
-		else if (dev->vblank_disable_immediate || drm_vblank_offdelay < 0)
-			vblank_disable_fn((unsigned long)vblank);
-		else
-			mod_timer(&vblank->disable_timer,
-				  jiffies + ((drm_vblank_offdelay * HZ)/1000));
-	}
-}
-EXPORT_SYMBOL(drm_vblank_put);
-
-/**
  * drm_crtc_vblank_put - give up ownership of vblank events
  * @crtc: which counter to give up
  *
@@ -1132,40 +409,6 @@ void drm_crtc_vblank_put(struct drm_crtc *crtc)
 EXPORT_SYMBOL(drm_crtc_vblank_put);
 
 /**
- * drm_wait_one_vblank - wait for one vblank
- * @dev: DRM device
- * @pipe: CRTC index
- *
- * This waits for one vblank to pass on @crtc, using the irq driver interfaces.
- * It is a failure to call this when the vblank irq for @crtc is disabled, e.g.
- * due to lack of driver support or because the crtc is off.
- */
-void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe)
-{
-	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
-	int ret;
-	u32 last;
-
-	if (WARN_ON(pipe >= dev->num_crtcs))
-		return;
-
-	ret = drm_vblank_get(dev, pipe);
-	if (WARN(ret, "vblank not available on crtc %i, ret=%i\n", pipe, ret))
-		return;
-
-	last = drm_vblank_count(dev, pipe);
-
-	ret = wait_event_timeout(vblank->queue,
-				 last != drm_vblank_count(dev, pipe),
-				 msecs_to_jiffies(100));
-
-	WARN(ret == 0, "vblank wait timed out on crtc %i\n", pipe);
-
-	drm_vblank_put(dev, pipe);
-}
-EXPORT_SYMBOL(drm_wait_one_vblank);
-
-/**
  * drm_crtc_wait_one_vblank - wait for one vblank
  * @crtc: DRM crtc
  *
@@ -1180,64 +423,6 @@ void drm_crtc_wait_one_vblank(struct drm_crtc *crtc)
 EXPORT_SYMBOL(drm_crtc_wait_one_vblank);
 
 /**
- * drm_vblank_off - disable vblank events on a CRTC
- * @dev: DRM device
- * @pipe: CRTC index
- *
- * Drivers can use this function to shut down the vblank interrupt handling when
- * disabling a crtc. This function ensures that the latest vblank frame count is
- * stored so that drm_vblank_on() can restore it again.
- *
- * Drivers must use this function when the hardware vblank counter can get
- * reset, e.g. when suspending.
- *
- * This is the legacy version of drm_crtc_vblank_off().
- */
-void drm_vblank_off(struct drm_device *dev, unsigned int pipe)
-{
-	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
-	struct drm_pending_vblank_event *e, *t;
-	struct timeval now;
-	unsigned long irqflags;
-	unsigned int seq;
-
-	if (WARN_ON(pipe >= dev->num_crtcs))
-		return;
-
-	spin_lock_irqsave(&dev->event_lock, irqflags);
-
-	spin_lock(&dev->vbl_lock);
-	vblank_disable_and_save(dev, pipe);
-	wake_up(&vblank->queue);
-
-	/*
-	 * Prevent subsequent drm_vblank_get() from re-enabling
-	 * the vblank interrupt by bumping the refcount.
-	 */
-	if (!vblank->inmodeset) {
-		atomic_inc(&vblank->refcount);
-		vblank->inmodeset = 1;
-	}
-	spin_unlock(&dev->vbl_lock);
-
-	/* Send any queued vblank events, lest the natives grow disquiet */
-	seq = drm_vblank_count_and_time(dev, pipe, &now);
-
-	list_for_each_entry_safe(e, t, &dev->vblank_event_list, base.link) {
-		if (e->pipe != pipe)
-			continue;
-		DRM_DEBUG("Sending premature vblank event on disable: \
-			  wanted %d, current %d\n",
-			  e->event.sequence, seq);
-		list_del(&e->base.link);
-		drm_vblank_put(dev, pipe);
-		send_vblank_event(dev, e, seq, &now);
-	}
-	spin_unlock_irqrestore(&dev->event_lock, irqflags);
-}
-EXPORT_SYMBOL(drm_vblank_off);
-
-/**
  * drm_crtc_vblank_off - disable vblank events on a CRTC
  * @crtc: CRTC in question
  *
@@ -1257,54 +442,6 @@ void drm_crtc_vblank_off(struct drm_crtc *crtc)
 EXPORT_SYMBOL(drm_crtc_vblank_off);
 
 /**
- * drm_vblank_on - enable vblank events on a CRTC
- * @dev: DRM device
- * @pipe: CRTC index
- *
- * This functions restores the vblank interrupt state captured with
- * drm_vblank_off() again. Note that calls to drm_vblank_on() and
- * drm_vblank_off() can be unbalanced and so can also be unconditionally called
- * in driver load code to reflect the current hardware state of the crtc.
- *
- * This is the legacy version of drm_crtc_vblank_on().
- */
-void drm_vblank_on(struct drm_device *dev, unsigned int pipe)
-{
-	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
-	unsigned long irqflags;
-
-	if (WARN_ON(pipe >= dev->num_crtcs))
-		return;
-
-	spin_lock_irqsave(&dev->vbl_lock, irqflags);
-	/* Drop our private "prevent drm_vblank_get" refcount */
-	if (vblank->inmodeset) {
-		atomic_dec(&vblank->refcount);
-		vblank->inmodeset = 0;
-	}
-
-	/*
-	 * sample the current counter to avoid random jumps
-	 * when drm_vblank_enable() applies the diff
-	 *
-	 * -1 to make sure user will never see the same
-	 * vblank counter value before and after a modeset
-	 */
-	vblank->last =
-		(dev->driver->get_vblank_counter(dev, pipe) - 1) &
-		dev->max_vblank_count;
-	/*
-	 * re-enable interrupts if there are users left, or the
-	 * user wishes vblank interrupts to be enabled all the time.
-	 */
-	if (atomic_read(&vblank->refcount) != 0 ||
-	    (!dev->vblank_disable_immediate && drm_vblank_offdelay == 0))
-		WARN_ON(drm_vblank_enable(dev, pipe));
-	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
-}
-EXPORT_SYMBOL(drm_vblank_on);
-
-/**
  * drm_crtc_vblank_on - enable vblank events on a CRTC
  * @crtc: CRTC in question
  *
@@ -1321,129 +458,20 @@ void drm_crtc_vblank_on(struct drm_crtc *crtc)
 }
 EXPORT_SYMBOL(drm_crtc_vblank_on);
 
-/**
- * drm_vblank_pre_modeset - account for vblanks across mode sets
- * @dev: DRM device
- * @pipe: CRTC index
- *
- * Account for vblank events across mode setting events, which will likely
- * reset the hardware frame counter.
- *
- * This is done by grabbing a temporary vblank reference to ensure that the
- * vblank interrupt keeps running across the modeset sequence. With this the
- * software-side vblank frame counting will ensure that there are no jumps or
- * discontinuities.
- *
- * Unfortunately this approach is racy and also doesn't work when the vblank
- * interrupt stops running, e.g. across system suspend resume. It is therefore
- * highly recommended that drivers use the newer drm_vblank_off() and
- * drm_vblank_on() instead. drm_vblank_pre_modeset() only works correctly when
- * using "cooked" software vblank frame counters and not relying on any hardware
- * counters.
- *
- * Drivers must call drm_vblank_post_modeset() when re-enabling the same crtc
- * again.
- */
-void drm_vblank_pre_modeset(struct drm_device *dev, unsigned int pipe)
-{
-	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
-
-	/* vblank is not initialized (IRQ not installed ?), or has been freed */
-	if (!dev->num_crtcs)
-		return;
-
-	if (WARN_ON(pipe >= dev->num_crtcs))
-		return;
-
-	/*
-	 * To avoid all the problems that might happen if interrupts
-	 * were enabled/disabled around or between these calls, we just
-	 * have the kernel take a reference on the CRTC (just once though
-	 * to avoid corrupting the count if multiple, mismatch calls occur),
-	 * so that interrupts remain enabled in the interim.
-	 */
-	if (!vblank->inmodeset) {
-		vblank->inmodeset = 0x1;
-		if (drm_vblank_get(dev, pipe) == 0)
-			vblank->inmodeset |= 0x2;
-	}
-}
-EXPORT_SYMBOL(drm_vblank_pre_modeset);
-
-/**
- * drm_vblank_post_modeset - undo drm_vblank_pre_modeset changes
- * @dev: DRM device
- * @pipe: CRTC index
- *
- * This function again drops the temporary vblank reference acquired in
- * drm_vblank_pre_modeset.
- */
-void drm_vblank_post_modeset(struct drm_device *dev, unsigned int pipe)
-{
-	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
-	unsigned long irqflags;
-
-	/* vblank is not initialized (IRQ not installed ?), or has been freed */
-	if (!dev->num_crtcs)
-		return;
-
-	if (WARN_ON(pipe >= dev->num_crtcs))
-		return;
-
-	if (vblank->inmodeset) {
-		spin_lock_irqsave(&dev->vbl_lock, irqflags);
-		dev->vblank_disable_allowed = true;
-		spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
-
-		if (vblank->inmodeset & 0x2)
-			drm_vblank_put(dev, pipe);
-
-		vblank->inmodeset = 0;
-	}
-}
-EXPORT_SYMBOL(drm_vblank_post_modeset);
-
-/*
- * drm_modeset_ctl - handle vblank event counter changes across mode switch
- * @DRM_IOCTL_ARGS: standard ioctl arguments
- *
- * Applications should call the %_DRM_PRE_MODESET and %_DRM_POST_MODESET
- * ioctls around modesetting so that any lost vblank events are accounted for.
- *
- * Generally the counter will reset across mode sets.  If interrupts are
- * enabled around this call, we don't have to do anything since the counter
- * will have already been incremented.
- */
-int drm_modeset_ctl(struct drm_device *dev, void *data,
-		    struct drm_file *file_priv)
+static void send_vblank_event(struct drm_device *dev,
+		struct drm_pending_vblank_event *e,
+		unsigned long seq, struct timeval *now)
 {
-	struct drm_modeset_ctl *modeset = data;
-	unsigned int pipe;
-
-	/* If drm_vblank_init() hasn't been called yet, just no-op */
-	if (!dev->num_crtcs)
-		return 0;
-
-	/* KMS drivers handle this internally */
-	if (drm_core_check_feature(dev, DRIVER_MODESET))
-		return 0;
-
-	pipe = modeset->crtc;
-	if (pipe >= dev->num_crtcs)
-		return -EINVAL;
-
-	switch (modeset->cmd) {
-	case _DRM_PRE_MODESET:
-		drm_vblank_pre_modeset(dev, pipe);
-		break;
-	case _DRM_POST_MODESET:
-		drm_vblank_post_modeset(dev, pipe);
-		break;
-	default:
-		return -EINVAL;
-	}
+	WARN_ON_SMP(!spin_is_locked(&dev->event_lock));
+	e->event.sequence = seq;
+	e->event.tv_sec = now->tv_sec;
+	e->event.tv_usec = now->tv_usec;
 
-	return 0;
+	list_add_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);
 }
 
 static int drm_queue_vblank_event(struct drm_device *dev, unsigned int pipe,
@@ -1635,119 +663,6 @@ done:
 	return ret;
 }
 
-static void drm_handle_vblank_events(struct drm_device *dev, unsigned int pipe)
-{
-	struct drm_pending_vblank_event *e, *t;
-	struct timeval now;
-	unsigned int seq;
-
-	assert_spin_locked(&dev->event_lock);
-
-	seq = drm_vblank_count_and_time(dev, pipe, &now);
-
-	list_for_each_entry_safe(e, t, &dev->vblank_event_list, base.link) {
-		if (e->pipe != pipe)
-			continue;
-		if ((seq - e->event.sequence) > (1<<23))
-			continue;
-
-		DRM_DEBUG("vblank event on %d, current %d\n",
-			  e->event.sequence, seq);
-
-		list_del(&e->base.link);
-		drm_vblank_put(dev, pipe);
-		send_vblank_event(dev, e, seq, &now);
-	}
-
-	trace_drm_vblank_event(pipe, seq);
-}
-
-/**
- * drm_handle_vblank - handle a vblank event
- * @dev: DRM device
- * @pipe: index of CRTC where this event occurred
- *
- * Drivers should call this routine in their vblank interrupt handlers to
- * update the vblank counter and send any signals that may be pending.
- *
- * This is the legacy version of drm_crtc_handle_vblank().
- */
-bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe)
-{
-	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
-	u32 vblcount;
-	s64 diff_ns;
-	struct timeval tvblank;
-	unsigned long irqflags;
-
-	if (!dev->num_crtcs)
-		return false;
-
-	if (WARN_ON(pipe >= dev->num_crtcs))
-		return false;
-
-	spin_lock_irqsave(&dev->event_lock, irqflags);
-
-	/* Need timestamp lock to prevent concurrent execution with
-	 * vblank enable/disable, as this would cause inconsistent
-	 * or corrupted timestamps and vblank counts.
-	 */
-	spin_lock(&dev->vblank_time_lock);
-
-	/* Vblank irq handling disabled. Nothing to do. */
-	if (!vblank->enabled) {
-		spin_unlock(&dev->vblank_time_lock);
-		spin_unlock_irqrestore(&dev->event_lock, irqflags);
-		return false;
-	}
-
-	/* Fetch corresponding timestamp for this vblank interval from
-	 * driver and store it in proper slot of timestamp ringbuffer.
-	 */
-
-	/* Get current timestamp and count. */
-	vblcount = atomic_read(&vblank->count);
-	drm_get_last_vbltimestamp(dev, pipe, &tvblank, DRM_CALLED_FROM_VBLIRQ);
-
-	/* Compute time difference to timestamp of last vblank */
-	diff_ns = timeval_to_ns(&tvblank) -
-		  timeval_to_ns(&vblanktimestamp(dev, pipe, vblcount));
-
-	/* Update vblank timestamp and count if at least
-	 * DRM_REDUNDANT_VBLIRQ_THRESH_NS nanoseconds
-	 * difference between last stored timestamp and current
-	 * timestamp. A smaller difference means basically
-	 * identical timestamps. Happens if this vblank has
-	 * been already processed and this is a redundant call,
-	 * e.g., due to spurious vblank interrupts. We need to
-	 * ignore those for accounting.
-	 */
-	if (abs64(diff_ns) > DRM_REDUNDANT_VBLIRQ_THRESH_NS) {
-		/* Store new timestamp in ringbuffer. */
-		vblanktimestamp(dev, pipe, vblcount + 1) = tvblank;
-
-		/* Increment cooked vblank count. This also atomically commits
-		 * the timestamp computed above.
-		 */
-		smp_mb__before_atomic();
-		atomic_inc(&vblank->count);
-		smp_mb__after_atomic();
-	} else {
-		DRM_DEBUG("crtc %u: Redundant vblirq ignored. diff_ns = %d\n",
-			  pipe, (int) diff_ns);
-	}
-
-	spin_unlock(&dev->vblank_time_lock);
-
-	wake_up(&vblank->queue);
-	drm_handle_vblank_events(dev, pipe);
-
-	spin_unlock_irqrestore(&dev->event_lock, irqflags);
-
-	return true;
-}
-EXPORT_SYMBOL(drm_handle_vblank);
-
 /**
  * drm_crtc_handle_vblank - handle a vblank event
  * @crtc: where this event occurred
diff --git a/drivers/gpu/drm/drm_irq_legacy.c b/drivers/gpu/drm/drm_irq_legacy.c
new file mode 100644
index 000000000000..9367ce8a36fd
--- /dev/null
+++ b/drivers/gpu/drm/drm_irq_legacy.c
@@ -0,0 +1,1144 @@
+/*
+ * drm_irq_legacy.c legacy IRQ and vblank support
+ *
+ * \author Rickard E. (Rik) Faith <faith@valinux.com>
+ * \author Gareth Hughes <gareth@valinux.com>
+ */
+
+/*
+ * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <linux/vgaarb.h>
+
+#include <drm/drmP.h>
+
+#include "drm_internal.h"
+#include "drm_trace.h"
+
+/* Access macro for slots in vblank timestamp ringbuffer. */
+#define vblanktimestamp(dev, pipe, count) \
+	((dev)->vblank[pipe].time[(count) % DRM_VBLANKTIME_RBSIZE])
+
+/*
+ * Threshold in nanoseconds for detection of redundant vblank irq in
+ * drm_handle_vblank(). 1 msec should be ok.
+ */
+#define DRM_REDUNDANT_VBLIRQ_THRESH_NS 1000000
+
+/*
+ * Retry timestamp calculation up to 3 times to satisfy
+ * drm_timestamp_precision before giving up.
+ */
+#define DRM_TIMESTAMP_MAXRETRIES 3
+
+static struct timeval get_drm_timestamp(void)
+{
+	ktime_t now;
+
+	now = drm_timestamp_monotonic ? ktime_get() : ktime_get_real();
+	return ktime_to_timeval(now);
+}
+
+/**
+ * drm_get_last_vbltimestamp - retrieve raw timestamp for the most recent
+ *                             vblank interval
+ * @dev: DRM device
+ * @pipe: index of CRTC whose vblank timestamp to retrieve
+ * @tvblank: Pointer to target struct timeval which should receive the timestamp
+ * @flags: Flags to pass to driver:
+ *         0 = Default,
+ *         DRM_CALLED_FROM_VBLIRQ = If function is called from vbl IRQ handler
+ *
+ * Fetches the system timestamp corresponding to the time of the most recent
+ * vblank interval on specified CRTC. May call into kms-driver to
+ * compute the timestamp with a high-precision GPU specific method.
+ *
+ * Returns zero if timestamp originates from uncorrected do_gettimeofday()
+ * call, i.e., it isn't very precisely locked to the true vblank.
+ *
+ * Returns:
+ * True if timestamp is considered to be very precise, false otherwise.
+ */
+static bool
+drm_get_last_vbltimestamp(struct drm_device *dev, unsigned int pipe,
+			  struct timeval *tvblank, unsigned flags)
+{
+	int ret;
+
+	/* Define requested maximum error on timestamps (nanoseconds). */
+	int max_error = (int) drm_timestamp_precision * 1000;
+
+	/* Query driver if possible and precision timestamping enabled. */
+	if (dev->driver->get_vblank_timestamp && (max_error > 0)) {
+		ret = dev->driver->get_vblank_timestamp(dev, pipe, &max_error,
+							tvblank, flags);
+		if (ret > 0)
+			return true;
+	}
+
+	/* GPU high precision timestamp query unsupported or failed.
+	 * Return current monotonic/gettimeofday timestamp as best estimate.
+	 */
+	*tvblank = get_drm_timestamp();
+
+	return false;
+}
+
+/**
+ * drm_update_vblank_count - update the master vblank counter
+ * @dev: DRM device
+ * @pipe: counter to update
+ *
+ * Call back into the driver to update the appropriate vblank counter
+ * (specified by @crtc).  Deal with wraparound, if it occurred, and
+ * update the last read value so we can deal with wraparound on the next
+ * call if necessary.
+ *
+ * Only necessary when going from off->on, to account for frames we
+ * didn't get an interrupt for.
+ *
+ * Note: caller must hold dev->vbl_lock since this reads & writes
+ * device vblank fields.
+ */
+static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe)
+{
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
+	u32 cur_vblank, diff, tslot;
+	bool rc;
+	struct timeval t_vblank;
+
+	/*
+	 * Interrupts were disabled prior to this call, so deal with counter
+	 * wrap if needed.
+	 * NOTE!  It's possible we lost a full dev->max_vblank_count events
+	 * here if the register is small or we had vblank interrupts off for
+	 * a long time.
+	 *
+	 * We repeat the hardware vblank counter & timestamp query until
+	 * we get consistent results. This to prevent races between gpu
+	 * updating its hardware counter while we are retrieving the
+	 * corresponding vblank timestamp.
+	 */
+	do {
+		cur_vblank = dev->driver->get_vblank_counter(dev, pipe);
+		rc = drm_get_last_vbltimestamp(dev, pipe, &t_vblank, 0);
+	} while (cur_vblank != dev->driver->get_vblank_counter(dev, pipe));
+
+	/* Deal with counter wrap */
+	diff = cur_vblank - vblank->last;
+	if (cur_vblank < vblank->last) {
+		diff += dev->max_vblank_count;
+
+		DRM_DEBUG("last_vblank[%u]=0x%x, cur_vblank=0x%x => diff=0x%x\n",
+			  pipe, vblank->last, cur_vblank, diff);
+	}
+
+	DRM_DEBUG("updating vblank count on crtc %u, missed %d\n",
+		  pipe, diff);
+
+	if (diff == 0)
+		return;
+
+	/* Reinitialize corresponding vblank timestamp if high-precision query
+	 * available. Skip this step if query unsupported or failed. Will
+	 * reinitialize delayed at next vblank interrupt in that case.
+	 */
+	if (rc) {
+		tslot = atomic_read(&vblank->count) + diff;
+		vblanktimestamp(dev, pipe, tslot) = t_vblank;
+	}
+
+	smp_mb__before_atomic();
+	atomic_add(diff, &vblank->count);
+	smp_mb__after_atomic();
+}
+
+/*
+ * Disable vblank irq's on crtc, make sure that last vblank count
+ * of hardware and corresponding consistent software vblank counter
+ * are preserved, even if there are any spurious vblank irq's after
+ * disable.
+ */
+static void vblank_disable_and_save(struct drm_device *dev, unsigned int pipe)
+{
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
+	unsigned long irqflags;
+	u32 vblcount;
+	s64 diff_ns;
+	bool vblrc;
+	struct timeval tvblank;
+	int count = DRM_TIMESTAMP_MAXRETRIES;
+
+	/* Prevent vblank irq processing while disabling vblank irqs,
+	 * so no updates of timestamps or count can happen after we've
+	 * disabled. Needed to prevent races in case of delayed irq's.
+	 */
+	spin_lock_irqsave(&dev->vblank_time_lock, irqflags);
+
+	/*
+	 * If the vblank interrupt was already disabled update the count
+	 * and timestamp to maintain the appearance that the counter
+	 * has been ticking all along until this time. This makes the
+	 * count account for the entire time between drm_vblank_on() and
+	 * drm_vblank_off().
+	 *
+	 * But only do this if precise vblank timestamps are available.
+	 * Otherwise we might read a totally bogus timestamp since drivers
+	 * lacking precise timestamp support rely upon sampling the system clock
+	 * at vblank interrupt time. Which obviously won't work out well if the
+	 * vblank interrupt is disabled.
+	 */
+	if (!vblank->enabled &&
+	    drm_get_last_vbltimestamp(dev, pipe, &tvblank, 0)) {
+		drm_update_vblank_count(dev, pipe);
+		spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);
+		return;
+	}
+
+	dev->driver->disable_vblank(dev, pipe);
+	vblank->enabled = false;
+
+	/* No further vblank irq's will be processed after
+	 * this point. Get current hardware vblank count and
+	 * vblank timestamp, repeat until they are consistent.
+	 *
+	 * FIXME: There is still a race condition here and in
+	 * drm_update_vblank_count() which can cause off-by-one
+	 * reinitialization of software vblank counter. If gpu
+	 * vblank counter doesn't increment exactly at the leading
+	 * edge of a vblank interval, then we can lose 1 count if
+	 * we happen to execute between start of vblank and the
+	 * delayed gpu counter increment.
+	 */
+	do {
+		vblank->last = dev->driver->get_vblank_counter(dev, pipe);
+		vblrc = drm_get_last_vbltimestamp(dev, pipe, &tvblank, 0);
+	} while (vblank->last != dev->driver->get_vblank_counter(dev, pipe) && (--count) && vblrc);
+
+	if (!count)
+		vblrc = 0;
+
+	/* Compute time difference to stored timestamp of last vblank
+	 * as updated by last invocation of drm_handle_vblank() in vblank irq.
+	 */
+	vblcount = atomic_read(&vblank->count);
+	diff_ns = timeval_to_ns(&tvblank) -
+		  timeval_to_ns(&vblanktimestamp(dev, pipe, vblcount));
+
+	/* If there is at least 1 msec difference between the last stored
+	 * timestamp and tvblank, then we are currently executing our
+	 * disable inside a new vblank interval, the tvblank timestamp
+	 * corresponds to this new vblank interval and the irq handler
+	 * for this vblank didn't run yet and won't run due to our disable.
+	 * Therefore we need to do the job of drm_handle_vblank() and
+	 * increment the vblank counter by one to account for this vblank.
+	 *
+	 * Skip this step if there isn't any high precision timestamp
+	 * available. In that case we can't account for this and just
+	 * hope for the best.
+	 */
+	if (vblrc && (abs64(diff_ns) > 1000000)) {
+		/* Store new timestamp in ringbuffer. */
+		vblanktimestamp(dev, pipe, vblcount + 1) = tvblank;
+
+		/* Increment cooked vblank count. This also atomically commits
+		 * the timestamp computed above.
+		 */
+		smp_mb__before_atomic();
+		atomic_inc(&vblank->count);
+		smp_mb__after_atomic();
+	}
+
+	spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);
+}
+
+static void vblank_disable_fn(unsigned long arg)
+{
+	struct drm_vblank_crtc *vblank = (void *)arg;
+	struct drm_device *dev = vblank->dev;
+	unsigned long irqflags;
+	unsigned int pipe = vblank->pipe;
+
+	if (!dev->vblank_disable_allowed)
+		return;
+
+	spin_lock_irqsave(&dev->vbl_lock, irqflags);
+	if (atomic_read(&vblank->refcount) == 0 && vblank->enabled) {
+		DRM_DEBUG("disabling vblank on crtc %u\n", pipe);
+		vblank_disable_and_save(dev, pipe);
+	}
+	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
+}
+
+/**
+ * drm_vblank_init - initialize vblank support
+ * @dev: DRM device
+ * @num_crtcs: number of CRTCs supported by @dev
+ *
+ * This function initializes vblank support for @num_crtcs display pipelines.
+ *
+ * Returns:
+ * Zero on success or a negative error code on failure.
+ */
+int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs)
+{
+	int ret = -ENOMEM;
+	unsigned int i;
+
+	spin_lock_init(&dev->vbl_lock);
+	spin_lock_init(&dev->vblank_time_lock);
+
+	dev->num_crtcs = num_crtcs;
+
+	dev->vblank = kcalloc(num_crtcs, sizeof(*dev->vblank), GFP_KERNEL);
+	if (!dev->vblank)
+		goto err;
+
+	for (i = 0; i < num_crtcs; i++) {
+		struct drm_vblank_crtc *vblank = &dev->vblank[i];
+
+		vblank->dev = dev;
+		vblank->pipe = i;
+		init_waitqueue_head(&vblank->queue);
+		setup_timer(&vblank->disable_timer, vblank_disable_fn,
+			    (unsigned long)vblank);
+	}
+
+	DRM_INFO("Supports vblank timestamp caching Rev 2 (21.10.2013).\n");
+
+	/* Driver specific high-precision vblank timestamping supported? */
+	if (dev->driver->get_vblank_timestamp)
+		DRM_INFO("Driver supports precise vblank timestamp query.\n");
+	else
+		DRM_INFO("No driver support for vblank timestamp query.\n");
+
+	dev->vblank_disable_allowed = false;
+
+	return 0;
+
+err:
+	dev->num_crtcs = 0;
+	return ret;
+}
+EXPORT_SYMBOL(drm_vblank_init);
+
+/**
+ * drm_vblank_cleanup - cleanup vblank support
+ * @dev: DRM device
+ *
+ * This function cleans up any resources allocated in drm_vblank_init.
+ */
+void drm_vblank_cleanup(struct drm_device *dev)
+{
+	unsigned int pipe;
+	unsigned long irqflags;
+
+	/* Bail if the driver didn't call drm_vblank_init() */
+	if (dev->num_crtcs == 0)
+		return;
+
+	for (pipe = 0; pipe < dev->num_crtcs; pipe++) {
+		struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
+
+		del_timer_sync(&vblank->disable_timer);
+
+		spin_lock_irqsave(&dev->vbl_lock, irqflags);
+		vblank_disable_and_save(dev, pipe);
+		spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
+	}
+
+	kfree(dev->vblank);
+
+	dev->num_crtcs = 0;
+}
+EXPORT_SYMBOL(drm_vblank_cleanup);
+
+/**
+ * drm_vblank_count - retrieve "cooked" vblank counter value
+ * @dev: DRM device
+ * @pipe: index of CRTC for which to retrieve the counter
+ *
+ * Fetches the "cooked" vblank count value that represents the number of
+ * vblank events since the system was booted, including lost events due to
+ * modesetting activity.
+ *
+ * This is the legacy version of drm_crtc_vblank_count().
+ *
+ * Returns:
+ * The software vblank counter.
+ */
+u32 drm_vblank_count(struct drm_device *dev, int pipe)
+{
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
+
+	if (WARN_ON(pipe >= dev->num_crtcs))
+		return 0;
+	return atomic_read(&vblank->count);
+}
+EXPORT_SYMBOL(drm_vblank_count);
+
+/**
+ * drm_vblank_enable - enable the vblank interrupt on a CRTC
+ * @dev: DRM device
+ * @pipe: CRTC index
+ *
+ * Returns:
+ * Zero on success or a negative error code on failure.
+ */
+static int drm_vblank_enable(struct drm_device *dev, unsigned int pipe)
+{
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
+	int ret = 0;
+
+	assert_spin_locked(&dev->vbl_lock);
+
+	spin_lock(&dev->vblank_time_lock);
+
+	if (!vblank->enabled) {
+		/*
+		 * Enable vblank irqs under vblank_time_lock protection.
+		 * All vblank count & timestamp updates are held off
+		 * until we are done reinitializing master counter and
+		 * timestamps. Filtercode in drm_handle_vblank() will
+		 * prevent double-accounting of same vblank interval.
+		 */
+		ret = dev->driver->enable_vblank(dev, pipe);
+		DRM_DEBUG("enabling vblank on crtc %u, ret: %d\n", pipe, ret);
+		if (ret)
+			atomic_dec(&vblank->refcount);
+		else {
+			vblank->enabled = true;
+			drm_update_vblank_count(dev, pipe);
+		}
+	}
+
+	spin_unlock(&dev->vblank_time_lock);
+
+	return ret;
+}
+
+/**
+ * drm_vblank_get - get a reference count on vblank events
+ * @dev: DRM device
+ * @crtc: which CRTC to own
+ *
+ * Acquire a reference count on vblank events to avoid having them disabled
+ * while in use.
+ *
+ * This is the legacy version of drm_crtc_vblank_get().
+ *
+ * Returns:
+ * Zero on success, nonzero on failure.
+ */
+int drm_vblank_get(struct drm_device *dev, unsigned int pipe)
+{
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
+	unsigned long irqflags;
+	int ret = 0;
+
+	if (WARN_ON(pipe >= dev->num_crtcs))
+		return -EINVAL;
+
+	spin_lock_irqsave(&dev->vbl_lock, irqflags);
+	/* Going from 0->1 means we have to enable interrupts again */
+	if (atomic_add_return(1, &vblank->refcount) == 1) {
+		ret = drm_vblank_enable(dev, pipe);
+	} else {
+		if (!vblank->enabled) {
+			atomic_dec(&vblank->refcount);
+			ret = -EINVAL;
+		}
+	}
+	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
+
+	return ret;
+}
+EXPORT_SYMBOL(drm_vblank_get);
+
+/**
+ * drm_vblank_put - release ownership of vblank events
+ * @dev: DRM device
+ * @pipe: index of CRTC to release
+ *
+ * Release ownership of a given vblank counter, turning off interrupts
+ * if possible. Disable interrupts after drm_vblank_offdelay milliseconds.
+ *
+ * This is the legacy version of drm_crtc_vblank_put().
+ */
+void drm_vblank_put(struct drm_device *dev, unsigned int pipe)
+{
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
+
+	if (WARN_ON(pipe >= dev->num_crtcs))
+		return;
+
+	if (WARN_ON(atomic_read(&vblank->refcount) == 0))
+		return;
+
+	/* Last user schedules interrupt disable */
+	if (atomic_dec_and_test(&vblank->refcount)) {
+		if (drm_vblank_offdelay == 0)
+			return;
+		else if (dev->vblank_disable_immediate || drm_vblank_offdelay < 0)
+			vblank_disable_fn((unsigned long)vblank);
+		else
+			mod_timer(&vblank->disable_timer,
+				  jiffies + ((drm_vblank_offdelay * HZ)/1000));
+	}
+}
+EXPORT_SYMBOL(drm_vblank_put);
+
+/**
+ * drm_wait_one_vblank - wait for one vblank
+ * @dev: DRM device
+ * @pipe: CRTC index
+ *
+ * This waits for one vblank to pass on @crtc, using the irq driver interfaces.
+ * It is a failure to call this when the vblank irq for @crtc is disabled, e.g.
+ * due to lack of driver support or because the crtc is off.
+ */
+void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe)
+{
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
+	int ret;
+	u32 last;
+
+	if (WARN_ON(pipe >= dev->num_crtcs))
+		return;
+
+	ret = drm_vblank_get(dev, pipe);
+	if (WARN(ret, "vblank not available on crtc %i, ret=%i\n", pipe, ret))
+		return;
+
+	last = drm_vblank_count(dev, pipe);
+
+	ret = wait_event_timeout(vblank->queue,
+				 last != drm_vblank_count(dev, pipe),
+				 msecs_to_jiffies(100));
+
+	WARN(ret == 0, "vblank wait timed out on crtc %i\n", pipe);
+
+	drm_vblank_put(dev, pipe);
+}
+EXPORT_SYMBOL(drm_wait_one_vblank);
+
+static void send_vblank_event(struct drm_device *dev,
+		struct drm_pending_vblank_event *e,
+		unsigned long seq, struct timeval *now)
+{
+	WARN_ON_SMP(!spin_is_locked(&dev->event_lock));
+	e->event.sequence = seq;
+	e->event.tv_sec = now->tv_sec;
+	e->event.tv_usec = now->tv_usec;
+
+	list_add_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_vblank_off - disable vblank events on a CRTC
+ * @dev: DRM device
+ * @pipe: CRTC index
+ *
+ * Drivers can use this function to shut down the vblank interrupt handling when
+ * disabling a crtc. This function ensures that the latest vblank frame count is
+ * stored so that drm_vblank_on() can restore it again.
+ *
+ * Drivers must use this function when the hardware vblank counter can get
+ * reset, e.g. when suspending.
+ *
+ * This is the legacy version of drm_crtc_vblank_off().
+ */
+void drm_vblank_off(struct drm_device *dev, unsigned int pipe)
+{
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
+	struct drm_pending_vblank_event *e, *t;
+	struct timeval now;
+	unsigned long irqflags;
+	unsigned int seq;
+
+	if (WARN_ON(pipe >= dev->num_crtcs))
+		return;
+
+	spin_lock_irqsave(&dev->event_lock, irqflags);
+
+	spin_lock(&dev->vbl_lock);
+	vblank_disable_and_save(dev, pipe);
+	wake_up(&vblank->queue);
+
+	/*
+	 * Prevent subsequent drm_vblank_get() from re-enabling
+	 * the vblank interrupt by bumping the refcount.
+	 */
+	if (!vblank->inmodeset) {
+		atomic_inc(&vblank->refcount);
+		vblank->inmodeset = 1;
+	}
+	spin_unlock(&dev->vbl_lock);
+
+	/* Send any queued vblank events, lest the natives grow disquiet */
+	seq = drm_vblank_count_and_time(dev, pipe, &now);
+
+	list_for_each_entry_safe(e, t, &dev->vblank_event_list, base.link) {
+		if (e->pipe != pipe)
+			continue;
+		DRM_DEBUG("Sending premature vblank event on disable: \
+			  wanted %d, current %d\n",
+			  e->event.sequence, seq);
+		list_del(&e->base.link);
+		drm_vblank_put(dev, pipe);
+		send_vblank_event(dev, e, seq, &now);
+	}
+	spin_unlock_irqrestore(&dev->event_lock, irqflags);
+}
+EXPORT_SYMBOL(drm_vblank_off);
+
+/**
+ * drm_vblank_on - enable vblank events on a CRTC
+ * @dev: DRM device
+ * @pipe: CRTC index
+ *
+ * This functions restores the vblank interrupt state captured with
+ * drm_vblank_off() again. Note that calls to drm_vblank_on() and
+ * drm_vblank_off() can be unbalanced and so can also be unconditionally called
+ * in driver load code to reflect the current hardware state of the crtc.
+ *
+ * This is the legacy version of drm_crtc_vblank_on().
+ */
+void drm_vblank_on(struct drm_device *dev, unsigned int pipe)
+{
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
+	unsigned long irqflags;
+
+	if (WARN_ON(pipe >= dev->num_crtcs))
+		return;
+
+	spin_lock_irqsave(&dev->vbl_lock, irqflags);
+	/* Drop our private "prevent drm_vblank_get" refcount */
+	if (vblank->inmodeset) {
+		atomic_dec(&vblank->refcount);
+		vblank->inmodeset = 0;
+	}
+
+	/*
+	 * sample the current counter to avoid random jumps
+	 * when drm_vblank_enable() applies the diff
+	 *
+	 * -1 to make sure user will never see the same
+	 * vblank counter value before and after a modeset
+	 */
+	vblank->last =
+		(dev->driver->get_vblank_counter(dev, pipe) - 1) &
+		dev->max_vblank_count;
+	/*
+	 * re-enable interrupts if there are users left, or the
+	 * user wishes vblank interrupts to be enabled all the time.
+	 */
+	if (atomic_read(&vblank->refcount) != 0 ||
+	    (!dev->vblank_disable_immediate && drm_vblank_offdelay == 0))
+		WARN_ON(drm_vblank_enable(dev, pipe));
+	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
+}
+EXPORT_SYMBOL(drm_vblank_on);
+
+/**
+ * drm_vblank_pre_modeset - account for vblanks across mode sets
+ * @dev: DRM device
+ * @pipe: CRTC index
+ *
+ * Account for vblank events across mode setting events, which will likely
+ * reset the hardware frame counter.
+ *
+ * This is done by grabbing a temporary vblank reference to ensure that the
+ * vblank interrupt keeps running across the modeset sequence. With this the
+ * software-side vblank frame counting will ensure that there are no jumps or
+ * discontinuities.
+ *
+ * Unfortunately this approach is racy and also doesn't work when the vblank
+ * interrupt stops running, e.g. across system suspend resume. It is therefore
+ * highly recommended that drivers use the newer drm_vblank_off() and
+ * drm_vblank_on() instead. drm_vblank_pre_modeset() only works correctly when
+ * using "cooked" software vblank frame counters and not relying on any hardware
+ * counters.
+ *
+ * Drivers must call drm_vblank_post_modeset() when re-enabling the same crtc
+ * again.
+ */
+void drm_vblank_pre_modeset(struct drm_device *dev, unsigned int pipe)
+{
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
+
+	/* vblank is not initialized (IRQ not installed ?), or has been freed */
+	if (!dev->num_crtcs)
+		return;
+
+	if (WARN_ON(pipe >= dev->num_crtcs))
+		return;
+
+	/*
+	 * To avoid all the problems that might happen if interrupts
+	 * were enabled/disabled around or between these calls, we just
+	 * have the kernel take a reference on the CRTC (just once though
+	 * to avoid corrupting the count if multiple, mismatch calls occur),
+	 * so that interrupts remain enabled in the interim.
+	 */
+	if (!vblank->inmodeset) {
+		vblank->inmodeset = 0x1;
+		if (drm_vblank_get(dev, pipe) == 0)
+			vblank->inmodeset |= 0x2;
+	}
+}
+EXPORT_SYMBOL(drm_vblank_pre_modeset);
+
+/**
+ * drm_vblank_post_modeset - undo drm_vblank_pre_modeset changes
+ * @dev: DRM device
+ * @pipe: CRTC index
+ *
+ * This function again drops the temporary vblank reference acquired in
+ * drm_vblank_pre_modeset.
+ */
+void drm_vblank_post_modeset(struct drm_device *dev, unsigned int pipe)
+{
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
+	unsigned long irqflags;
+
+	/* vblank is not initialized (IRQ not installed ?), or has been freed */
+	if (!dev->num_crtcs)
+		return;
+
+	if (WARN_ON(pipe >= dev->num_crtcs))
+		return;
+
+	if (vblank->inmodeset) {
+		spin_lock_irqsave(&dev->vbl_lock, irqflags);
+		dev->vblank_disable_allowed = true;
+		spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
+
+		if (vblank->inmodeset & 0x2)
+			drm_vblank_put(dev, pipe);
+
+		vblank->inmodeset = 0;
+	}
+}
+EXPORT_SYMBOL(drm_vblank_post_modeset);
+
+static void drm_handle_vblank_events(struct drm_device *dev, unsigned int pipe)
+{
+	struct drm_pending_vblank_event *e, *t;
+	struct timeval now;
+	unsigned int seq;
+
+	assert_spin_locked(&dev->event_lock);
+
+	seq = drm_vblank_count_and_time(dev, pipe, &now);
+
+	list_for_each_entry_safe(e, t, &dev->vblank_event_list, base.link) {
+		if (e->pipe != pipe)
+			continue;
+		if ((seq - e->event.sequence) > (1<<23))
+			continue;
+
+		DRM_DEBUG("vblank event on %d, current %d\n",
+			  e->event.sequence, seq);
+
+		list_del(&e->base.link);
+		drm_vblank_put(dev, pipe);
+		send_vblank_event(dev, e, seq, &now);
+	}
+
+	trace_drm_vblank_event(pipe, seq);
+}
+
+/**
+ * drm_handle_vblank - handle a vblank event
+ * @dev: DRM device
+ * @pipe: index of CRTC where this event occurred
+ *
+ * Drivers should call this routine in their vblank interrupt handlers to
+ * update the vblank counter and send any signals that may be pending.
+ *
+ * This is the legacy version of drm_crtc_handle_vblank().
+ */
+bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe)
+{
+	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
+	u32 vblcount;
+	s64 diff_ns;
+	struct timeval tvblank;
+	unsigned long irqflags;
+
+	if (!dev->num_crtcs)
+		return false;
+
+	if (WARN_ON(pipe >= dev->num_crtcs))
+		return false;
+
+	spin_lock_irqsave(&dev->event_lock, irqflags);
+
+	/* Need timestamp lock to prevent concurrent execution with
+	 * vblank enable/disable, as this would cause inconsistent
+	 * or corrupted timestamps and vblank counts.
+	 */
+	spin_lock(&dev->vblank_time_lock);
+
+	/* Vblank irq handling disabled. Nothing to do. */
+	if (!vblank->enabled) {
+		spin_unlock(&dev->vblank_time_lock);
+		spin_unlock_irqrestore(&dev->event_lock, irqflags);
+		return false;
+	}
+
+	/* Fetch corresponding timestamp for this vblank interval from
+	 * driver and store it in proper slot of timestamp ringbuffer.
+	 */
+
+	/* Get current timestamp and count. */
+	vblcount = atomic_read(&vblank->count);
+	drm_get_last_vbltimestamp(dev, pipe, &tvblank, DRM_CALLED_FROM_VBLIRQ);
+
+	/* Compute time difference to timestamp of last vblank */
+	diff_ns = timeval_to_ns(&tvblank) -
+		  timeval_to_ns(&vblanktimestamp(dev, pipe, vblcount));
+
+	/* Update vblank timestamp and count if at least
+	 * DRM_REDUNDANT_VBLIRQ_THRESH_NS nanoseconds
+	 * difference between last stored timestamp and current
+	 * timestamp. A smaller difference means basically
+	 * identical timestamps. Happens if this vblank has
+	 * been already processed and this is a redundant call,
+	 * e.g., due to spurious vblank interrupts. We need to
+	 * ignore those for accounting.
+	 */
+	if (abs64(diff_ns) > DRM_REDUNDANT_VBLIRQ_THRESH_NS) {
+		/* Store new timestamp in ringbuffer. */
+		vblanktimestamp(dev, pipe, vblcount + 1) = tvblank;
+
+		/* Increment cooked vblank count. This also atomically commits
+		 * the timestamp computed above.
+		 */
+		smp_mb__before_atomic();
+		atomic_inc(&vblank->count);
+		smp_mb__after_atomic();
+	} else {
+		DRM_DEBUG("crtc %u: Redundant vblirq ignored. diff_ns = %d\n",
+			  pipe, (int) diff_ns);
+	}
+
+	spin_unlock(&dev->vblank_time_lock);
+
+	wake_up(&vblank->queue);
+	drm_handle_vblank_events(dev, pipe);
+
+	spin_unlock_irqrestore(&dev->event_lock, irqflags);
+
+	return true;
+}
+EXPORT_SYMBOL(drm_handle_vblank);
+
+/**
+ * drm_send_vblank_event - helper to send vblank event after pageflip
+ * @dev: DRM device
+ * @pipe: CRTC index
+ * @e: the event to send
+ *
+ * Updates sequence # and timestamp on event, and sends it to userspace.
+ * Caller must hold event lock.
+ *
+ * This is the legacy version of drm_crtc_send_vblank_event().
+ */
+void drm_send_vblank_event(struct drm_device *dev, unsigned int pipe,
+			   struct drm_pending_vblank_event *e)
+{
+	struct timeval now;
+	unsigned int seq;
+
+	if (dev->num_crtcs > 0) {
+		seq = drm_vblank_count_and_time(dev, pipe, &now);
+	} else {
+		seq = 0;
+
+		now = get_drm_timestamp();
+	}
+	e->pipe = pipe;
+	send_vblank_event(dev, e, seq, &now);
+}
+EXPORT_SYMBOL(drm_send_vblank_event);
+
+static void drm_irq_vgaarb_nokms(void *cookie, bool state)
+{
+	struct drm_device *dev = cookie;
+
+	if (dev->driver->vgaarb_irq) {
+		dev->driver->vgaarb_irq(dev, state);
+		return;
+	}
+
+	if (!dev->irq_enabled)
+		return;
+
+	if (state) {
+		if (dev->driver->irq_uninstall)
+			dev->driver->irq_uninstall(dev);
+	} else {
+		if (dev->driver->irq_preinstall)
+			dev->driver->irq_preinstall(dev);
+		if (dev->driver->irq_postinstall)
+			dev->driver->irq_postinstall(dev);
+	}
+}
+
+/**
+ * drm_irq_install - install IRQ handler
+ * @dev: DRM device
+ * @irq: IRQ number to install the handler for
+ *
+ * Initializes the IRQ related data. Installs the handler, calling the driver
+ * irq_preinstall() and irq_postinstall() functions before and after the
+ * installation.
+ *
+ * This is the simplified helper interface provided for drivers with no special
+ * needs. Drivers which need to install interrupt handlers for multiple
+ * interrupts must instead set drm_device->irq_enabled to signal the DRM core
+ * that vblank interrupts are available.
+ *
+ * Returns:
+ * Zero on success or a negative error code on failure.
+ */
+int drm_irq_install(struct drm_device *dev, int irq)
+{
+	int ret;
+	unsigned long sh_flags = 0;
+
+	if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
+		return -EINVAL;
+
+	if (irq == 0)
+		return -EINVAL;
+
+	/* Driver must have been initialized */
+	if (!dev->dev_private)
+		return -EINVAL;
+
+	if (dev->irq_enabled)
+		return -EBUSY;
+	dev->irq_enabled = true;
+
+	DRM_DEBUG("irq=%d\n", irq);
+
+	/* Before installing handler */
+	if (dev->driver->irq_preinstall)
+		dev->driver->irq_preinstall(dev);
+
+	/* Install handler */
+	if (drm_core_check_feature(dev, DRIVER_IRQ_SHARED))
+		sh_flags = IRQF_SHARED;
+
+	ret = request_irq(irq, dev->driver->irq_handler,
+			  sh_flags, dev->driver->name, dev);
+
+	if (ret < 0) {
+		dev->irq_enabled = false;
+		return ret;
+	}
+
+	if (!drm_core_check_feature(dev, DRIVER_MODESET))
+		vga_client_register(dev->pdev, (void *)dev, drm_irq_vgaarb_nokms, NULL);
+
+	/* After installing handler */
+	if (dev->driver->irq_postinstall)
+		ret = dev->driver->irq_postinstall(dev);
+
+	if (ret < 0) {
+		dev->irq_enabled = false;
+		if (!drm_core_check_feature(dev, DRIVER_MODESET))
+			vga_client_register(dev->pdev, NULL, NULL, NULL);
+		free_irq(irq, dev);
+	} else {
+		dev->irq = irq;
+	}
+
+	return ret;
+}
+EXPORT_SYMBOL(drm_irq_install);
+
+/**
+ * drm_irq_uninstall - uninstall the IRQ handler
+ * @dev: DRM device
+ *
+ * Calls the driver's irq_uninstall() function and unregisters the IRQ handler.
+ * This should only be called by drivers which used drm_irq_install() to set up
+ * their interrupt handler. Other drivers must only reset
+ * drm_device->irq_enabled to false.
+ *
+ * Note that for kernel modesetting drivers it is a bug if this function fails.
+ * The sanity checks are only to catch buggy user modesetting drivers which call
+ * the same function through an ioctl.
+ *
+ * Returns:
+ * Zero on success or a negative error code on failure.
+ */
+int drm_irq_uninstall(struct drm_device *dev)
+{
+	unsigned long irqflags;
+	bool irq_enabled;
+	int i;
+
+	if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
+		return -EINVAL;
+
+	irq_enabled = dev->irq_enabled;
+	dev->irq_enabled = false;
+
+	/*
+	 * Wake up any waiters so they don't hang.
+	 */
+	if (dev->num_crtcs) {
+		spin_lock_irqsave(&dev->vbl_lock, irqflags);
+		for (i = 0; i < dev->num_crtcs; i++) {
+			struct drm_vblank_crtc *vblank = &dev->vblank[i];
+
+			wake_up(&vblank->queue);
+			vblank->enabled = false;
+			vblank->last =
+				dev->driver->get_vblank_counter(dev, i);
+		}
+		spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
+	}
+
+	if (!irq_enabled)
+		return -EINVAL;
+
+	DRM_DEBUG("irq=%d\n", dev->irq);
+
+	if (!drm_core_check_feature(dev, DRIVER_MODESET))
+		vga_client_register(dev->pdev, NULL, NULL, NULL);
+
+	if (dev->driver->irq_uninstall)
+		dev->driver->irq_uninstall(dev);
+
+	free_irq(dev->irq, dev);
+
+	return 0;
+}
+EXPORT_SYMBOL(drm_irq_uninstall);
+
+/*
+ * IRQ control ioctl.
+ *
+ * \param inode device inode.
+ * \param file_priv DRM file private.
+ * \param cmd command.
+ * \param arg user argument, pointing to a drm_control structure.
+ * \return zero on success or a negative number on failure.
+ *
+ * Calls irq_install() or irq_uninstall() according to \p arg.
+ */
+int drm_control(struct drm_device *dev, void *data,
+		struct drm_file *file_priv)
+{
+	struct drm_control *ctl = data;
+	int ret = 0, irq;
+
+	/* if we haven't irq we fallback for compatibility reasons -
+	 * this used to be a separate function in drm_dma.h
+	 */
+
+	if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
+		return 0;
+	if (drm_core_check_feature(dev, DRIVER_MODESET))
+		return 0;
+	/* UMS was only ever support on pci devices. */
+	if (WARN_ON(!dev->pdev))
+		return -EINVAL;
+
+	switch (ctl->func) {
+	case DRM_INST_HANDLER:
+		irq = dev->pdev->irq;
+
+		if (dev->if_version < DRM_IF_VERSION(1, 2) &&
+		    ctl->irq != irq)
+			return -EINVAL;
+		mutex_lock(&dev->struct_mutex);
+		ret = drm_irq_install(dev, irq);
+		mutex_unlock(&dev->struct_mutex);
+
+		return ret;
+	case DRM_UNINST_HANDLER:
+		mutex_lock(&dev->struct_mutex);
+		ret = drm_irq_uninstall(dev);
+		mutex_unlock(&dev->struct_mutex);
+
+		return ret;
+	default:
+		return -EINVAL;
+	}
+}
+
+/*
+ * drm_modeset_ctl - handle vblank event counter changes across mode switch
+ * @DRM_IOCTL_ARGS: standard ioctl arguments
+ *
+ * Applications should call the %_DRM_PRE_MODESET and %_DRM_POST_MODESET
+ * ioctls around modesetting so that any lost vblank events are accounted for.
+ *
+ * Generally the counter will reset across mode sets.  If interrupts are
+ * enabled around this call, we don't have to do anything since the counter
+ * will have already been incremented.
+ */
+int drm_modeset_ctl(struct drm_device *dev, void *data,
+		    struct drm_file *file_priv)
+{
+	struct drm_modeset_ctl *modeset = data;
+	unsigned int pipe;
+
+	/* If drm_vblank_init() hasn't been called yet, just no-op */
+	if (!dev->num_crtcs)
+		return 0;
+
+	/* KMS drivers handle this internally */
+	if (drm_core_check_feature(dev, DRIVER_MODESET))
+		return 0;
+
+	pipe = modeset->crtc;
+	if (pipe >= dev->num_crtcs)
+		return -EINVAL;
+
+	switch (modeset->cmd) {
+	case _DRM_PRE_MODESET:
+		drm_vblank_pre_modeset(dev, pipe);
+		break;
+	case _DRM_POST_MODESET:
+		drm_vblank_post_modeset(dev, pipe);
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
-- 
2.1.3

[PATCH 13/13] drm/irq: Move some prototypes to drm_crtc.h

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

The new prototypes that deal with struct drm_crtc * directly are better
located in include/drm/drm_crtc.h along with the other functions that
deal with CRTCs.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 include/drm/drmP.h     | 17 ++++-------------
 include/drm/drm_crtc.h | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 7baef1dff5f3..4809b6f8be8b 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1069,27 +1069,16 @@ extern int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs);
 extern int drm_wait_vblank(struct drm_device *dev, void *data,
 			   struct drm_file *filp);
 extern u32 drm_vblank_count(struct drm_device *dev, int pipe);
-extern u32 drm_crtc_vblank_count(struct drm_crtc *crtc);
 extern u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
 				     struct timeval *vblanktime);
-extern u32 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc,
-					  struct timeval *vblanktime);
 extern void drm_send_vblank_event(struct drm_device *dev, unsigned int pipe,
 				  struct drm_pending_vblank_event *e);
-extern void drm_crtc_send_vblank_event(struct drm_crtc *crtc,
-				       struct drm_pending_vblank_event *e);
 extern bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe);
-extern bool drm_crtc_handle_vblank(struct drm_crtc *crtc);
 extern int drm_vblank_get(struct drm_device *dev, unsigned int pipe);
 extern void drm_vblank_put(struct drm_device *dev, unsigned int pipe);
-extern int drm_crtc_vblank_get(struct drm_crtc *crtc);
-extern void drm_crtc_vblank_put(struct drm_crtc *crtc);
 extern void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe);
-extern void drm_crtc_wait_one_vblank(struct drm_crtc *crtc);
 extern void drm_vblank_off(struct drm_device *dev, unsigned int pipe);
 extern void drm_vblank_on(struct drm_device *dev, unsigned int pipe);
-extern void drm_crtc_vblank_off(struct drm_crtc *crtc);
-extern void drm_crtc_vblank_on(struct drm_crtc *crtc);
 extern void drm_vblank_cleanup(struct drm_device *dev);
 
 extern int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
@@ -1098,8 +1087,6 @@ extern int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
 						 unsigned flags,
 						 const struct drm_crtc *refcrtc,
 						 const struct drm_display_mode *mode);
-extern void drm_calc_timestamping_constants(struct drm_crtc *crtc,
-					    const struct drm_display_mode *mode);
 
 /**
  * drm_crtc_vblank_waitqueue - get vblank waitqueue for the CRTC
@@ -1107,6 +1094,10 @@ extern void drm_calc_timestamping_constants(struct drm_crtc *crtc,
  *
  * This function returns a pointer to the vblank waitqueue for the CRTC.
  * Drivers can use this to implement vblank waits using wait_event() & co.
+ *
+ * XXX: Move this to include/drm/drm_crtc.h once per-CRTC VBLANK data has
+ * moved into struct drm_crtc. It can't currently be moved because drm_crtc.h
+ * doesn't know the definition of struct drm_device.
  */
 static inline wait_queue_head_t *drm_crtc_vblank_waitqueue(struct drm_crtc *crtc)
 {
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index ea4dc4cc49c6..c1b639f55401 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -1147,6 +1147,21 @@ extern int drm_crtc_init_with_planes(struct drm_device *dev,
 extern void drm_crtc_cleanup(struct drm_crtc *crtc);
 extern unsigned int drm_crtc_index(struct drm_crtc *crtc);
 
+extern u32 drm_crtc_vblank_count(struct drm_crtc *crtc);
+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 bool drm_crtc_handle_vblank(struct drm_crtc *crtc);
+extern int drm_crtc_vblank_get(struct drm_crtc *crtc);
+extern void drm_crtc_vblank_put(struct drm_crtc *crtc);
+extern void drm_crtc_wait_one_vblank(struct drm_crtc *crtc);
+extern void drm_crtc_vblank_off(struct drm_crtc *crtc);
+extern void drm_crtc_vblank_on(struct drm_crtc *crtc);
+
+extern void drm_calc_timestamping_constants(struct drm_crtc *crtc,
+					    const struct drm_display_mode *mode);
+
 /**
  * drm_crtc_mask - find the mask of a registered CRTC
  * @crtc: CRTC to find mask for
-- 
2.1.3

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

Re: [PATCH 04/13] drm/imx: Make pipe number unsigned

[Philipp Zabel]

Am Dienstag, den 16.12.2014, 17:53 +0100 schrieb Thierry Reding:
> From: Thierry Reding <treding@nvidia.com>
> 
> There's no reason whatsoever why this should ever be negative.
> 
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Signed-off-by: Thierry Reding <treding@nvidia.com>

Acked-by: Philipp Zabel <p.zabel@pengutronix.de>

thanks
Philipp

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

Re: [PATCH 05/13] drm/imx: Store correct CRTC index in events

[Philipp Zabel]

Am Dienstag, den 16.12.2014, 17:53 +0100 schrieb Thierry Reding:
> From: Thierry Reding <treding@nvidia.com>
> 
> A negative pipe causes a special case to be triggered for drivers that
> don't have proper VBLANK support. i.MX does support VBLANKs, so there is
> no need for the fallback code.
> 
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Signed-off-by: Thierry Reding <treding@nvidia.com>

Acked-by: Philipp Zabel <p.zabel@pengutronix.de>

regards
Philipp

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

Re: [PATCH 09/13] drm/irq: Make pipe unsigned and name consistent

[Daniel Vetter]

On Tue, Dec 16, 2014 at 05:53:31PM +0100, Thierry Reding wrote:
> -void drm_wait_one_vblank(struct drm_device *dev, int crtc)
> +void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe)
>  {
> +	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
>  	int ret;
>  	u32 last;
>  
> -	ret = drm_vblank_get(dev, crtc);
> -	if (WARN(ret, "vblank not available on crtc %i, ret=%i\n", crtc, ret))
> +	if (WARN_ON(pipe >= dev->num_crtcs))

This addition should be in the previous patch. I didn't spot anything else
but it's a bit a tedious patch. But makes sense.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 12/13] drm/irq: Expel legacy API

[Daniel Vetter]

On Tue, Dec 16, 2014 at 05:53:34PM +0100, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
> 
> These legacy functions all operate on the struct drm_device * and an
> index to the CRTC that they should access. This is bad because it
> requires keeping track of a global data structures to resolve the index
> to CRTC object lookup. In order to get rid of this global data new APIs
> have been introduced that operate directly on these objects. Currently
> the new functions still operate on the old data, but the goal is to
> eventually move that data into struct drm_crtc. In order to start
> conversion of drivers to the new API, move the old API away.
> 
> Signed-off-by: Thierry Reding <treding@nvidia.com>

Imo we should try to share code between the legacy vblank code and what
we're now building up with the drm_crtc_ prefixed functions for native kms
drivers. Instead I think we should do full copies with the following
recipe:
- Look at a given function and make sure all kms drivers (and any
  callchains used by kms drivers) uses the drm_crtc_ variant and that any
  ums drivers uses the drm_vblank_ version. So big audit.
- Then for each such function copy it to drm_irq_legacy.c and mark the old
  copy in drm_irq.c as static and drop the EXPORT_SYMBOL for it.
- Then inline the logic for native kms drivers.

Just moving the functions around doesn't really help us at all since we
still have the problem that both ums and kms code uses them. Which means
we can't use drm_crtc and store vblank data in there.
-Daniel

> ---
>  drivers/gpu/drm/Makefile         |    2 +-
>  drivers/gpu/drm/drm_internal.h   |    2 +
>  drivers/gpu/drm/drm_irq.c        | 1121 +------------------------------------
>  drivers/gpu/drm/drm_irq_legacy.c | 1144 ++++++++++++++++++++++++++++++++++++++
>  4 files changed, 1165 insertions(+), 1104 deletions(-)
>  create mode 100644 drivers/gpu/drm/drm_irq_legacy.c
> 
> diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
> index 66e40398b3d3..c0d93beda612 100644
> --- a/drivers/gpu/drm/Makefile
> +++ b/drivers/gpu/drm/Makefile
> @@ -5,7 +5,7 @@
>  ccflags-y := -Iinclude/drm
>  
>  drm-y       :=	drm_auth.o drm_bufs.o drm_cache.o \
> -		drm_context.o drm_dma.o \
> +		drm_context.o drm_dma.o drm_irq_legacy.o \
>  		drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
>  		drm_lock.o drm_memory.o drm_drv.o drm_vm.o \
>  		drm_agpsupport.o drm_scatter.o drm_pci.o \
> diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h
> index 12a61d706827..61d83b581c8b 100644
> --- a/drivers/gpu/drm/drm_internal.h
> +++ b/drivers/gpu/drm/drm_internal.h
> @@ -22,7 +22,9 @@
>   */
>  
>  /* drm_irq.c */
> +extern unsigned int drm_timestamp_precision;
>  extern unsigned int drm_timestamp_monotonic;
> +extern int drm_vblank_offdelay;
>  
>  /* drm_fops.c */
>  extern struct mutex drm_global_mutex;
> diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> index ef5d993f06ee..37b536c57cd2 100644
> --- a/drivers/gpu/drm/drm_irq.c
> +++ b/drivers/gpu/drm/drm_irq.c
> @@ -32,15 +32,13 @@
>   * OTHER DEALINGS IN THE SOFTWARE.
>   */
>  
> -#include <drm/drmP.h>
> -#include "drm_trace.h"
> -#include "drm_internal.h"
> -
> +#include <linux/export.h>
>  #include <linux/interrupt.h>	/* For task queue support */
>  #include <linux/slab.h>
>  
> -#include <linux/vgaarb.h>
> -#include <linux/export.h>
> +#include <drm/drmP.h>
> +
> +#include "drm_trace.h"
>  
>  /* Access macro for slots in vblank timestamp ringbuffer. */
>  #define vblanktimestamp(dev, pipe, count) \
> @@ -51,16 +49,7 @@
>   */
>  #define DRM_TIMESTAMP_MAXRETRIES 3
>  
> -/* Threshold in nanoseconds for detection of redundant
> - * vblank irq in drm_handle_vblank(). 1 msec should be ok.
> - */
> -#define DRM_REDUNDANT_VBLIRQ_THRESH_NS 1000000
> -
> -static bool
> -drm_get_last_vbltimestamp(struct drm_device *dev, unsigned int pipe,
> -			  struct timeval *tvblank, unsigned flags);
> -
> -static unsigned int drm_timestamp_precision = 20;  /* Default to 20 usecs. */
> +unsigned int drm_timestamp_precision = 20;  /* Default to 20 usecs. */
>  
>  /*
>   * Default to use monotonic timestamps for wait-for-vblank and page-flip
> @@ -68,492 +57,13 @@ static unsigned int drm_timestamp_precision = 20;  /* Default to 20 usecs. */
>   */
>  unsigned int drm_timestamp_monotonic = 1;
>  
> -static int drm_vblank_offdelay = 5000;    /* Default to 5000 msecs. */
> +int drm_vblank_offdelay = 5000;    /* Default to 5000 msecs. */
>  
>  module_param_named(vblankoffdelay, drm_vblank_offdelay, int, 0600);
>  module_param_named(timestamp_precision_usec, drm_timestamp_precision, int, 0600);
>  module_param_named(timestamp_monotonic, drm_timestamp_monotonic, int, 0600);
>  
>  /**
> - * drm_update_vblank_count - update the master vblank counter
> - * @dev: DRM device
> - * @pipe: counter to update
> - *
> - * Call back into the driver to update the appropriate vblank counter
> - * (specified by @crtc).  Deal with wraparound, if it occurred, and
> - * update the last read value so we can deal with wraparound on the next
> - * call if necessary.
> - *
> - * Only necessary when going from off->on, to account for frames we
> - * didn't get an interrupt for.
> - *
> - * Note: caller must hold dev->vbl_lock since this reads & writes
> - * device vblank fields.
> - */
> -static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe)
> -{
> -	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> -	u32 cur_vblank, diff, tslot;
> -	bool rc;
> -	struct timeval t_vblank;
> -
> -	/*
> -	 * Interrupts were disabled prior to this call, so deal with counter
> -	 * wrap if needed.
> -	 * NOTE!  It's possible we lost a full dev->max_vblank_count events
> -	 * here if the register is small or we had vblank interrupts off for
> -	 * a long time.
> -	 *
> -	 * We repeat the hardware vblank counter & timestamp query until
> -	 * we get consistent results. This to prevent races between gpu
> -	 * updating its hardware counter while we are retrieving the
> -	 * corresponding vblank timestamp.
> -	 */
> -	do {
> -		cur_vblank = dev->driver->get_vblank_counter(dev, pipe);
> -		rc = drm_get_last_vbltimestamp(dev, pipe, &t_vblank, 0);
> -	} while (cur_vblank != dev->driver->get_vblank_counter(dev, pipe));
> -
> -	/* Deal with counter wrap */
> -	diff = cur_vblank - vblank->last;
> -	if (cur_vblank < vblank->last) {
> -		diff += dev->max_vblank_count;
> -
> -		DRM_DEBUG("last_vblank[%u]=0x%x, cur_vblank=0x%x => diff=0x%x\n",
> -			  pipe, vblank->last, cur_vblank, diff);
> -	}
> -
> -	DRM_DEBUG("updating vblank count on crtc %u, missed %d\n",
> -		  pipe, diff);
> -
> -	if (diff == 0)
> -		return;
> -
> -	/* Reinitialize corresponding vblank timestamp if high-precision query
> -	 * available. Skip this step if query unsupported or failed. Will
> -	 * reinitialize delayed at next vblank interrupt in that case.
> -	 */
> -	if (rc) {
> -		tslot = atomic_read(&vblank->count) + diff;
> -		vblanktimestamp(dev, pipe, tslot) = t_vblank;
> -	}
> -
> -	smp_mb__before_atomic();
> -	atomic_add(diff, &vblank->count);
> -	smp_mb__after_atomic();
> -}
> -
> -/*
> - * Disable vblank irq's on crtc, make sure that last vblank count
> - * of hardware and corresponding consistent software vblank counter
> - * are preserved, even if there are any spurious vblank irq's after
> - * disable.
> - */
> -static void vblank_disable_and_save(struct drm_device *dev, unsigned int pipe)
> -{
> -	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> -	unsigned long irqflags;
> -	u32 vblcount;
> -	s64 diff_ns;
> -	bool vblrc;
> -	struct timeval tvblank;
> -	int count = DRM_TIMESTAMP_MAXRETRIES;
> -
> -	/* Prevent vblank irq processing while disabling vblank irqs,
> -	 * so no updates of timestamps or count can happen after we've
> -	 * disabled. Needed to prevent races in case of delayed irq's.
> -	 */
> -	spin_lock_irqsave(&dev->vblank_time_lock, irqflags);
> -
> -	/*
> -	 * If the vblank interrupt was already disabled update the count
> -	 * and timestamp to maintain the appearance that the counter
> -	 * has been ticking all along until this time. This makes the
> -	 * count account for the entire time between drm_vblank_on() and
> -	 * drm_vblank_off().
> -	 *
> -	 * But only do this if precise vblank timestamps are available.
> -	 * Otherwise we might read a totally bogus timestamp since drivers
> -	 * lacking precise timestamp support rely upon sampling the system clock
> -	 * at vblank interrupt time. Which obviously won't work out well if the
> -	 * vblank interrupt is disabled.
> -	 */
> -	if (!vblank->enabled &&
> -	    drm_get_last_vbltimestamp(dev, pipe, &tvblank, 0)) {
> -		drm_update_vblank_count(dev, pipe);
> -		spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);
> -		return;
> -	}
> -
> -	dev->driver->disable_vblank(dev, pipe);
> -	vblank->enabled = false;
> -
> -	/* No further vblank irq's will be processed after
> -	 * this point. Get current hardware vblank count and
> -	 * vblank timestamp, repeat until they are consistent.
> -	 *
> -	 * FIXME: There is still a race condition here and in
> -	 * drm_update_vblank_count() which can cause off-by-one
> -	 * reinitialization of software vblank counter. If gpu
> -	 * vblank counter doesn't increment exactly at the leading
> -	 * edge of a vblank interval, then we can lose 1 count if
> -	 * we happen to execute between start of vblank and the
> -	 * delayed gpu counter increment.
> -	 */
> -	do {
> -		vblank->last = dev->driver->get_vblank_counter(dev, pipe);
> -		vblrc = drm_get_last_vbltimestamp(dev, pipe, &tvblank, 0);
> -	} while (vblank->last != dev->driver->get_vblank_counter(dev, pipe) && (--count) && vblrc);
> -
> -	if (!count)
> -		vblrc = 0;
> -
> -	/* Compute time difference to stored timestamp of last vblank
> -	 * as updated by last invocation of drm_handle_vblank() in vblank irq.
> -	 */
> -	vblcount = atomic_read(&vblank->count);
> -	diff_ns = timeval_to_ns(&tvblank) -
> -		  timeval_to_ns(&vblanktimestamp(dev, pipe, vblcount));
> -
> -	/* If there is at least 1 msec difference between the last stored
> -	 * timestamp and tvblank, then we are currently executing our
> -	 * disable inside a new vblank interval, the tvblank timestamp
> -	 * corresponds to this new vblank interval and the irq handler
> -	 * for this vblank didn't run yet and won't run due to our disable.
> -	 * Therefore we need to do the job of drm_handle_vblank() and
> -	 * increment the vblank counter by one to account for this vblank.
> -	 *
> -	 * Skip this step if there isn't any high precision timestamp
> -	 * available. In that case we can't account for this and just
> -	 * hope for the best.
> -	 */
> -	if (vblrc && (abs64(diff_ns) > 1000000)) {
> -		/* Store new timestamp in ringbuffer. */
> -		vblanktimestamp(dev, pipe, vblcount + 1) = tvblank;
> -
> -		/* Increment cooked vblank count. This also atomically commits
> -		 * the timestamp computed above.
> -		 */
> -		smp_mb__before_atomic();
> -		atomic_inc(&vblank->count);
> -		smp_mb__after_atomic();
> -	}
> -
> -	spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);
> -}
> -
> -static void vblank_disable_fn(unsigned long arg)
> -{
> -	struct drm_vblank_crtc *vblank = (void *)arg;
> -	struct drm_device *dev = vblank->dev;
> -	unsigned long irqflags;
> -	unsigned int pipe = vblank->pipe;
> -
> -	if (!dev->vblank_disable_allowed)
> -		return;
> -
> -	spin_lock_irqsave(&dev->vbl_lock, irqflags);
> -	if (atomic_read(&vblank->refcount) == 0 && vblank->enabled) {
> -		DRM_DEBUG("disabling vblank on crtc %u\n", pipe);
> -		vblank_disable_and_save(dev, pipe);
> -	}
> -	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
> -}
> -
> -/**
> - * drm_vblank_cleanup - cleanup vblank support
> - * @dev: DRM device
> - *
> - * This function cleans up any resources allocated in drm_vblank_init.
> - */
> -void drm_vblank_cleanup(struct drm_device *dev)
> -{
> -	unsigned int pipe;
> -	unsigned long irqflags;
> -
> -	/* Bail if the driver didn't call drm_vblank_init() */
> -	if (dev->num_crtcs == 0)
> -		return;
> -
> -	for (pipe = 0; pipe < dev->num_crtcs; pipe++) {
> -		struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> -
> -		del_timer_sync(&vblank->disable_timer);
> -
> -		spin_lock_irqsave(&dev->vbl_lock, irqflags);
> -		vblank_disable_and_save(dev, pipe);
> -		spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
> -	}
> -
> -	kfree(dev->vblank);
> -
> -	dev->num_crtcs = 0;
> -}
> -EXPORT_SYMBOL(drm_vblank_cleanup);
> -
> -/**
> - * drm_vblank_init - initialize vblank support
> - * @dev: DRM device
> - * @num_crtcs: number of CRTCs supported by @dev
> - *
> - * This function initializes vblank support for @num_crtcs display pipelines.
> - *
> - * Returns:
> - * Zero on success or a negative error code on failure.
> - */
> -int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs)
> -{
> -	int ret = -ENOMEM;
> -	unsigned int i;
> -
> -	spin_lock_init(&dev->vbl_lock);
> -	spin_lock_init(&dev->vblank_time_lock);
> -
> -	dev->num_crtcs = num_crtcs;
> -
> -	dev->vblank = kcalloc(num_crtcs, sizeof(*dev->vblank), GFP_KERNEL);
> -	if (!dev->vblank)
> -		goto err;
> -
> -	for (i = 0; i < num_crtcs; i++) {
> -		struct drm_vblank_crtc *vblank = &dev->vblank[i];
> -
> -		vblank->dev = dev;
> -		vblank->pipe = i;
> -		init_waitqueue_head(&vblank->queue);
> -		setup_timer(&vblank->disable_timer, vblank_disable_fn,
> -			    (unsigned long)vblank);
> -	}
> -
> -	DRM_INFO("Supports vblank timestamp caching Rev 2 (21.10.2013).\n");
> -
> -	/* Driver specific high-precision vblank timestamping supported? */
> -	if (dev->driver->get_vblank_timestamp)
> -		DRM_INFO("Driver supports precise vblank timestamp query.\n");
> -	else
> -		DRM_INFO("No driver support for vblank timestamp query.\n");
> -
> -	dev->vblank_disable_allowed = false;
> -
> -	return 0;
> -
> -err:
> -	dev->num_crtcs = 0;
> -	return ret;
> -}
> -EXPORT_SYMBOL(drm_vblank_init);
> -
> -static void drm_irq_vgaarb_nokms(void *cookie, bool state)
> -{
> -	struct drm_device *dev = cookie;
> -
> -	if (dev->driver->vgaarb_irq) {
> -		dev->driver->vgaarb_irq(dev, state);
> -		return;
> -	}
> -
> -	if (!dev->irq_enabled)
> -		return;
> -
> -	if (state) {
> -		if (dev->driver->irq_uninstall)
> -			dev->driver->irq_uninstall(dev);
> -	} else {
> -		if (dev->driver->irq_preinstall)
> -			dev->driver->irq_preinstall(dev);
> -		if (dev->driver->irq_postinstall)
> -			dev->driver->irq_postinstall(dev);
> -	}
> -}
> -
> -/**
> - * drm_irq_install - install IRQ handler
> - * @dev: DRM device
> - * @irq: IRQ number to install the handler for
> - *
> - * Initializes the IRQ related data. Installs the handler, calling the driver
> - * irq_preinstall() and irq_postinstall() functions before and after the
> - * installation.
> - *
> - * This is the simplified helper interface provided for drivers with no special
> - * needs. Drivers which need to install interrupt handlers for multiple
> - * interrupts must instead set drm_device->irq_enabled to signal the DRM core
> - * that vblank interrupts are available.
> - *
> - * Returns:
> - * Zero on success or a negative error code on failure.
> - */
> -int drm_irq_install(struct drm_device *dev, int irq)
> -{
> -	int ret;
> -	unsigned long sh_flags = 0;
> -
> -	if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
> -		return -EINVAL;
> -
> -	if (irq == 0)
> -		return -EINVAL;
> -
> -	/* Driver must have been initialized */
> -	if (!dev->dev_private)
> -		return -EINVAL;
> -
> -	if (dev->irq_enabled)
> -		return -EBUSY;
> -	dev->irq_enabled = true;
> -
> -	DRM_DEBUG("irq=%d\n", irq);
> -
> -	/* Before installing handler */
> -	if (dev->driver->irq_preinstall)
> -		dev->driver->irq_preinstall(dev);
> -
> -	/* Install handler */
> -	if (drm_core_check_feature(dev, DRIVER_IRQ_SHARED))
> -		sh_flags = IRQF_SHARED;
> -
> -	ret = request_irq(irq, dev->driver->irq_handler,
> -			  sh_flags, dev->driver->name, dev);
> -
> -	if (ret < 0) {
> -		dev->irq_enabled = false;
> -		return ret;
> -	}
> -
> -	if (!drm_core_check_feature(dev, DRIVER_MODESET))
> -		vga_client_register(dev->pdev, (void *)dev, drm_irq_vgaarb_nokms, NULL);
> -
> -	/* After installing handler */
> -	if (dev->driver->irq_postinstall)
> -		ret = dev->driver->irq_postinstall(dev);
> -
> -	if (ret < 0) {
> -		dev->irq_enabled = false;
> -		if (!drm_core_check_feature(dev, DRIVER_MODESET))
> -			vga_client_register(dev->pdev, NULL, NULL, NULL);
> -		free_irq(irq, dev);
> -	} else {
> -		dev->irq = irq;
> -	}
> -
> -	return ret;
> -}
> -EXPORT_SYMBOL(drm_irq_install);
> -
> -/**
> - * drm_irq_uninstall - uninstall the IRQ handler
> - * @dev: DRM device
> - *
> - * Calls the driver's irq_uninstall() function and unregisters the IRQ handler.
> - * This should only be called by drivers which used drm_irq_install() to set up
> - * their interrupt handler. Other drivers must only reset
> - * drm_device->irq_enabled to false.
> - *
> - * Note that for kernel modesetting drivers it is a bug if this function fails.
> - * The sanity checks are only to catch buggy user modesetting drivers which call
> - * the same function through an ioctl.
> - *
> - * Returns:
> - * Zero on success or a negative error code on failure.
> - */
> -int drm_irq_uninstall(struct drm_device *dev)
> -{
> -	unsigned long irqflags;
> -	bool irq_enabled;
> -	int i;
> -
> -	if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
> -		return -EINVAL;
> -
> -	irq_enabled = dev->irq_enabled;
> -	dev->irq_enabled = false;
> -
> -	/*
> -	 * Wake up any waiters so they don't hang.
> -	 */
> -	if (dev->num_crtcs) {
> -		spin_lock_irqsave(&dev->vbl_lock, irqflags);
> -		for (i = 0; i < dev->num_crtcs; i++) {
> -			struct drm_vblank_crtc *vblank = &dev->vblank[i];
> -
> -			wake_up(&vblank->queue);
> -			vblank->enabled = false;
> -			vblank->last =
> -				dev->driver->get_vblank_counter(dev, i);
> -		}
> -		spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
> -	}
> -
> -	if (!irq_enabled)
> -		return -EINVAL;
> -
> -	DRM_DEBUG("irq=%d\n", dev->irq);
> -
> -	if (!drm_core_check_feature(dev, DRIVER_MODESET))
> -		vga_client_register(dev->pdev, NULL, NULL, NULL);
> -
> -	if (dev->driver->irq_uninstall)
> -		dev->driver->irq_uninstall(dev);
> -
> -	free_irq(dev->irq, dev);
> -
> -	return 0;
> -}
> -EXPORT_SYMBOL(drm_irq_uninstall);
> -
> -/*
> - * IRQ control ioctl.
> - *
> - * \param inode device inode.
> - * \param file_priv DRM file private.
> - * \param cmd command.
> - * \param arg user argument, pointing to a drm_control structure.
> - * \return zero on success or a negative number on failure.
> - *
> - * Calls irq_install() or irq_uninstall() according to \p arg.
> - */
> -int drm_control(struct drm_device *dev, void *data,
> -		struct drm_file *file_priv)
> -{
> -	struct drm_control *ctl = data;
> -	int ret = 0, irq;
> -
> -	/* if we haven't irq we fallback for compatibility reasons -
> -	 * this used to be a separate function in drm_dma.h
> -	 */
> -
> -	if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
> -		return 0;
> -	if (drm_core_check_feature(dev, DRIVER_MODESET))
> -		return 0;
> -	/* UMS was only ever support on pci devices. */
> -	if (WARN_ON(!dev->pdev))
> -		return -EINVAL;
> -
> -	switch (ctl->func) {
> -	case DRM_INST_HANDLER:
> -		irq = dev->pdev->irq;
> -
> -		if (dev->if_version < DRM_IF_VERSION(1, 2) &&
> -		    ctl->irq != irq)
> -			return -EINVAL;
> -		mutex_lock(&dev->struct_mutex);
> -		ret = drm_irq_install(dev, irq);
> -		mutex_unlock(&dev->struct_mutex);
> -
> -		return ret;
> -	case DRM_UNINST_HANDLER:
> -		mutex_lock(&dev->struct_mutex);
> -		ret = drm_irq_uninstall(dev);
> -		mutex_unlock(&dev->struct_mutex);
> -
> -		return ret;
> -	default:
> -		return -EINVAL;
> -	}
> -}
> -
> -/**
>   * drm_calc_timestamping_constants - calculate vblank timestamp constants
>   * @crtc: drm_crtc whose timestamp constants should be updated.
>   * @mode: display mode containing the scanout timings
> @@ -770,83 +280,6 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
>  }
>  EXPORT_SYMBOL(drm_calc_vbltimestamp_from_scanoutpos);
>  
> -static struct timeval get_drm_timestamp(void)
> -{
> -	ktime_t now;
> -
> -	now = drm_timestamp_monotonic ? ktime_get() : ktime_get_real();
> -	return ktime_to_timeval(now);
> -}
> -
> -/**
> - * drm_get_last_vbltimestamp - retrieve raw timestamp for the most recent
> - *                             vblank interval
> - * @dev: DRM device
> - * @pipe: index of CRTC whose vblank timestamp to retrieve
> - * @tvblank: Pointer to target struct timeval which should receive the timestamp
> - * @flags: Flags to pass to driver:
> - *         0 = Default,
> - *         DRM_CALLED_FROM_VBLIRQ = If function is called from vbl IRQ handler
> - *
> - * Fetches the system timestamp corresponding to the time of the most recent
> - * vblank interval on specified CRTC. May call into kms-driver to
> - * compute the timestamp with a high-precision GPU specific method.
> - *
> - * Returns zero if timestamp originates from uncorrected do_gettimeofday()
> - * call, i.e., it isn't very precisely locked to the true vblank.
> - *
> - * Returns:
> - * True if timestamp is considered to be very precise, false otherwise.
> - */
> -static bool
> -drm_get_last_vbltimestamp(struct drm_device *dev, unsigned int pipe,
> -			  struct timeval *tvblank, unsigned flags)
> -{
> -	int ret;
> -
> -	/* Define requested maximum error on timestamps (nanoseconds). */
> -	int max_error = (int) drm_timestamp_precision * 1000;
> -
> -	/* Query driver if possible and precision timestamping enabled. */
> -	if (dev->driver->get_vblank_timestamp && (max_error > 0)) {
> -		ret = dev->driver->get_vblank_timestamp(dev, pipe, &max_error,
> -							tvblank, flags);
> -		if (ret > 0)
> -			return true;
> -	}
> -
> -	/* GPU high precision timestamp query unsupported or failed.
> -	 * Return current monotonic/gettimeofday timestamp as best estimate.
> -	 */
> -	*tvblank = get_drm_timestamp();
> -
> -	return false;
> -}
> -
> -/**
> - * drm_vblank_count - retrieve "cooked" vblank counter value
> - * @dev: DRM device
> - * @pipe: index of CRTC for which to retrieve the counter
> - *
> - * Fetches the "cooked" vblank count value that represents the number of
> - * vblank events since the system was booted, including lost events due to
> - * modesetting activity.
> - *
> - * This is the legacy version of drm_crtc_vblank_count().
> - *
> - * Returns:
> - * The software vblank counter.
> - */
> -u32 drm_vblank_count(struct drm_device *dev, int pipe)
> -{
> -	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> -
> -	if (WARN_ON(pipe >= dev->num_crtcs))
> -		return 0;
> -	return atomic_read(&vblank->count);
> -}
> -EXPORT_SYMBOL(drm_vblank_count);
> -
>  /**
>   * drm_crtc_vblank_count - retrieve "cooked" vblank counter value
>   * @crtc: which counter to retrieve
> @@ -925,51 +358,6 @@ u32 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc,
>  }
>  EXPORT_SYMBOL(drm_crtc_vblank_count_and_time);
>  
> -static void send_vblank_event(struct drm_device *dev,
> -		struct drm_pending_vblank_event *e,
> -		unsigned long seq, struct timeval *now)
> -{
> -	WARN_ON_SMP(!spin_is_locked(&dev->event_lock));
> -	e->event.sequence = seq;
> -	e->event.tv_sec = now->tv_sec;
> -	e->event.tv_usec = now->tv_usec;
> -
> -	list_add_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_send_vblank_event - helper to send vblank event after pageflip
> - * @dev: DRM device
> - * @pipe: CRTC index
> - * @e: the event to send
> - *
> - * Updates sequence # and timestamp on event, and sends it to userspace.
> - * Caller must hold event lock.
> - *
> - * This is the legacy version of drm_crtc_send_vblank_event().
> - */
> -void drm_send_vblank_event(struct drm_device *dev, unsigned int pipe,
> -			   struct drm_pending_vblank_event *e)
> -{
> -	struct timeval now;
> -	unsigned int seq;
> -
> -	if (dev->num_crtcs > 0) {
> -		seq = drm_vblank_count_and_time(dev, pipe, &now);
> -	} else {
> -		seq = 0;
> -
> -		now = get_drm_timestamp();
> -	}
> -	e->pipe = pipe;
> -	send_vblank_event(dev, e, seq, &now);
> -}
> -EXPORT_SYMBOL(drm_send_vblank_event);
> -
>  /**
>   * drm_crtc_send_vblank_event - helper to send vblank event after pageflip
>   * @crtc: the source CRTC of the vblank event
> @@ -988,84 +376,6 @@ void drm_crtc_send_vblank_event(struct drm_crtc *crtc,
>  EXPORT_SYMBOL(drm_crtc_send_vblank_event);
>  
>  /**
> - * drm_vblank_enable - enable the vblank interrupt on a CRTC
> - * @dev: DRM device
> - * @pipe: CRTC index
> - *
> - * Returns:
> - * Zero on success or a negative error code on failure.
> - */
> -static int drm_vblank_enable(struct drm_device *dev, unsigned int pipe)
> -{
> -	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> -	int ret = 0;
> -
> -	assert_spin_locked(&dev->vbl_lock);
> -
> -	spin_lock(&dev->vblank_time_lock);
> -
> -	if (!vblank->enabled) {
> -		/*
> -		 * Enable vblank irqs under vblank_time_lock protection.
> -		 * All vblank count & timestamp updates are held off
> -		 * until we are done reinitializing master counter and
> -		 * timestamps. Filtercode in drm_handle_vblank() will
> -		 * prevent double-accounting of same vblank interval.
> -		 */
> -		ret = dev->driver->enable_vblank(dev, pipe);
> -		DRM_DEBUG("enabling vblank on crtc %u, ret: %d\n", pipe, ret);
> -		if (ret)
> -			atomic_dec(&vblank->refcount);
> -		else {
> -			vblank->enabled = true;
> -			drm_update_vblank_count(dev, pipe);
> -		}
> -	}
> -
> -	spin_unlock(&dev->vblank_time_lock);
> -
> -	return ret;
> -}
> -
> -/**
> - * drm_vblank_get - get a reference count on vblank events
> - * @dev: DRM device
> - * @pipe: index of CRTC to own
> - *
> - * Acquire a reference count on vblank events to avoid having them disabled
> - * while in use.
> - *
> - * This is the legacy version of drm_crtc_vblank_get().
> - *
> - * Returns:
> - * Zero on success or a negative error code on failure.
> - */
> -int drm_vblank_get(struct drm_device *dev, unsigned int pipe)
> -{
> -	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> -	unsigned long irqflags;
> -	int ret = 0;
> -
> -	if (WARN_ON(pipe >= dev->num_crtcs))
> -		return -EINVAL;
> -
> -	spin_lock_irqsave(&dev->vbl_lock, irqflags);
> -	/* Going from 0->1 means we have to enable interrupts again */
> -	if (atomic_add_return(1, &vblank->refcount) == 1) {
> -		ret = drm_vblank_enable(dev, pipe);
> -	} else {
> -		if (!vblank->enabled) {
> -			atomic_dec(&vblank->refcount);
> -			ret = -EINVAL;
> -		}
> -	}
> -	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
> -
> -	return ret;
> -}
> -EXPORT_SYMBOL(drm_vblank_get);
> -
> -/**
>   * drm_crtc_vblank_get - get a reference count on vblank events
>   * @crtc: which CRTC to own
>   *
> @@ -1084,39 +394,6 @@ int drm_crtc_vblank_get(struct drm_crtc *crtc)
>  EXPORT_SYMBOL(drm_crtc_vblank_get);
>  
>  /**
> - * drm_vblank_put - release ownership of vblank events
> - * @dev: DRM device
> - * @pipe: index of CRTC to release
> - *
> - * Release ownership of a given vblank counter, turning off interrupts
> - * if possible. Disable interrupts after drm_vblank_offdelay milliseconds.
> - *
> - * This is the legacy version of drm_crtc_vblank_put().
> - */
> -void drm_vblank_put(struct drm_device *dev, unsigned int pipe)
> -{
> -	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> -
> -	if (WARN_ON(pipe >= dev->num_crtcs))
> -		return;
> -
> -	if (WARN_ON(atomic_read(&vblank->refcount) == 0))
> -		return;
> -
> -	/* Last user schedules interrupt disable */
> -	if (atomic_dec_and_test(&vblank->refcount)) {
> -		if (drm_vblank_offdelay == 0)
> -			return;
> -		else if (dev->vblank_disable_immediate || drm_vblank_offdelay < 0)
> -			vblank_disable_fn((unsigned long)vblank);
> -		else
> -			mod_timer(&vblank->disable_timer,
> -				  jiffies + ((drm_vblank_offdelay * HZ)/1000));
> -	}
> -}
> -EXPORT_SYMBOL(drm_vblank_put);
> -
> -/**
>   * drm_crtc_vblank_put - give up ownership of vblank events
>   * @crtc: which counter to give up
>   *
> @@ -1132,40 +409,6 @@ void drm_crtc_vblank_put(struct drm_crtc *crtc)
>  EXPORT_SYMBOL(drm_crtc_vblank_put);
>  
>  /**
> - * drm_wait_one_vblank - wait for one vblank
> - * @dev: DRM device
> - * @pipe: CRTC index
> - *
> - * This waits for one vblank to pass on @crtc, using the irq driver interfaces.
> - * It is a failure to call this when the vblank irq for @crtc is disabled, e.g.
> - * due to lack of driver support or because the crtc is off.
> - */
> -void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe)
> -{
> -	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> -	int ret;
> -	u32 last;
> -
> -	if (WARN_ON(pipe >= dev->num_crtcs))
> -		return;
> -
> -	ret = drm_vblank_get(dev, pipe);
> -	if (WARN(ret, "vblank not available on crtc %i, ret=%i\n", pipe, ret))
> -		return;
> -
> -	last = drm_vblank_count(dev, pipe);
> -
> -	ret = wait_event_timeout(vblank->queue,
> -				 last != drm_vblank_count(dev, pipe),
> -				 msecs_to_jiffies(100));
> -
> -	WARN(ret == 0, "vblank wait timed out on crtc %i\n", pipe);
> -
> -	drm_vblank_put(dev, pipe);
> -}
> -EXPORT_SYMBOL(drm_wait_one_vblank);
> -
> -/**
>   * drm_crtc_wait_one_vblank - wait for one vblank
>   * @crtc: DRM crtc
>   *
> @@ -1180,64 +423,6 @@ void drm_crtc_wait_one_vblank(struct drm_crtc *crtc)
>  EXPORT_SYMBOL(drm_crtc_wait_one_vblank);
>  
>  /**
> - * drm_vblank_off - disable vblank events on a CRTC
> - * @dev: DRM device
> - * @pipe: CRTC index
> - *
> - * Drivers can use this function to shut down the vblank interrupt handling when
> - * disabling a crtc. This function ensures that the latest vblank frame count is
> - * stored so that drm_vblank_on() can restore it again.
> - *
> - * Drivers must use this function when the hardware vblank counter can get
> - * reset, e.g. when suspending.
> - *
> - * This is the legacy version of drm_crtc_vblank_off().
> - */
> -void drm_vblank_off(struct drm_device *dev, unsigned int pipe)
> -{
> -	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> -	struct drm_pending_vblank_event *e, *t;
> -	struct timeval now;
> -	unsigned long irqflags;
> -	unsigned int seq;
> -
> -	if (WARN_ON(pipe >= dev->num_crtcs))
> -		return;
> -
> -	spin_lock_irqsave(&dev->event_lock, irqflags);
> -
> -	spin_lock(&dev->vbl_lock);
> -	vblank_disable_and_save(dev, pipe);
> -	wake_up(&vblank->queue);
> -
> -	/*
> -	 * Prevent subsequent drm_vblank_get() from re-enabling
> -	 * the vblank interrupt by bumping the refcount.
> -	 */
> -	if (!vblank->inmodeset) {
> -		atomic_inc(&vblank->refcount);
> -		vblank->inmodeset = 1;
> -	}
> -	spin_unlock(&dev->vbl_lock);
> -
> -	/* Send any queued vblank events, lest the natives grow disquiet */
> -	seq = drm_vblank_count_and_time(dev, pipe, &now);
> -
> -	list_for_each_entry_safe(e, t, &dev->vblank_event_list, base.link) {
> -		if (e->pipe != pipe)
> -			continue;
> -		DRM_DEBUG("Sending premature vblank event on disable: \
> -			  wanted %d, current %d\n",
> -			  e->event.sequence, seq);
> -		list_del(&e->base.link);
> -		drm_vblank_put(dev, pipe);
> -		send_vblank_event(dev, e, seq, &now);
> -	}
> -	spin_unlock_irqrestore(&dev->event_lock, irqflags);
> -}
> -EXPORT_SYMBOL(drm_vblank_off);
> -
> -/**
>   * drm_crtc_vblank_off - disable vblank events on a CRTC
>   * @crtc: CRTC in question
>   *
> @@ -1257,54 +442,6 @@ void drm_crtc_vblank_off(struct drm_crtc *crtc)
>  EXPORT_SYMBOL(drm_crtc_vblank_off);
>  
>  /**
> - * drm_vblank_on - enable vblank events on a CRTC
> - * @dev: DRM device
> - * @pipe: CRTC index
> - *
> - * This functions restores the vblank interrupt state captured with
> - * drm_vblank_off() again. Note that calls to drm_vblank_on() and
> - * drm_vblank_off() can be unbalanced and so can also be unconditionally called
> - * in driver load code to reflect the current hardware state of the crtc.
> - *
> - * This is the legacy version of drm_crtc_vblank_on().
> - */
> -void drm_vblank_on(struct drm_device *dev, unsigned int pipe)
> -{
> -	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> -	unsigned long irqflags;
> -
> -	if (WARN_ON(pipe >= dev->num_crtcs))
> -		return;
> -
> -	spin_lock_irqsave(&dev->vbl_lock, irqflags);
> -	/* Drop our private "prevent drm_vblank_get" refcount */
> -	if (vblank->inmodeset) {
> -		atomic_dec(&vblank->refcount);
> -		vblank->inmodeset = 0;
> -	}
> -
> -	/*
> -	 * sample the current counter to avoid random jumps
> -	 * when drm_vblank_enable() applies the diff
> -	 *
> -	 * -1 to make sure user will never see the same
> -	 * vblank counter value before and after a modeset
> -	 */
> -	vblank->last =
> -		(dev->driver->get_vblank_counter(dev, pipe) - 1) &
> -		dev->max_vblank_count;
> -	/*
> -	 * re-enable interrupts if there are users left, or the
> -	 * user wishes vblank interrupts to be enabled all the time.
> -	 */
> -	if (atomic_read(&vblank->refcount) != 0 ||
> -	    (!dev->vblank_disable_immediate && drm_vblank_offdelay == 0))
> -		WARN_ON(drm_vblank_enable(dev, pipe));
> -	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
> -}
> -EXPORT_SYMBOL(drm_vblank_on);
> -
> -/**
>   * drm_crtc_vblank_on - enable vblank events on a CRTC
>   * @crtc: CRTC in question
>   *
> @@ -1321,129 +458,20 @@ void drm_crtc_vblank_on(struct drm_crtc *crtc)
>  }
>  EXPORT_SYMBOL(drm_crtc_vblank_on);
>  
> -/**
> - * drm_vblank_pre_modeset - account for vblanks across mode sets
> - * @dev: DRM device
> - * @pipe: CRTC index
> - *
> - * Account for vblank events across mode setting events, which will likely
> - * reset the hardware frame counter.
> - *
> - * This is done by grabbing a temporary vblank reference to ensure that the
> - * vblank interrupt keeps running across the modeset sequence. With this the
> - * software-side vblank frame counting will ensure that there are no jumps or
> - * discontinuities.
> - *
> - * Unfortunately this approach is racy and also doesn't work when the vblank
> - * interrupt stops running, e.g. across system suspend resume. It is therefore
> - * highly recommended that drivers use the newer drm_vblank_off() and
> - * drm_vblank_on() instead. drm_vblank_pre_modeset() only works correctly when
> - * using "cooked" software vblank frame counters and not relying on any hardware
> - * counters.
> - *
> - * Drivers must call drm_vblank_post_modeset() when re-enabling the same crtc
> - * again.
> - */
> -void drm_vblank_pre_modeset(struct drm_device *dev, unsigned int pipe)
> -{
> -	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> -
> -	/* vblank is not initialized (IRQ not installed ?), or has been freed */
> -	if (!dev->num_crtcs)
> -		return;
> -
> -	if (WARN_ON(pipe >= dev->num_crtcs))
> -		return;
> -
> -	/*
> -	 * To avoid all the problems that might happen if interrupts
> -	 * were enabled/disabled around or between these calls, we just
> -	 * have the kernel take a reference on the CRTC (just once though
> -	 * to avoid corrupting the count if multiple, mismatch calls occur),
> -	 * so that interrupts remain enabled in the interim.
> -	 */
> -	if (!vblank->inmodeset) {
> -		vblank->inmodeset = 0x1;
> -		if (drm_vblank_get(dev, pipe) == 0)
> -			vblank->inmodeset |= 0x2;
> -	}
> -}
> -EXPORT_SYMBOL(drm_vblank_pre_modeset);
> -
> -/**
> - * drm_vblank_post_modeset - undo drm_vblank_pre_modeset changes
> - * @dev: DRM device
> - * @pipe: CRTC index
> - *
> - * This function again drops the temporary vblank reference acquired in
> - * drm_vblank_pre_modeset.
> - */
> -void drm_vblank_post_modeset(struct drm_device *dev, unsigned int pipe)
> -{
> -	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> -	unsigned long irqflags;
> -
> -	/* vblank is not initialized (IRQ not installed ?), or has been freed */
> -	if (!dev->num_crtcs)
> -		return;
> -
> -	if (WARN_ON(pipe >= dev->num_crtcs))
> -		return;
> -
> -	if (vblank->inmodeset) {
> -		spin_lock_irqsave(&dev->vbl_lock, irqflags);
> -		dev->vblank_disable_allowed = true;
> -		spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
> -
> -		if (vblank->inmodeset & 0x2)
> -			drm_vblank_put(dev, pipe);
> -
> -		vblank->inmodeset = 0;
> -	}
> -}
> -EXPORT_SYMBOL(drm_vblank_post_modeset);
> -
> -/*
> - * drm_modeset_ctl - handle vblank event counter changes across mode switch
> - * @DRM_IOCTL_ARGS: standard ioctl arguments
> - *
> - * Applications should call the %_DRM_PRE_MODESET and %_DRM_POST_MODESET
> - * ioctls around modesetting so that any lost vblank events are accounted for.
> - *
> - * Generally the counter will reset across mode sets.  If interrupts are
> - * enabled around this call, we don't have to do anything since the counter
> - * will have already been incremented.
> - */
> -int drm_modeset_ctl(struct drm_device *dev, void *data,
> -		    struct drm_file *file_priv)
> +static void send_vblank_event(struct drm_device *dev,
> +		struct drm_pending_vblank_event *e,
> +		unsigned long seq, struct timeval *now)
>  {
> -	struct drm_modeset_ctl *modeset = data;
> -	unsigned int pipe;
> -
> -	/* If drm_vblank_init() hasn't been called yet, just no-op */
> -	if (!dev->num_crtcs)
> -		return 0;
> -
> -	/* KMS drivers handle this internally */
> -	if (drm_core_check_feature(dev, DRIVER_MODESET))
> -		return 0;
> -
> -	pipe = modeset->crtc;
> -	if (pipe >= dev->num_crtcs)
> -		return -EINVAL;
> -
> -	switch (modeset->cmd) {
> -	case _DRM_PRE_MODESET:
> -		drm_vblank_pre_modeset(dev, pipe);
> -		break;
> -	case _DRM_POST_MODESET:
> -		drm_vblank_post_modeset(dev, pipe);
> -		break;
> -	default:
> -		return -EINVAL;
> -	}
> +	WARN_ON_SMP(!spin_is_locked(&dev->event_lock));
> +	e->event.sequence = seq;
> +	e->event.tv_sec = now->tv_sec;
> +	e->event.tv_usec = now->tv_usec;
>  
> -	return 0;
> +	list_add_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);
>  }
>  
>  static int drm_queue_vblank_event(struct drm_device *dev, unsigned int pipe,
> @@ -1635,119 +663,6 @@ done:
>  	return ret;
>  }
>  
> -static void drm_handle_vblank_events(struct drm_device *dev, unsigned int pipe)
> -{
> -	struct drm_pending_vblank_event *e, *t;
> -	struct timeval now;
> -	unsigned int seq;
> -
> -	assert_spin_locked(&dev->event_lock);
> -
> -	seq = drm_vblank_count_and_time(dev, pipe, &now);
> -
> -	list_for_each_entry_safe(e, t, &dev->vblank_event_list, base.link) {
> -		if (e->pipe != pipe)
> -			continue;
> -		if ((seq - e->event.sequence) > (1<<23))
> -			continue;
> -
> -		DRM_DEBUG("vblank event on %d, current %d\n",
> -			  e->event.sequence, seq);
> -
> -		list_del(&e->base.link);
> -		drm_vblank_put(dev, pipe);
> -		send_vblank_event(dev, e, seq, &now);
> -	}
> -
> -	trace_drm_vblank_event(pipe, seq);
> -}
> -
> -/**
> - * drm_handle_vblank - handle a vblank event
> - * @dev: DRM device
> - * @pipe: index of CRTC where this event occurred
> - *
> - * Drivers should call this routine in their vblank interrupt handlers to
> - * update the vblank counter and send any signals that may be pending.
> - *
> - * This is the legacy version of drm_crtc_handle_vblank().
> - */
> -bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe)
> -{
> -	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> -	u32 vblcount;
> -	s64 diff_ns;
> -	struct timeval tvblank;
> -	unsigned long irqflags;
> -
> -	if (!dev->num_crtcs)
> -		return false;
> -
> -	if (WARN_ON(pipe >= dev->num_crtcs))
> -		return false;
> -
> -	spin_lock_irqsave(&dev->event_lock, irqflags);
> -
> -	/* Need timestamp lock to prevent concurrent execution with
> -	 * vblank enable/disable, as this would cause inconsistent
> -	 * or corrupted timestamps and vblank counts.
> -	 */
> -	spin_lock(&dev->vblank_time_lock);
> -
> -	/* Vblank irq handling disabled. Nothing to do. */
> -	if (!vblank->enabled) {
> -		spin_unlock(&dev->vblank_time_lock);
> -		spin_unlock_irqrestore(&dev->event_lock, irqflags);
> -		return false;
> -	}
> -
> -	/* Fetch corresponding timestamp for this vblank interval from
> -	 * driver and store it in proper slot of timestamp ringbuffer.
> -	 */
> -
> -	/* Get current timestamp and count. */
> -	vblcount = atomic_read(&vblank->count);
> -	drm_get_last_vbltimestamp(dev, pipe, &tvblank, DRM_CALLED_FROM_VBLIRQ);
> -
> -	/* Compute time difference to timestamp of last vblank */
> -	diff_ns = timeval_to_ns(&tvblank) -
> -		  timeval_to_ns(&vblanktimestamp(dev, pipe, vblcount));
> -
> -	/* Update vblank timestamp and count if at least
> -	 * DRM_REDUNDANT_VBLIRQ_THRESH_NS nanoseconds
> -	 * difference between last stored timestamp and current
> -	 * timestamp. A smaller difference means basically
> -	 * identical timestamps. Happens if this vblank has
> -	 * been already processed and this is a redundant call,
> -	 * e.g., due to spurious vblank interrupts. We need to
> -	 * ignore those for accounting.
> -	 */
> -	if (abs64(diff_ns) > DRM_REDUNDANT_VBLIRQ_THRESH_NS) {
> -		/* Store new timestamp in ringbuffer. */
> -		vblanktimestamp(dev, pipe, vblcount + 1) = tvblank;
> -
> -		/* Increment cooked vblank count. This also atomically commits
> -		 * the timestamp computed above.
> -		 */
> -		smp_mb__before_atomic();
> -		atomic_inc(&vblank->count);
> -		smp_mb__after_atomic();
> -	} else {
> -		DRM_DEBUG("crtc %u: Redundant vblirq ignored. diff_ns = %d\n",
> -			  pipe, (int) diff_ns);
> -	}
> -
> -	spin_unlock(&dev->vblank_time_lock);
> -
> -	wake_up(&vblank->queue);
> -	drm_handle_vblank_events(dev, pipe);
> -
> -	spin_unlock_irqrestore(&dev->event_lock, irqflags);
> -
> -	return true;
> -}
> -EXPORT_SYMBOL(drm_handle_vblank);
> -
>  /**
>   * drm_crtc_handle_vblank - handle a vblank event
>   * @crtc: where this event occurred
> diff --git a/drivers/gpu/drm/drm_irq_legacy.c b/drivers/gpu/drm/drm_irq_legacy.c
> new file mode 100644
> index 000000000000..9367ce8a36fd
> --- /dev/null
> +++ b/drivers/gpu/drm/drm_irq_legacy.c
> @@ -0,0 +1,1144 @@
> +/*
> + * drm_irq_legacy.c legacy IRQ and vblank support
> + *
> + * \author Rickard E. (Rik) Faith <faith@valinux.com>
> + * \author Gareth Hughes <gareth@valinux.com>
> + */
> +
> +/*
> + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
> + * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
> + * All Rights Reserved.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> + * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + */
> +
> +#include <linux/vgaarb.h>
> +
> +#include <drm/drmP.h>
> +
> +#include "drm_internal.h"
> +#include "drm_trace.h"
> +
> +/* Access macro for slots in vblank timestamp ringbuffer. */
> +#define vblanktimestamp(dev, pipe, count) \
> +	((dev)->vblank[pipe].time[(count) % DRM_VBLANKTIME_RBSIZE])
> +
> +/*
> + * Threshold in nanoseconds for detection of redundant vblank irq in
> + * drm_handle_vblank(). 1 msec should be ok.
> + */
> +#define DRM_REDUNDANT_VBLIRQ_THRESH_NS 1000000
> +
> +/*
> + * Retry timestamp calculation up to 3 times to satisfy
> + * drm_timestamp_precision before giving up.
> + */
> +#define DRM_TIMESTAMP_MAXRETRIES 3
> +
> +static struct timeval get_drm_timestamp(void)
> +{
> +	ktime_t now;
> +
> +	now = drm_timestamp_monotonic ? ktime_get() : ktime_get_real();
> +	return ktime_to_timeval(now);
> +}
> +
> +/**
> + * drm_get_last_vbltimestamp - retrieve raw timestamp for the most recent
> + *                             vblank interval
> + * @dev: DRM device
> + * @pipe: index of CRTC whose vblank timestamp to retrieve
> + * @tvblank: Pointer to target struct timeval which should receive the timestamp
> + * @flags: Flags to pass to driver:
> + *         0 = Default,
> + *         DRM_CALLED_FROM_VBLIRQ = If function is called from vbl IRQ handler
> + *
> + * Fetches the system timestamp corresponding to the time of the most recent
> + * vblank interval on specified CRTC. May call into kms-driver to
> + * compute the timestamp with a high-precision GPU specific method.
> + *
> + * Returns zero if timestamp originates from uncorrected do_gettimeofday()
> + * call, i.e., it isn't very precisely locked to the true vblank.
> + *
> + * Returns:
> + * True if timestamp is considered to be very precise, false otherwise.
> + */
> +static bool
> +drm_get_last_vbltimestamp(struct drm_device *dev, unsigned int pipe,
> +			  struct timeval *tvblank, unsigned flags)
> +{
> +	int ret;
> +
> +	/* Define requested maximum error on timestamps (nanoseconds). */
> +	int max_error = (int) drm_timestamp_precision * 1000;
> +
> +	/* Query driver if possible and precision timestamping enabled. */
> +	if (dev->driver->get_vblank_timestamp && (max_error > 0)) {
> +		ret = dev->driver->get_vblank_timestamp(dev, pipe, &max_error,
> +							tvblank, flags);
> +		if (ret > 0)
> +			return true;
> +	}
> +
> +	/* GPU high precision timestamp query unsupported or failed.
> +	 * Return current monotonic/gettimeofday timestamp as best estimate.
> +	 */
> +	*tvblank = get_drm_timestamp();
> +
> +	return false;
> +}
> +
> +/**
> + * drm_update_vblank_count - update the master vblank counter
> + * @dev: DRM device
> + * @pipe: counter to update
> + *
> + * Call back into the driver to update the appropriate vblank counter
> + * (specified by @crtc).  Deal with wraparound, if it occurred, and
> + * update the last read value so we can deal with wraparound on the next
> + * call if necessary.
> + *
> + * Only necessary when going from off->on, to account for frames we
> + * didn't get an interrupt for.
> + *
> + * Note: caller must hold dev->vbl_lock since this reads & writes
> + * device vblank fields.
> + */
> +static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe)
> +{
> +	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> +	u32 cur_vblank, diff, tslot;
> +	bool rc;
> +	struct timeval t_vblank;
> +
> +	/*
> +	 * Interrupts were disabled prior to this call, so deal with counter
> +	 * wrap if needed.
> +	 * NOTE!  It's possible we lost a full dev->max_vblank_count events
> +	 * here if the register is small or we had vblank interrupts off for
> +	 * a long time.
> +	 *
> +	 * We repeat the hardware vblank counter & timestamp query until
> +	 * we get consistent results. This to prevent races between gpu
> +	 * updating its hardware counter while we are retrieving the
> +	 * corresponding vblank timestamp.
> +	 */
> +	do {
> +		cur_vblank = dev->driver->get_vblank_counter(dev, pipe);
> +		rc = drm_get_last_vbltimestamp(dev, pipe, &t_vblank, 0);
> +	} while (cur_vblank != dev->driver->get_vblank_counter(dev, pipe));
> +
> +	/* Deal with counter wrap */
> +	diff = cur_vblank - vblank->last;
> +	if (cur_vblank < vblank->last) {
> +		diff += dev->max_vblank_count;
> +
> +		DRM_DEBUG("last_vblank[%u]=0x%x, cur_vblank=0x%x => diff=0x%x\n",
> +			  pipe, vblank->last, cur_vblank, diff);
> +	}
> +
> +	DRM_DEBUG("updating vblank count on crtc %u, missed %d\n",
> +		  pipe, diff);
> +
> +	if (diff == 0)
> +		return;
> +
> +	/* Reinitialize corresponding vblank timestamp if high-precision query
> +	 * available. Skip this step if query unsupported or failed. Will
> +	 * reinitialize delayed at next vblank interrupt in that case.
> +	 */
> +	if (rc) {
> +		tslot = atomic_read(&vblank->count) + diff;
> +		vblanktimestamp(dev, pipe, tslot) = t_vblank;
> +	}
> +
> +	smp_mb__before_atomic();
> +	atomic_add(diff, &vblank->count);
> +	smp_mb__after_atomic();
> +}
> +
> +/*
> + * Disable vblank irq's on crtc, make sure that last vblank count
> + * of hardware and corresponding consistent software vblank counter
> + * are preserved, even if there are any spurious vblank irq's after
> + * disable.
> + */
> +static void vblank_disable_and_save(struct drm_device *dev, unsigned int pipe)
> +{
> +	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> +	unsigned long irqflags;
> +	u32 vblcount;
> +	s64 diff_ns;
> +	bool vblrc;
> +	struct timeval tvblank;
> +	int count = DRM_TIMESTAMP_MAXRETRIES;
> +
> +	/* Prevent vblank irq processing while disabling vblank irqs,
> +	 * so no updates of timestamps or count can happen after we've
> +	 * disabled. Needed to prevent races in case of delayed irq's.
> +	 */
> +	spin_lock_irqsave(&dev->vblank_time_lock, irqflags);
> +
> +	/*
> +	 * If the vblank interrupt was already disabled update the count
> +	 * and timestamp to maintain the appearance that the counter
> +	 * has been ticking all along until this time. This makes the
> +	 * count account for the entire time between drm_vblank_on() and
> +	 * drm_vblank_off().
> +	 *
> +	 * But only do this if precise vblank timestamps are available.
> +	 * Otherwise we might read a totally bogus timestamp since drivers
> +	 * lacking precise timestamp support rely upon sampling the system clock
> +	 * at vblank interrupt time. Which obviously won't work out well if the
> +	 * vblank interrupt is disabled.
> +	 */
> +	if (!vblank->enabled &&
> +	    drm_get_last_vbltimestamp(dev, pipe, &tvblank, 0)) {
> +		drm_update_vblank_count(dev, pipe);
> +		spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);
> +		return;
> +	}
> +
> +	dev->driver->disable_vblank(dev, pipe);
> +	vblank->enabled = false;
> +
> +	/* No further vblank irq's will be processed after
> +	 * this point. Get current hardware vblank count and
> +	 * vblank timestamp, repeat until they are consistent.
> +	 *
> +	 * FIXME: There is still a race condition here and in
> +	 * drm_update_vblank_count() which can cause off-by-one
> +	 * reinitialization of software vblank counter. If gpu
> +	 * vblank counter doesn't increment exactly at the leading
> +	 * edge of a vblank interval, then we can lose 1 count if
> +	 * we happen to execute between start of vblank and the
> +	 * delayed gpu counter increment.
> +	 */
> +	do {
> +		vblank->last = dev->driver->get_vblank_counter(dev, pipe);
> +		vblrc = drm_get_last_vbltimestamp(dev, pipe, &tvblank, 0);
> +	} while (vblank->last != dev->driver->get_vblank_counter(dev, pipe) && (--count) && vblrc);
> +
> +	if (!count)
> +		vblrc = 0;
> +
> +	/* Compute time difference to stored timestamp of last vblank
> +	 * as updated by last invocation of drm_handle_vblank() in vblank irq.
> +	 */
> +	vblcount = atomic_read(&vblank->count);
> +	diff_ns = timeval_to_ns(&tvblank) -
> +		  timeval_to_ns(&vblanktimestamp(dev, pipe, vblcount));
> +
> +	/* If there is at least 1 msec difference between the last stored
> +	 * timestamp and tvblank, then we are currently executing our
> +	 * disable inside a new vblank interval, the tvblank timestamp
> +	 * corresponds to this new vblank interval and the irq handler
> +	 * for this vblank didn't run yet and won't run due to our disable.
> +	 * Therefore we need to do the job of drm_handle_vblank() and
> +	 * increment the vblank counter by one to account for this vblank.
> +	 *
> +	 * Skip this step if there isn't any high precision timestamp
> +	 * available. In that case we can't account for this and just
> +	 * hope for the best.
> +	 */
> +	if (vblrc && (abs64(diff_ns) > 1000000)) {
> +		/* Store new timestamp in ringbuffer. */
> +		vblanktimestamp(dev, pipe, vblcount + 1) = tvblank;
> +
> +		/* Increment cooked vblank count. This also atomically commits
> +		 * the timestamp computed above.
> +		 */
> +		smp_mb__before_atomic();
> +		atomic_inc(&vblank->count);
> +		smp_mb__after_atomic();
> +	}
> +
> +	spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);
> +}
> +
> +static void vblank_disable_fn(unsigned long arg)
> +{
> +	struct drm_vblank_crtc *vblank = (void *)arg;
> +	struct drm_device *dev = vblank->dev;
> +	unsigned long irqflags;
> +	unsigned int pipe = vblank->pipe;
> +
> +	if (!dev->vblank_disable_allowed)
> +		return;
> +
> +	spin_lock_irqsave(&dev->vbl_lock, irqflags);
> +	if (atomic_read(&vblank->refcount) == 0 && vblank->enabled) {
> +		DRM_DEBUG("disabling vblank on crtc %u\n", pipe);
> +		vblank_disable_and_save(dev, pipe);
> +	}
> +	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
> +}
> +
> +/**
> + * drm_vblank_init - initialize vblank support
> + * @dev: DRM device
> + * @num_crtcs: number of CRTCs supported by @dev
> + *
> + * This function initializes vblank support for @num_crtcs display pipelines.
> + *
> + * Returns:
> + * Zero on success or a negative error code on failure.
> + */
> +int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs)
> +{
> +	int ret = -ENOMEM;
> +	unsigned int i;
> +
> +	spin_lock_init(&dev->vbl_lock);
> +	spin_lock_init(&dev->vblank_time_lock);
> +
> +	dev->num_crtcs = num_crtcs;
> +
> +	dev->vblank = kcalloc(num_crtcs, sizeof(*dev->vblank), GFP_KERNEL);
> +	if (!dev->vblank)
> +		goto err;
> +
> +	for (i = 0; i < num_crtcs; i++) {
> +		struct drm_vblank_crtc *vblank = &dev->vblank[i];
> +
> +		vblank->dev = dev;
> +		vblank->pipe = i;
> +		init_waitqueue_head(&vblank->queue);
> +		setup_timer(&vblank->disable_timer, vblank_disable_fn,
> +			    (unsigned long)vblank);
> +	}
> +
> +	DRM_INFO("Supports vblank timestamp caching Rev 2 (21.10.2013).\n");
> +
> +	/* Driver specific high-precision vblank timestamping supported? */
> +	if (dev->driver->get_vblank_timestamp)
> +		DRM_INFO("Driver supports precise vblank timestamp query.\n");
> +	else
> +		DRM_INFO("No driver support for vblank timestamp query.\n");
> +
> +	dev->vblank_disable_allowed = false;
> +
> +	return 0;
> +
> +err:
> +	dev->num_crtcs = 0;
> +	return ret;
> +}
> +EXPORT_SYMBOL(drm_vblank_init);
> +
> +/**
> + * drm_vblank_cleanup - cleanup vblank support
> + * @dev: DRM device
> + *
> + * This function cleans up any resources allocated in drm_vblank_init.
> + */
> +void drm_vblank_cleanup(struct drm_device *dev)
> +{
> +	unsigned int pipe;
> +	unsigned long irqflags;
> +
> +	/* Bail if the driver didn't call drm_vblank_init() */
> +	if (dev->num_crtcs == 0)
> +		return;
> +
> +	for (pipe = 0; pipe < dev->num_crtcs; pipe++) {
> +		struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> +
> +		del_timer_sync(&vblank->disable_timer);
> +
> +		spin_lock_irqsave(&dev->vbl_lock, irqflags);
> +		vblank_disable_and_save(dev, pipe);
> +		spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
> +	}
> +
> +	kfree(dev->vblank);
> +
> +	dev->num_crtcs = 0;
> +}
> +EXPORT_SYMBOL(drm_vblank_cleanup);
> +
> +/**
> + * drm_vblank_count - retrieve "cooked" vblank counter value
> + * @dev: DRM device
> + * @pipe: index of CRTC for which to retrieve the counter
> + *
> + * Fetches the "cooked" vblank count value that represents the number of
> + * vblank events since the system was booted, including lost events due to
> + * modesetting activity.
> + *
> + * This is the legacy version of drm_crtc_vblank_count().
> + *
> + * Returns:
> + * The software vblank counter.
> + */
> +u32 drm_vblank_count(struct drm_device *dev, int pipe)
> +{
> +	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> +
> +	if (WARN_ON(pipe >= dev->num_crtcs))
> +		return 0;
> +	return atomic_read(&vblank->count);
> +}
> +EXPORT_SYMBOL(drm_vblank_count);
> +
> +/**
> + * drm_vblank_enable - enable the vblank interrupt on a CRTC
> + * @dev: DRM device
> + * @pipe: CRTC index
> + *
> + * Returns:
> + * Zero on success or a negative error code on failure.
> + */
> +static int drm_vblank_enable(struct drm_device *dev, unsigned int pipe)
> +{
> +	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> +	int ret = 0;
> +
> +	assert_spin_locked(&dev->vbl_lock);
> +
> +	spin_lock(&dev->vblank_time_lock);
> +
> +	if (!vblank->enabled) {
> +		/*
> +		 * Enable vblank irqs under vblank_time_lock protection.
> +		 * All vblank count & timestamp updates are held off
> +		 * until we are done reinitializing master counter and
> +		 * timestamps. Filtercode in drm_handle_vblank() will
> +		 * prevent double-accounting of same vblank interval.
> +		 */
> +		ret = dev->driver->enable_vblank(dev, pipe);
> +		DRM_DEBUG("enabling vblank on crtc %u, ret: %d\n", pipe, ret);
> +		if (ret)
> +			atomic_dec(&vblank->refcount);
> +		else {
> +			vblank->enabled = true;
> +			drm_update_vblank_count(dev, pipe);
> +		}
> +	}
> +
> +	spin_unlock(&dev->vblank_time_lock);
> +
> +	return ret;
> +}
> +
> +/**
> + * drm_vblank_get - get a reference count on vblank events
> + * @dev: DRM device
> + * @crtc: which CRTC to own
> + *
> + * Acquire a reference count on vblank events to avoid having them disabled
> + * while in use.
> + *
> + * This is the legacy version of drm_crtc_vblank_get().
> + *
> + * Returns:
> + * Zero on success, nonzero on failure.
> + */
> +int drm_vblank_get(struct drm_device *dev, unsigned int pipe)
> +{
> +	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> +	unsigned long irqflags;
> +	int ret = 0;
> +
> +	if (WARN_ON(pipe >= dev->num_crtcs))
> +		return -EINVAL;
> +
> +	spin_lock_irqsave(&dev->vbl_lock, irqflags);
> +	/* Going from 0->1 means we have to enable interrupts again */
> +	if (atomic_add_return(1, &vblank->refcount) == 1) {
> +		ret = drm_vblank_enable(dev, pipe);
> +	} else {
> +		if (!vblank->enabled) {
> +			atomic_dec(&vblank->refcount);
> +			ret = -EINVAL;
> +		}
> +	}
> +	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
> +
> +	return ret;
> +}
> +EXPORT_SYMBOL(drm_vblank_get);
> +
> +/**
> + * drm_vblank_put - release ownership of vblank events
> + * @dev: DRM device
> + * @pipe: index of CRTC to release
> + *
> + * Release ownership of a given vblank counter, turning off interrupts
> + * if possible. Disable interrupts after drm_vblank_offdelay milliseconds.
> + *
> + * This is the legacy version of drm_crtc_vblank_put().
> + */
> +void drm_vblank_put(struct drm_device *dev, unsigned int pipe)
> +{
> +	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> +
> +	if (WARN_ON(pipe >= dev->num_crtcs))
> +		return;
> +
> +	if (WARN_ON(atomic_read(&vblank->refcount) == 0))
> +		return;
> +
> +	/* Last user schedules interrupt disable */
> +	if (atomic_dec_and_test(&vblank->refcount)) {
> +		if (drm_vblank_offdelay == 0)
> +			return;
> +		else if (dev->vblank_disable_immediate || drm_vblank_offdelay < 0)
> +			vblank_disable_fn((unsigned long)vblank);
> +		else
> +			mod_timer(&vblank->disable_timer,
> +				  jiffies + ((drm_vblank_offdelay * HZ)/1000));
> +	}
> +}
> +EXPORT_SYMBOL(drm_vblank_put);
> +
> +/**
> + * drm_wait_one_vblank - wait for one vblank
> + * @dev: DRM device
> + * @pipe: CRTC index
> + *
> + * This waits for one vblank to pass on @crtc, using the irq driver interfaces.
> + * It is a failure to call this when the vblank irq for @crtc is disabled, e.g.
> + * due to lack of driver support or because the crtc is off.
> + */
> +void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe)
> +{
> +	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> +	int ret;
> +	u32 last;
> +
> +	if (WARN_ON(pipe >= dev->num_crtcs))
> +		return;
> +
> +	ret = drm_vblank_get(dev, pipe);
> +	if (WARN(ret, "vblank not available on crtc %i, ret=%i\n", pipe, ret))
> +		return;
> +
> +	last = drm_vblank_count(dev, pipe);
> +
> +	ret = wait_event_timeout(vblank->queue,
> +				 last != drm_vblank_count(dev, pipe),
> +				 msecs_to_jiffies(100));
> +
> +	WARN(ret == 0, "vblank wait timed out on crtc %i\n", pipe);
> +
> +	drm_vblank_put(dev, pipe);
> +}
> +EXPORT_SYMBOL(drm_wait_one_vblank);
> +
> +static void send_vblank_event(struct drm_device *dev,
> +		struct drm_pending_vblank_event *e,
> +		unsigned long seq, struct timeval *now)
> +{
> +	WARN_ON_SMP(!spin_is_locked(&dev->event_lock));
> +	e->event.sequence = seq;
> +	e->event.tv_sec = now->tv_sec;
> +	e->event.tv_usec = now->tv_usec;
> +
> +	list_add_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_vblank_off - disable vblank events on a CRTC
> + * @dev: DRM device
> + * @pipe: CRTC index
> + *
> + * Drivers can use this function to shut down the vblank interrupt handling when
> + * disabling a crtc. This function ensures that the latest vblank frame count is
> + * stored so that drm_vblank_on() can restore it again.
> + *
> + * Drivers must use this function when the hardware vblank counter can get
> + * reset, e.g. when suspending.
> + *
> + * This is the legacy version of drm_crtc_vblank_off().
> + */
> +void drm_vblank_off(struct drm_device *dev, unsigned int pipe)
> +{
> +	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> +	struct drm_pending_vblank_event *e, *t;
> +	struct timeval now;
> +	unsigned long irqflags;
> +	unsigned int seq;
> +
> +	if (WARN_ON(pipe >= dev->num_crtcs))
> +		return;
> +
> +	spin_lock_irqsave(&dev->event_lock, irqflags);
> +
> +	spin_lock(&dev->vbl_lock);
> +	vblank_disable_and_save(dev, pipe);
> +	wake_up(&vblank->queue);
> +
> +	/*
> +	 * Prevent subsequent drm_vblank_get() from re-enabling
> +	 * the vblank interrupt by bumping the refcount.
> +	 */
> +	if (!vblank->inmodeset) {
> +		atomic_inc(&vblank->refcount);
> +		vblank->inmodeset = 1;
> +	}
> +	spin_unlock(&dev->vbl_lock);
> +
> +	/* Send any queued vblank events, lest the natives grow disquiet */
> +	seq = drm_vblank_count_and_time(dev, pipe, &now);
> +
> +	list_for_each_entry_safe(e, t, &dev->vblank_event_list, base.link) {
> +		if (e->pipe != pipe)
> +			continue;
> +		DRM_DEBUG("Sending premature vblank event on disable: \
> +			  wanted %d, current %d\n",
> +			  e->event.sequence, seq);
> +		list_del(&e->base.link);
> +		drm_vblank_put(dev, pipe);
> +		send_vblank_event(dev, e, seq, &now);
> +	}
> +	spin_unlock_irqrestore(&dev->event_lock, irqflags);
> +}
> +EXPORT_SYMBOL(drm_vblank_off);
> +
> +/**
> + * drm_vblank_on - enable vblank events on a CRTC
> + * @dev: DRM device
> + * @pipe: CRTC index
> + *
> + * This functions restores the vblank interrupt state captured with
> + * drm_vblank_off() again. Note that calls to drm_vblank_on() and
> + * drm_vblank_off() can be unbalanced and so can also be unconditionally called
> + * in driver load code to reflect the current hardware state of the crtc.
> + *
> + * This is the legacy version of drm_crtc_vblank_on().
> + */
> +void drm_vblank_on(struct drm_device *dev, unsigned int pipe)
> +{
> +	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> +	unsigned long irqflags;
> +
> +	if (WARN_ON(pipe >= dev->num_crtcs))
> +		return;
> +
> +	spin_lock_irqsave(&dev->vbl_lock, irqflags);
> +	/* Drop our private "prevent drm_vblank_get" refcount */
> +	if (vblank->inmodeset) {
> +		atomic_dec(&vblank->refcount);
> +		vblank->inmodeset = 0;
> +	}
> +
> +	/*
> +	 * sample the current counter to avoid random jumps
> +	 * when drm_vblank_enable() applies the diff
> +	 *
> +	 * -1 to make sure user will never see the same
> +	 * vblank counter value before and after a modeset
> +	 */
> +	vblank->last =
> +		(dev->driver->get_vblank_counter(dev, pipe) - 1) &
> +		dev->max_vblank_count;
> +	/*
> +	 * re-enable interrupts if there are users left, or the
> +	 * user wishes vblank interrupts to be enabled all the time.
> +	 */
> +	if (atomic_read(&vblank->refcount) != 0 ||
> +	    (!dev->vblank_disable_immediate && drm_vblank_offdelay == 0))
> +		WARN_ON(drm_vblank_enable(dev, pipe));
> +	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
> +}
> +EXPORT_SYMBOL(drm_vblank_on);
> +
> +/**
> + * drm_vblank_pre_modeset - account for vblanks across mode sets
> + * @dev: DRM device
> + * @pipe: CRTC index
> + *
> + * Account for vblank events across mode setting events, which will likely
> + * reset the hardware frame counter.
> + *
> + * This is done by grabbing a temporary vblank reference to ensure that the
> + * vblank interrupt keeps running across the modeset sequence. With this the
> + * software-side vblank frame counting will ensure that there are no jumps or
> + * discontinuities.
> + *
> + * Unfortunately this approach is racy and also doesn't work when the vblank
> + * interrupt stops running, e.g. across system suspend resume. It is therefore
> + * highly recommended that drivers use the newer drm_vblank_off() and
> + * drm_vblank_on() instead. drm_vblank_pre_modeset() only works correctly when
> + * using "cooked" software vblank frame counters and not relying on any hardware
> + * counters.
> + *
> + * Drivers must call drm_vblank_post_modeset() when re-enabling the same crtc
> + * again.
> + */
> +void drm_vblank_pre_modeset(struct drm_device *dev, unsigned int pipe)
> +{
> +	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> +
> +	/* vblank is not initialized (IRQ not installed ?), or has been freed */
> +	if (!dev->num_crtcs)
> +		return;
> +
> +	if (WARN_ON(pipe >= dev->num_crtcs))
> +		return;
> +
> +	/*
> +	 * To avoid all the problems that might happen if interrupts
> +	 * were enabled/disabled around or between these calls, we just
> +	 * have the kernel take a reference on the CRTC (just once though
> +	 * to avoid corrupting the count if multiple, mismatch calls occur),
> +	 * so that interrupts remain enabled in the interim.
> +	 */
> +	if (!vblank->inmodeset) {
> +		vblank->inmodeset = 0x1;
> +		if (drm_vblank_get(dev, pipe) == 0)
> +			vblank->inmodeset |= 0x2;
> +	}
> +}
> +EXPORT_SYMBOL(drm_vblank_pre_modeset);
> +
> +/**
> + * drm_vblank_post_modeset - undo drm_vblank_pre_modeset changes
> + * @dev: DRM device
> + * @pipe: CRTC index
> + *
> + * This function again drops the temporary vblank reference acquired in
> + * drm_vblank_pre_modeset.
> + */
> +void drm_vblank_post_modeset(struct drm_device *dev, unsigned int pipe)
> +{
> +	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> +	unsigned long irqflags;
> +
> +	/* vblank is not initialized (IRQ not installed ?), or has been freed */
> +	if (!dev->num_crtcs)
> +		return;
> +
> +	if (WARN_ON(pipe >= dev->num_crtcs))
> +		return;
> +
> +	if (vblank->inmodeset) {
> +		spin_lock_irqsave(&dev->vbl_lock, irqflags);
> +		dev->vblank_disable_allowed = true;
> +		spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
> +
> +		if (vblank->inmodeset & 0x2)
> +			drm_vblank_put(dev, pipe);
> +
> +		vblank->inmodeset = 0;
> +	}
> +}
> +EXPORT_SYMBOL(drm_vblank_post_modeset);
> +
> +static void drm_handle_vblank_events(struct drm_device *dev, unsigned int pipe)
> +{
> +	struct drm_pending_vblank_event *e, *t;
> +	struct timeval now;
> +	unsigned int seq;
> +
> +	assert_spin_locked(&dev->event_lock);
> +
> +	seq = drm_vblank_count_and_time(dev, pipe, &now);
> +
> +	list_for_each_entry_safe(e, t, &dev->vblank_event_list, base.link) {
> +		if (e->pipe != pipe)
> +			continue;
> +		if ((seq - e->event.sequence) > (1<<23))
> +			continue;
> +
> +		DRM_DEBUG("vblank event on %d, current %d\n",
> +			  e->event.sequence, seq);
> +
> +		list_del(&e->base.link);
> +		drm_vblank_put(dev, pipe);
> +		send_vblank_event(dev, e, seq, &now);
> +	}
> +
> +	trace_drm_vblank_event(pipe, seq);
> +}
> +
> +/**
> + * drm_handle_vblank - handle a vblank event
> + * @dev: DRM device
> + * @pipe: index of CRTC where this event occurred
> + *
> + * Drivers should call this routine in their vblank interrupt handlers to
> + * update the vblank counter and send any signals that may be pending.
> + *
> + * This is the legacy version of drm_crtc_handle_vblank().
> + */
> +bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe)
> +{
> +	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> +	u32 vblcount;
> +	s64 diff_ns;
> +	struct timeval tvblank;
> +	unsigned long irqflags;
> +
> +	if (!dev->num_crtcs)
> +		return false;
> +
> +	if (WARN_ON(pipe >= dev->num_crtcs))
> +		return false;
> +
> +	spin_lock_irqsave(&dev->event_lock, irqflags);
> +
> +	/* Need timestamp lock to prevent concurrent execution with
> +	 * vblank enable/disable, as this would cause inconsistent
> +	 * or corrupted timestamps and vblank counts.
> +	 */
> +	spin_lock(&dev->vblank_time_lock);
> +
> +	/* Vblank irq handling disabled. Nothing to do. */
> +	if (!vblank->enabled) {
> +		spin_unlock(&dev->vblank_time_lock);
> +		spin_unlock_irqrestore(&dev->event_lock, irqflags);
> +		return false;
> +	}
> +
> +	/* Fetch corresponding timestamp for this vblank interval from
> +	 * driver and store it in proper slot of timestamp ringbuffer.
> +	 */
> +
> +	/* Get current timestamp and count. */
> +	vblcount = atomic_read(&vblank->count);
> +	drm_get_last_vbltimestamp(dev, pipe, &tvblank, DRM_CALLED_FROM_VBLIRQ);
> +
> +	/* Compute time difference to timestamp of last vblank */
> +	diff_ns = timeval_to_ns(&tvblank) -
> +		  timeval_to_ns(&vblanktimestamp(dev, pipe, vblcount));
> +
> +	/* Update vblank timestamp and count if at least
> +	 * DRM_REDUNDANT_VBLIRQ_THRESH_NS nanoseconds
> +	 * difference between last stored timestamp and current
> +	 * timestamp. A smaller difference means basically
> +	 * identical timestamps. Happens if this vblank has
> +	 * been already processed and this is a redundant call,
> +	 * e.g., due to spurious vblank interrupts. We need to
> +	 * ignore those for accounting.
> +	 */
> +	if (abs64(diff_ns) > DRM_REDUNDANT_VBLIRQ_THRESH_NS) {
> +		/* Store new timestamp in ringbuffer. */
> +		vblanktimestamp(dev, pipe, vblcount + 1) = tvblank;
> +
> +		/* Increment cooked vblank count. This also atomically commits
> +		 * the timestamp computed above.
> +		 */
> +		smp_mb__before_atomic();
> +		atomic_inc(&vblank->count);
> +		smp_mb__after_atomic();
> +	} else {
> +		DRM_DEBUG("crtc %u: Redundant vblirq ignored. diff_ns = %d\n",
> +			  pipe, (int) diff_ns);
> +	}
> +
> +	spin_unlock(&dev->vblank_time_lock);
> +
> +	wake_up(&vblank->queue);
> +	drm_handle_vblank_events(dev, pipe);
> +
> +	spin_unlock_irqrestore(&dev->event_lock, irqflags);
> +
> +	return true;
> +}
> +EXPORT_SYMBOL(drm_handle_vblank);
> +
> +/**
> + * drm_send_vblank_event - helper to send vblank event after pageflip
> + * @dev: DRM device
> + * @pipe: CRTC index
> + * @e: the event to send
> + *
> + * Updates sequence # and timestamp on event, and sends it to userspace.
> + * Caller must hold event lock.
> + *
> + * This is the legacy version of drm_crtc_send_vblank_event().
> + */
> +void drm_send_vblank_event(struct drm_device *dev, unsigned int pipe,
> +			   struct drm_pending_vblank_event *e)
> +{
> +	struct timeval now;
> +	unsigned int seq;
> +
> +	if (dev->num_crtcs > 0) {
> +		seq = drm_vblank_count_and_time(dev, pipe, &now);
> +	} else {
> +		seq = 0;
> +
> +		now = get_drm_timestamp();
> +	}
> +	e->pipe = pipe;
> +	send_vblank_event(dev, e, seq, &now);
> +}
> +EXPORT_SYMBOL(drm_send_vblank_event);
> +
> +static void drm_irq_vgaarb_nokms(void *cookie, bool state)
> +{
> +	struct drm_device *dev = cookie;
> +
> +	if (dev->driver->vgaarb_irq) {
> +		dev->driver->vgaarb_irq(dev, state);
> +		return;
> +	}
> +
> +	if (!dev->irq_enabled)
> +		return;
> +
> +	if (state) {
> +		if (dev->driver->irq_uninstall)
> +			dev->driver->irq_uninstall(dev);
> +	} else {
> +		if (dev->driver->irq_preinstall)
> +			dev->driver->irq_preinstall(dev);
> +		if (dev->driver->irq_postinstall)
> +			dev->driver->irq_postinstall(dev);
> +	}
> +}
> +
> +/**
> + * drm_irq_install - install IRQ handler
> + * @dev: DRM device
> + * @irq: IRQ number to install the handler for
> + *
> + * Initializes the IRQ related data. Installs the handler, calling the driver
> + * irq_preinstall() and irq_postinstall() functions before and after the
> + * installation.
> + *
> + * This is the simplified helper interface provided for drivers with no special
> + * needs. Drivers which need to install interrupt handlers for multiple
> + * interrupts must instead set drm_device->irq_enabled to signal the DRM core
> + * that vblank interrupts are available.
> + *
> + * Returns:
> + * Zero on success or a negative error code on failure.
> + */
> +int drm_irq_install(struct drm_device *dev, int irq)
> +{
> +	int ret;
> +	unsigned long sh_flags = 0;
> +
> +	if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
> +		return -EINVAL;
> +
> +	if (irq == 0)
> +		return -EINVAL;
> +
> +	/* Driver must have been initialized */
> +	if (!dev->dev_private)
> +		return -EINVAL;
> +
> +	if (dev->irq_enabled)
> +		return -EBUSY;
> +	dev->irq_enabled = true;
> +
> +	DRM_DEBUG("irq=%d\n", irq);
> +
> +	/* Before installing handler */
> +	if (dev->driver->irq_preinstall)
> +		dev->driver->irq_preinstall(dev);
> +
> +	/* Install handler */
> +	if (drm_core_check_feature(dev, DRIVER_IRQ_SHARED))
> +		sh_flags = IRQF_SHARED;
> +
> +	ret = request_irq(irq, dev->driver->irq_handler,
> +			  sh_flags, dev->driver->name, dev);
> +
> +	if (ret < 0) {
> +		dev->irq_enabled = false;
> +		return ret;
> +	}
> +
> +	if (!drm_core_check_feature(dev, DRIVER_MODESET))
> +		vga_client_register(dev->pdev, (void *)dev, drm_irq_vgaarb_nokms, NULL);
> +
> +	/* After installing handler */
> +	if (dev->driver->irq_postinstall)
> +		ret = dev->driver->irq_postinstall(dev);
> +
> +	if (ret < 0) {
> +		dev->irq_enabled = false;
> +		if (!drm_core_check_feature(dev, DRIVER_MODESET))
> +			vga_client_register(dev->pdev, NULL, NULL, NULL);
> +		free_irq(irq, dev);
> +	} else {
> +		dev->irq = irq;
> +	}
> +
> +	return ret;
> +}
> +EXPORT_SYMBOL(drm_irq_install);
> +
> +/**
> + * drm_irq_uninstall - uninstall the IRQ handler
> + * @dev: DRM device
> + *
> + * Calls the driver's irq_uninstall() function and unregisters the IRQ handler.
> + * This should only be called by drivers which used drm_irq_install() to set up
> + * their interrupt handler. Other drivers must only reset
> + * drm_device->irq_enabled to false.
> + *
> + * Note that for kernel modesetting drivers it is a bug if this function fails.
> + * The sanity checks are only to catch buggy user modesetting drivers which call
> + * the same function through an ioctl.
> + *
> + * Returns:
> + * Zero on success or a negative error code on failure.
> + */
> +int drm_irq_uninstall(struct drm_device *dev)
> +{
> +	unsigned long irqflags;
> +	bool irq_enabled;
> +	int i;
> +
> +	if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
> +		return -EINVAL;
> +
> +	irq_enabled = dev->irq_enabled;
> +	dev->irq_enabled = false;
> +
> +	/*
> +	 * Wake up any waiters so they don't hang.
> +	 */
> +	if (dev->num_crtcs) {
> +		spin_lock_irqsave(&dev->vbl_lock, irqflags);
> +		for (i = 0; i < dev->num_crtcs; i++) {
> +			struct drm_vblank_crtc *vblank = &dev->vblank[i];
> +
> +			wake_up(&vblank->queue);
> +			vblank->enabled = false;
> +			vblank->last =
> +				dev->driver->get_vblank_counter(dev, i);
> +		}
> +		spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
> +	}
> +
> +	if (!irq_enabled)
> +		return -EINVAL;
> +
> +	DRM_DEBUG("irq=%d\n", dev->irq);
> +
> +	if (!drm_core_check_feature(dev, DRIVER_MODESET))
> +		vga_client_register(dev->pdev, NULL, NULL, NULL);
> +
> +	if (dev->driver->irq_uninstall)
> +		dev->driver->irq_uninstall(dev);
> +
> +	free_irq(dev->irq, dev);
> +
> +	return 0;
> +}
> +EXPORT_SYMBOL(drm_irq_uninstall);
> +
> +/*
> + * IRQ control ioctl.
> + *
> + * \param inode device inode.
> + * \param file_priv DRM file private.
> + * \param cmd command.
> + * \param arg user argument, pointing to a drm_control structure.
> + * \return zero on success or a negative number on failure.
> + *
> + * Calls irq_install() or irq_uninstall() according to \p arg.
> + */
> +int drm_control(struct drm_device *dev, void *data,
> +		struct drm_file *file_priv)
> +{
> +	struct drm_control *ctl = data;
> +	int ret = 0, irq;
> +
> +	/* if we haven't irq we fallback for compatibility reasons -
> +	 * this used to be a separate function in drm_dma.h
> +	 */
> +
> +	if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
> +		return 0;
> +	if (drm_core_check_feature(dev, DRIVER_MODESET))
> +		return 0;
> +	/* UMS was only ever support on pci devices. */
> +	if (WARN_ON(!dev->pdev))
> +		return -EINVAL;
> +
> +	switch (ctl->func) {
> +	case DRM_INST_HANDLER:
> +		irq = dev->pdev->irq;
> +
> +		if (dev->if_version < DRM_IF_VERSION(1, 2) &&
> +		    ctl->irq != irq)
> +			return -EINVAL;
> +		mutex_lock(&dev->struct_mutex);
> +		ret = drm_irq_install(dev, irq);
> +		mutex_unlock(&dev->struct_mutex);
> +
> +		return ret;
> +	case DRM_UNINST_HANDLER:
> +		mutex_lock(&dev->struct_mutex);
> +		ret = drm_irq_uninstall(dev);
> +		mutex_unlock(&dev->struct_mutex);
> +
> +		return ret;
> +	default:
> +		return -EINVAL;
> +	}
> +}
> +
> +/*
> + * drm_modeset_ctl - handle vblank event counter changes across mode switch
> + * @DRM_IOCTL_ARGS: standard ioctl arguments
> + *
> + * Applications should call the %_DRM_PRE_MODESET and %_DRM_POST_MODESET
> + * ioctls around modesetting so that any lost vblank events are accounted for.
> + *
> + * Generally the counter will reset across mode sets.  If interrupts are
> + * enabled around this call, we don't have to do anything since the counter
> + * will have already been incremented.
> + */
> +int drm_modeset_ctl(struct drm_device *dev, void *data,
> +		    struct drm_file *file_priv)
> +{
> +	struct drm_modeset_ctl *modeset = data;
> +	unsigned int pipe;
> +
> +	/* If drm_vblank_init() hasn't been called yet, just no-op */
> +	if (!dev->num_crtcs)
> +		return 0;
> +
> +	/* KMS drivers handle this internally */
> +	if (drm_core_check_feature(dev, DRIVER_MODESET))
> +		return 0;
> +
> +	pipe = modeset->crtc;
> +	if (pipe >= dev->num_crtcs)
> +		return -EINVAL;
> +
> +	switch (modeset->cmd) {
> +	case _DRM_PRE_MODESET:
> +		drm_vblank_pre_modeset(dev, pipe);
> +		break;
> +	case _DRM_POST_MODESET:
> +		drm_vblank_post_modeset(dev, pipe);
> +		break;
> +	default:
> +		return -EINVAL;
> +	}
> +
> +	return 0;
> +}
> -- 
> 2.1.3
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

Re: [PATCH 12/13] drm/irq: Expel legacy API

[Daniel Vetter]

On Tue, Dec 16, 2014 at 06:59:28PM +0100, Daniel Vetter wrote:
> On Tue, Dec 16, 2014 at 05:53:34PM +0100, Thierry Reding wrote:
> > From: Thierry Reding <treding@nvidia.com>
> > 
> > These legacy functions all operate on the struct drm_device * and an
> > index to the CRTC that they should access. This is bad because it
> > requires keeping track of a global data structures to resolve the index
> > to CRTC object lookup. In order to get rid of this global data new APIs
> > have been introduced that operate directly on these objects. Currently
> > the new functions still operate on the old data, but the goal is to
> > eventually move that data into struct drm_crtc. In order to start
> > conversion of drivers to the new API, move the old API away.
> > 
> > Signed-off-by: Thierry Reding <treding@nvidia.com>
> 
> Imo we should try to share code between the legacy vblank code and what
> we're now building up with the drm_crtc_ prefixed functions for native kms
> drivers. Instead I think we should do full copies with the following
> recipe:
> - Look at a given function and make sure all kms drivers (and any
>   callchains used by kms drivers) uses the drm_crtc_ variant and that any
>   ums drivers uses the drm_vblank_ version. So big audit.
> - Then for each such function copy it to drm_irq_legacy.c and mark the old
>   copy in drm_irq.c as static and drop the EXPORT_SYMBOL for it.
> - Then inline the logic for native kms drivers.
> 
> Just moving the functions around doesn't really help us at all since we
> still have the problem that both ums and kms code uses them. Which means
> we can't use drm_crtc and store vblank data in there.

There's the added problem that moving breaks git blame (at least in
default mode) a bit, so better to keep the version that we want to
transform into the kms-native ones where they currently are.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 11/13] drm/irq: Document return values more consistently

[Daniel Vetter]

On Tue, Dec 16, 2014 at 05:53:33PM +0100, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
> 
> Some of the functions are documented inconsistently. Add Returns:
> sections where missing and use consistent style to describe the return
> value.
> 
> Signed-off-by: Thierry Reding <treding@nvidia.com>

With the comment in patch 9 addressed patches 1-11 are

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> ---
>  drivers/gpu/drm/drm_irq.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> index b34900a8e172..ef5d993f06ee 100644
> --- a/drivers/gpu/drm/drm_irq.c
> +++ b/drivers/gpu/drm/drm_irq.c
> @@ -991,6 +991,9 @@ EXPORT_SYMBOL(drm_crtc_send_vblank_event);
>   * drm_vblank_enable - enable the vblank interrupt on a CRTC
>   * @dev: DRM device
>   * @pipe: CRTC index
> + *
> + * Returns:
> + * Zero on success or a negative error code on failure.
>   */
>  static int drm_vblank_enable(struct drm_device *dev, unsigned int pipe)
>  {
> @@ -1035,7 +1038,7 @@ static int drm_vblank_enable(struct drm_device *dev, unsigned int pipe)
>   * This is the legacy version of drm_crtc_vblank_get().
>   *
>   * Returns:
> - * Zero on success, nonzero on failure.
> + * Zero on success or a negative error code on failure.
>   */
>  int drm_vblank_get(struct drm_device *dev, unsigned int pipe)
>  {
> @@ -1072,7 +1075,7 @@ EXPORT_SYMBOL(drm_vblank_get);
>   * This is the native kms version of drm_vblank_off().
>   *
>   * Returns:
> - * Zero on success, nonzero on failure.
> + * Zero on success or a negative error code on failure.
>   */
>  int drm_crtc_vblank_get(struct drm_crtc *crtc)
>  {
> -- 
> 2.1.3
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

Re: [PATCH 08/13] drm/irq: Check for valid VBLANK before dereference

[Michel Dänzer]

On 17.12.2014 01:53, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
> 
> When accessing the array of per-CRTC VBLANK structures we must always
> check that the index into the array is valid before dereferencing to
> avoid crashing.
> 
> Signed-off-by: Thierry Reding <treding@nvidia.com>
> ---
>  drivers/gpu/drm/drm_irq.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> index a24658162284..cb207e047505 100644
> --- a/drivers/gpu/drm/drm_irq.c
> +++ b/drivers/gpu/drm/drm_irq.c
> @@ -1070,10 +1070,10 @@ void drm_vblank_put(struct drm_device *dev, int crtc)
>  {
>  	struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
>  
> -	if (WARN_ON(atomic_read(&vblank->refcount) == 0))
> +	if (WARN_ON(crtc >= dev->num_crtcs))
>  		return;
>  
> -	if (WARN_ON(crtc >= dev->num_crtcs))
> +	if (WARN_ON(atomic_read(&vblank->refcount) == 0))
>  		return;
>  
>  	/* Last user schedules interrupt disable */
> @@ -1356,6 +1356,9 @@ void drm_vblank_post_modeset(struct drm_device *dev, int crtc)
>  	if (!dev->num_crtcs)
>  		return;
>  
> +	if (WARN_ON(crtc >= dev->num_crtcs))
> +		return;
> +
>  	if (vblank->inmodeset) {
>  		spin_lock_irqsave(&dev->vbl_lock, irqflags);
>  		dev->vblank_disable_allowed = true;
> 

It would probably be better to use WARN_ON_ONCE, otherwise any bugs
triggering these might flood dmesg.


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 08/13] drm/irq: Check for valid VBLANK before dereference

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

When accessing the array of per-CRTC VBLANK structures we must always
check that the index into the array is valid before dereferencing to
avoid crashing.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/gpu/drm/drm_irq.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 5c666c780fe9..a957b9618e85 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -1110,10 +1110,10 @@ void drm_vblank_put(struct drm_device *dev, int crtc)
 {
 	struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
 
-	if (WARN_ON(atomic_read(&vblank->refcount) == 0))
+	if (WARN_ON(crtc >= dev->num_crtcs))
 		return;
 
-	if (WARN_ON(crtc >= dev->num_crtcs))
+	if (WARN_ON(atomic_read(&vblank->refcount) == 0))
 		return;
 
 	/* Last user schedules interrupt disable */
@@ -1158,6 +1158,9 @@ void drm_wait_one_vblank(struct drm_device *dev, int crtc)
 	int ret;
 	u32 last;
 
+	if (WARN_ON(crtc >= dev->num_crtcs))
+		return;
+
 	ret = drm_vblank_get(dev, crtc);
 	if (WARN(ret, "vblank not available on crtc %i, ret=%i\n", crtc, ret))
 		return;
@@ -1428,6 +1431,9 @@ void drm_vblank_post_modeset(struct drm_device *dev, int crtc)
 	if (!dev->num_crtcs)
 		return;
 
+	if (WARN_ON(crtc >= dev->num_crtcs))
+		return;
+
 	if (vblank->inmodeset) {
 		spin_lock_irqsave(&dev->vbl_lock, irqflags);
 		dev->vblank_disable_allowed = true;
-- 
2.4.5

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

Re: [PATCH 08/13] drm/irq: Check for valid VBLANK before dereference

[Daniel Vetter]

On Wed, Aug 12, 2015 at 05:00:30PM +0200, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
> 
> When accessing the array of per-CRTC VBLANK structures we must always
> check that the index into the array is valid before dereferencing to
> avoid crashing.
> 
> Signed-off-by: Thierry Reding <treding@nvidia.com>

This misses vblank_reset (I guess that function is newer than your
patches). Can you please do a follow-up? I merged this one meanwhile.

I also squashed in a whitespace fixup in vblank_count I spotted while
reviewing this one here.
-Daniel

> ---
>  drivers/gpu/drm/drm_irq.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> index 5c666c780fe9..a957b9618e85 100644
> --- a/drivers/gpu/drm/drm_irq.c
> +++ b/drivers/gpu/drm/drm_irq.c
> @@ -1110,10 +1110,10 @@ void drm_vblank_put(struct drm_device *dev, int crtc)
>  {
>  	struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
>  
> -	if (WARN_ON(atomic_read(&vblank->refcount) == 0))
> +	if (WARN_ON(crtc >= dev->num_crtcs))
>  		return;
>  
> -	if (WARN_ON(crtc >= dev->num_crtcs))
> +	if (WARN_ON(atomic_read(&vblank->refcount) == 0))
>  		return;
>  
>  	/* Last user schedules interrupt disable */
> @@ -1158,6 +1158,9 @@ void drm_wait_one_vblank(struct drm_device *dev, int crtc)
>  	int ret;
>  	u32 last;
>  
> +	if (WARN_ON(crtc >= dev->num_crtcs))
> +		return;
> +
>  	ret = drm_vblank_get(dev, crtc);
>  	if (WARN(ret, "vblank not available on crtc %i, ret=%i\n", crtc, ret))
>  		return;
> @@ -1428,6 +1431,9 @@ void drm_vblank_post_modeset(struct drm_device *dev, int crtc)
>  	if (!dev->num_crtcs)
>  		return;
>  
> +	if (WARN_ON(crtc >= dev->num_crtcs))
> +		return;
> +
>  	if (vblank->inmodeset) {
>  		spin_lock_irqsave(&dev->vbl_lock, irqflags);
>  		dev->vblank_disable_allowed = true;
> -- 
> 2.4.5
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 08/13] drm/irq: Check for valid VBLANK before dereference

[Thierry Reding]

[-- Attachment #1.1: Type: text/plain, Size: 2296 bytes --]

On Wed, Aug 12, 2015 at 05:40:11PM +0200, Daniel Vetter wrote:
> On Wed, Aug 12, 2015 at 05:00:30PM +0200, Thierry Reding wrote:
> > From: Thierry Reding <treding@nvidia.com>
> > 
> > When accessing the array of per-CRTC VBLANK structures we must always
> > check that the index into the array is valid before dereferencing to
> > avoid crashing.
> > 
> > Signed-off-by: Thierry Reding <treding@nvidia.com>
> 
> This misses vblank_reset (I guess that function is newer than your
> patches). Can you please do a follow-up? I merged this one meanwhile.

We only have drm_crtc_vblank_reset(), in which case there's no need to
check the index because it's obtained directly from a struct drm_crtc *
and hence will be valid.

Thierry

> > ---
> >  drivers/gpu/drm/drm_irq.c | 10 ++++++++--
> >  1 file changed, 8 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> > index 5c666c780fe9..a957b9618e85 100644
> > --- a/drivers/gpu/drm/drm_irq.c
> > +++ b/drivers/gpu/drm/drm_irq.c
> > @@ -1110,10 +1110,10 @@ void drm_vblank_put(struct drm_device *dev, int crtc)
> >  {
> >  	struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
> >  
> > -	if (WARN_ON(atomic_read(&vblank->refcount) == 0))
> > +	if (WARN_ON(crtc >= dev->num_crtcs))
> >  		return;
> >  
> > -	if (WARN_ON(crtc >= dev->num_crtcs))
> > +	if (WARN_ON(atomic_read(&vblank->refcount) == 0))
> >  		return;
> >  
> >  	/* Last user schedules interrupt disable */
> > @@ -1158,6 +1158,9 @@ void drm_wait_one_vblank(struct drm_device *dev, int crtc)
> >  	int ret;
> >  	u32 last;
> >  
> > +	if (WARN_ON(crtc >= dev->num_crtcs))
> > +		return;
> > +
> >  	ret = drm_vblank_get(dev, crtc);
> >  	if (WARN(ret, "vblank not available on crtc %i, ret=%i\n", crtc, ret))
> >  		return;
> > @@ -1428,6 +1431,9 @@ void drm_vblank_post_modeset(struct drm_device *dev, int crtc)
> >  	if (!dev->num_crtcs)
> >  		return;
> >  
> > +	if (WARN_ON(crtc >= dev->num_crtcs))
> > +		return;
> > +
> >  	if (vblank->inmodeset) {
> >  		spin_lock_irqsave(&dev->vbl_lock, irqflags);
> >  		dev->vblank_disable_allowed = true;
> > -- 
> > 2.4.5
> > 
> 
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

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

Re: [PATCH 08/13] drm/irq: Check for valid VBLANK before dereference

[Daniel Vetter]

On Thu, Aug 13, 2015 at 11:20:05AM +0200, Thierry Reding wrote:
> On Wed, Aug 12, 2015 at 05:40:11PM +0200, Daniel Vetter wrote:
> > On Wed, Aug 12, 2015 at 05:00:30PM +0200, Thierry Reding wrote:
> > > From: Thierry Reding <treding@nvidia.com>
> > > 
> > > When accessing the array of per-CRTC VBLANK structures we must always
> > > check that the index into the array is valid before dereferencing to
> > > avoid crashing.
> > > 
> > > Signed-off-by: Thierry Reding <treding@nvidia.com>
> > 
> > This misses vblank_reset (I guess that function is newer than your
> > patches). Can you please do a follow-up? I merged this one meanwhile.
> 
> We only have drm_crtc_vblank_reset(), in which case there's no need to
> check the index because it's obtained directly from a struct drm_crtc *
> and hence will be valid.

Right, I overlooked that.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel