3 files changed, 14 insertions, 3 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h
index bed55173..d10b713b 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -808,6 +808,7 @@ typedef union drm_mm_init_arg{
 		drm_u64_t vr_p_size;
 		drm_u64_t tt_p_offset;
 		drm_u64_t tt_p_size;
+	        drm_u64_t max_locked_pages;
 	} req;
 	struct {
 		drm_handle_t mm_sarea;
diff --git a/shared-core/i915_drm.h b/shared-core/i915_drm.h
index fcffb25c..1a79d403 100644
--- a/shared-core/i915_drm.h
+++ b/shared-core/i915_drm.h
@@ -106,6 +106,14 @@ typedef struct _drm_i915_sarea {
 	unsigned int rotated2_tiled;
 } drm_i915_sarea_t;
 
+/* Driver specific fence types and classes.
+ */
+
+/* The only fence class we support */
+#define DRM_I915_FENCE_CLASS_ACCEL 0
+/* Fence type that guarantees read-write flush */
+#define DRM_I915_FENCE_TYPE_RW 2
+
 /* Flags for perf_boxes
  */
 #define I915_BOX_RING_EMPTY    0x1
diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c
index 4a1b2987..8f3e79de 100644
--- a/shared-core/i915_irq.c
+++ b/shared-core/i915_irq.c
@@ -47,8 +47,9 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 
 	temp &= (USER_INT_FLAG | VSYNC_PIPEA_FLAG | VSYNC_PIPEB_FLAG);
 
+#if 0
 	DRM_DEBUG("%s flag=%08x\n", __FUNCTION__, temp);
-
+#endif
 	if (temp == 0)
 		return IRQ_NONE;
 
@@ -104,7 +105,7 @@ int i915_emit_irq(drm_device_t * dev)
 
 void i915_user_irq_on(drm_i915_private_t *dev_priv)
 {
-
+  return;
 	spin_lock(&dev_priv->user_irq_lock);
 	if (dev_priv->irq_enabled && (++dev_priv->user_irq_refcount == 1)){
 		dev_priv->irq_enable_reg |= USER_INT_FLAG;
@@ -116,6 +117,7 @@ void i915_user_irq_on(drm_i915_private_t *dev_priv)
 		
 void i915_user_irq_off(drm_i915_private_t *dev_priv)
 {
+  return;
 	spin_lock(&dev_priv->user_irq_lock);
 	if (dev_priv->irq_enabled && (--dev_priv->user_irq_refcount == 0)) {
 		dev_priv->irq_enable_reg &= ~USER_INT_FLAG;
@@ -239,7 +241,7 @@ static int i915_enable_interrupt (drm_device_t *dev)
 	dev_priv->user_irq_lock = SPIN_LOCK_UNLOCKED;
 	dev_priv->user_irq_refcount = 0;
 	dev_priv->irq_enable_reg = flag;
-	I915_WRITE16(I915REG_INT_ENABLE_R, flag);
+	I915_WRITE16(I915REG_INT_ENABLE_R, flag | USER_INT_FLAG);
 	dev_priv->irq_enabled = 1;
 	return 0;
 }