Attachment 4115 Details for Bug 3031 – drm patch to add vbl to i915

[patch] drm patch to add vbl to i915

i915_drm_vbl.diff (text/plain), 5.22 KB, created by Dave Airlie on 2005-12-17 11:13:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Airlie

Created: 2005-12-17 11:13:32 UTC

Size: 5.22 KB

patch

obsolete

>Index: linux-core/i915_drv.c
>===================================================================
>RCS file: /cvs/dri/drm/linux-core/i915_drv.c,v
>retrieving revision 1.23
>diff -u -u -r1.23 i915_drv.c
>--- linux-core/i915_drv.c	11 Nov 2005 12:23:18 -0000	1.23
>+++ linux-core/i915_drv.c	17 Dec 2005 00:13:27 -0000
>@@ -45,11 +45,12 @@
> 	 */
> 	.driver_features =
> 	    DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR | */
>-	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED,
>+	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL,
> 	.load = i915_driver_load,
> 	.lastclose = i915_driver_lastclose,
> 	.preclose = i915_driver_preclose,
> 	.device_is_agp = i915_driver_device_is_agp,
>+	.vblank_wait = i915_driver_vblank_wait,
> 	.irq_preinstall = i915_driver_irq_preinstall,
> 	.irq_postinstall = i915_driver_irq_postinstall,
> 	.irq_uninstall = i915_driver_irq_uninstall,
>Index: shared-core/i915_dma.c
>===================================================================
>RCS file: /cvs/dri/drm/shared-core/i915_dma.c,v
>retrieving revision 1.26
>diff -u -u -r1.26 i915_dma.c
>--- shared-core/i915_dma.c	28 Nov 2005 23:10:41 -0000	1.26
>+++ shared-core/i915_dma.c	17 Dec 2005 00:13:27 -0000
>@@ -664,6 +664,9 @@
> 	case I915_PARAM_ALLOW_BATCHBUFFER:
> 		value = dev_priv->allow_batchbuffer ? 1 : 0;
> 		break;
>+	case I915_PARAM_LAST_DISPATCH:
>+		value = READ_BREADCRUMB(dev_priv);
>+		break;
> 	default:
> 		DRM_ERROR("Unkown parameter %d\n", param.param);
> 		return DRM_ERR(EINVAL);
>Index: shared-core/i915_drm.h
>===================================================================
>RCS file: /cvs/dri/drm/shared-core/i915_drm.h,v
>retrieving revision 1.6
>diff -u -u -r1.6 i915_drm.h
>--- shared-core/i915_drm.h	28 Nov 2005 23:10:41 -0000	1.6
>+++ shared-core/i915_drm.h	17 Dec 2005 00:13:27 -0000
>@@ -151,6 +151,7 @@
>  */
> #define I915_PARAM_IRQ_ACTIVE            1
> #define I915_PARAM_ALLOW_BATCHBUFFER     2
>+#define I915_PARAM_LAST_DISPATCH         3
> 
> typedef struct drm_i915_getparam {
> 	int param;
>Index: shared-core/i915_drv.h
>===================================================================
>RCS file: /cvs/dri/drm/shared-core/i915_drv.h,v
>retrieving revision 1.19
>diff -u -u -r1.19 i915_drv.h
>--- shared-core/i915_drv.h	28 Nov 2005 23:10:41 -0000	1.19
>+++ shared-core/i915_drv.h	17 Dec 2005 00:13:27 -0000
>@@ -37,15 +37,16 @@
> 
> #define DRIVER_NAME		"i915"
> #define DRIVER_DESC		"Intel Graphics"
>-#define DRIVER_DATE		"20041217"
>+#define DRIVER_DATE		"20051209"
> 
> /* Interface history:
>  *
>  * 1.1: Original.
>  * 1.2: Add Power Management
>+ * 1.3: Add vblank support
>  */
> #define DRIVER_MAJOR		1
>-#define DRIVER_MINOR		2
>+#define DRIVER_MINOR		3
> #define DRIVER_PATCHLEVEL	0
> 
> typedef struct _drm_i915_ring_buffer {
>@@ -112,6 +113,7 @@
> extern int i915_irq_emit(DRM_IOCTL_ARGS);
> extern int i915_irq_wait(DRM_IOCTL_ARGS);
> 
>+extern int i915_driver_vblank_wait(drm_device_t *dev, unsigned int *sequence);
> extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS);
> extern void i915_driver_irq_preinstall(drm_device_t * dev);
> extern void i915_driver_irq_postinstall(drm_device_t * dev);
>@@ -262,4 +264,6 @@
> 
> #define CMD_OP_DESTBUFFER_INFO	 ((0x3<<29)|(0x1d<<24)|(0x8e<<16)|1)
> 
>+#define READ_BREADCRUMB(dev_priv)  (((u32*)(dev_priv->hw_status_page))[5])
>+
> #endif
>Index: shared-core/i915_irq.c
>===================================================================
>RCS file: /cvs/dri/drm/shared-core/i915_irq.c,v
>retrieving revision 1.12
>diff -u -u -r1.12 i915_irq.c
>--- shared-core/i915_irq.c	28 Nov 2005 23:10:41 -0000	1.12
>+++ shared-core/i915_irq.c	17 Dec 2005 00:13:27 -0000
>@@ -31,9 +31,11 @@
> #include "i915_drm.h"
> #include "i915_drv.h"
> 
>-#define USER_INT_FLAG 0x2
>+#define USER_INT_FLAG (1<<1)
>+#define VSYNC_PIPEB_FLAG (1<<5)
>+#define VSYNC_PIPEA_FLAG (1<<7)
>+
> #define MAX_NOPID ((u32)~0)
>-#define READ_BREADCRUMB(dev_priv)  (((u32*)(dev_priv->hw_status_page))[5])
> 
> irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
> {
>@@ -42,7 +44,8 @@
> 	u16 temp;
> 
> 	temp = I915_READ16(I915REG_INT_IDENTITY_R);
>-	temp &= USER_INT_FLAG;
>+
>+	temp &= (USER_INT_FLAG | VSYNC_PIPEA_FLAG);
> 
> 	DRM_DEBUG("%s flag=%08x\n", __FUNCTION__, temp);
> 
>@@ -50,7 +53,15 @@
> 		return IRQ_NONE;
> 
> 	I915_WRITE16(I915REG_INT_IDENTITY_R, temp);
>-	DRM_WAKEUP(&dev_priv->irq_queue);
>+
>+	if (temp & USER_INT_FLAG)
>+		DRM_WAKEUP(&dev_priv->irq_queue);
>+
>+	if (temp & VSYNC_PIPEA_FLAG) {
>+		atomic_inc(&dev->vbl_received);
>+		DRM_WAKEUP(&dev->vbl_queue);
>+		drm_vbl_send_signals(dev);
>+	}
> 
> 	return IRQ_HANDLED;
> }
>@@ -101,6 +112,26 @@
> 	return ret;
> }
> 
>+int i915_driver_vblank_wait(drm_device_t *dev, unsigned int *sequence)
>+{
>+	drm_i915_private_t *dev_priv = dev->dev_private;
>+	unsigned int cur_vblank;
>+	int ret = 0;
>+
>+	if (!dev_priv) {
>+		DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
>+		return DRM_ERR(EINVAL);
>+	}
>+
>+	DRM_WAIT_ON(ret, dev->vbl_queue, 3 * DRM_HZ,
>+		    (((cur_vblank = atomic_read(&dev->vbl_received))
>+			- *sequence) <= (1<<23)));
>+	
>+	*sequence = cur_vblank;
>+
>+	return ret;
>+}
>+
> /* Needs the lock as it touches the ring.
>  */
> int i915_irq_emit(DRM_IOCTL_ARGS)
>@@ -164,7 +195,7 @@
> {
> 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
> 
>-	I915_WRITE16(I915REG_INT_ENABLE_R, USER_INT_FLAG);
>+	I915_WRITE16(I915REG_INT_ENABLE_R, USER_INT_FLAG | VSYNC_PIPEA_FLAG);
> 	DRM_INIT_WAITQUEUE(&dev_priv->irq_queue);
> }
>

Actions: View | Splinter Review

Attachments on bug 3031: 4115 | 4116

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.