1 files changed, 71 insertions, 65 deletions

diff --git a/linux-core/i915_gem.c b/linux-core/i915_gem.c
index 8fd2b8a6..63f4b91d 100644
--- a/linux-core/i915_gem.c
+++ b/linux-core/i915_gem.c
@@ -58,30 +58,37 @@ i915_gem_set_domain(struct drm_gem_object *obj,
 static void
 i915_gem_clflush_object(struct drm_gem_object *obj);
 
-int
-i915_gem_init_ioctl(struct drm_device *dev, void *data,
-		    struct drm_file *file_priv)
+int i915_gem_do_init(struct drm_device *dev, unsigned long start,
+		     unsigned long end)
 {
-	drm_i915_private_t *dev_priv = dev->dev_private;
-	struct drm_i915_gem_init *args = data;
-
-	mutex_lock(&dev->struct_mutex);
+	struct drm_i915_private *dev_priv = dev->dev_private;
 
-	if (args->gtt_start >= args->gtt_end ||
-	    (args->gtt_start & (PAGE_SIZE - 1)) != 0 ||
-	    (args->gtt_end & (PAGE_SIZE - 1)) != 0) {
-		mutex_unlock(&dev->struct_mutex);
+	if (start >= end ||
+	    (start & (PAGE_SIZE - 1)) != 0 ||
+	    (end & (PAGE_SIZE - 1)) != 0) {
 		return -EINVAL;
 	}
 
-	drm_memrange_init(&dev_priv->mm.gtt_space, args->gtt_start,
-	    args->gtt_end - args->gtt_start);
+	drm_memrange_init(&dev_priv->mm.gtt_space, start,
+			  end - start);
+
+	dev->gtt_total = (uint32_t) (end - start);
 
-	dev->gtt_total = (uint32_t) (args->gtt_end - args->gtt_start);
+	return 0;
+}
 
+int
+i915_gem_init_ioctl(struct drm_device *dev, void *data,
+		    struct drm_file *file_priv)
+{
+	struct drm_i915_gem_init *args = data;
+	int ret;
+
+	mutex_lock(&dev->struct_mutex);
+	ret = i915_gem_do_init(dev, args->gtt_start, args->gtt_end);
 	mutex_unlock(&dev->struct_mutex);
 
-	return 0;
+	return ret;
 }
 
 
@@ -428,7 +435,7 @@ static void
 i915_gem_object_move_to_active(struct drm_gem_object *obj)
 {
 	struct drm_device *dev = obj->dev;
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_i915_gem_object *obj_priv = obj->driver_private;
 
 	/* Add a reference if we're newly entering the active list. */
@@ -465,7 +472,7 @@ static void
 i915_gem_object_move_to_inactive(struct drm_gem_object *obj)
 {
 	struct drm_device *dev = obj->dev;
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_i915_gem_object *obj_priv = obj->driver_private;
 
 	i915_verify_inactive(dev, __FILE__, __LINE__);
@@ -492,7 +499,7 @@ i915_gem_object_move_to_inactive(struct drm_gem_object *obj)
 static uint32_t
 i915_add_request(struct drm_device *dev, uint32_t flush_domains)
 {
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_i915_gem_request *request;
 	uint32_t seqno;
 	int was_empty;
@@ -511,8 +518,8 @@ i915_add_request(struct drm_device *dev, uint32_t flush_domains)
 		dev_priv->mm.next_gem_seqno++;
 
 	BEGIN_LP_RING(4);
-	OUT_RING(CMD_STORE_DWORD_IDX);
-	OUT_RING(I915_GEM_HWS_INDEX << STORE_DWORD_INDEX_SHIFT);
+	OUT_RING(MI_STORE_DWORD_INDEX);
+	OUT_RING(I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT);
 	OUT_RING(seqno);
 
 	OUT_RING(GFX_OP_USER_INTERRUPT);
@@ -541,8 +548,8 @@ i915_add_request(struct drm_device *dev, uint32_t flush_domains)
 uint32_t
 i915_retire_commands(struct drm_device *dev)
 {
-	drm_i915_private_t *dev_priv = dev->dev_private;
-	uint32_t cmd = CMD_MI_FLUSH | MI_NO_WRITE_FLUSH;
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	uint32_t cmd = MI_FLUSH | MI_NO_WRITE_FLUSH;
 	uint32_t flush_domains = 0;
 	RING_LOCALS;
 
@@ -564,7 +571,7 @@ static void
 i915_gem_retire_request(struct drm_device *dev,
 			struct drm_i915_gem_request *request)
 {
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 
 	if (request->flush_domains != 0) {
 		struct drm_i915_gem_object *obj_priv, *next;
@@ -629,7 +636,7 @@ i915_seqno_passed(uint32_t seq1, uint32_t seq2)
 uint32_t
 i915_get_gem_seqno(struct drm_device *dev)
 {
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 
 	return READ_HWSP(dev_priv, I915_GEM_HWS_INDEX);
 }
@@ -640,7 +647,7 @@ i915_get_gem_seqno(struct drm_device *dev)
 void
 i915_gem_retire_requests(struct drm_device *dev)
 {
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	uint32_t seqno;
 
 	seqno = i915_get_gem_seqno(dev);
@@ -667,10 +674,10 @@ i915_gem_retire_requests(struct drm_device *dev)
 void
 i915_gem_retire_work_handler(struct work_struct *work)
 {
-	drm_i915_private_t *dev_priv;
+	struct drm_i915_private *dev_priv;
 	struct drm_device *dev;
 
-	dev_priv = container_of(work, drm_i915_private_t,
+	dev_priv = container_of(work, struct drm_i915_private,
 				mm.retire_work.work);
 	dev = dev_priv->dev;
 
@@ -688,18 +695,18 @@ i915_gem_retire_work_handler(struct work_struct *work)
 int
 i915_wait_request(struct drm_device *dev, uint32_t seqno)
 {
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	int ret = 0;
 
 	BUG_ON(seqno == 0);
 
 	if (!i915_seqno_passed(i915_get_gem_seqno(dev), seqno)) {
 		dev_priv->mm.waiting_gem_seqno = seqno;
-		i915_user_irq_on(dev_priv);
+		i915_user_irq_on(dev);
 		ret = wait_event_interruptible(dev_priv->irq_queue,
 					       i915_seqno_passed(i915_get_gem_seqno(dev),
 								 seqno) || dev_priv->mm.wedged);
-		i915_user_irq_off(dev_priv);
+		i915_user_irq_off(dev);
 		dev_priv->mm.waiting_gem_seqno = 0;
 	}
 	if (dev_priv->mm.wedged)
@@ -725,7 +732,7 @@ i915_gem_flush(struct drm_device *dev,
 	       uint32_t invalidate_domains,
 	       uint32_t flush_domains)
 {
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	uint32_t cmd;
 	RING_LOCALS;
 
@@ -766,7 +773,7 @@ i915_gem_flush(struct drm_device *dev,
 		 * are flushed at any MI_FLUSH.
 		 */
 
-		cmd = CMD_MI_FLUSH | MI_NO_WRITE_FLUSH;
+		cmd = MI_FLUSH | MI_NO_WRITE_FLUSH;
 		if ((invalidate_domains|flush_domains) &
 		    I915_GEM_DOMAIN_RENDER)
 			cmd &= ~MI_NO_WRITE_FLUSH;
@@ -955,7 +962,7 @@ i915_gem_dump_object(struct drm_gem_object *obj, int len,
 static void
 i915_dump_lru(struct drm_device *dev, const char *where)
 {
-	drm_i915_private_t		*dev_priv = dev->dev_private;
+	struct drm_i915_private		*dev_priv = dev->dev_private;
 	struct drm_i915_gem_object	*obj_priv;
 
 	DRM_INFO("active list %s {\n", where);
@@ -986,7 +993,7 @@ i915_dump_lru(struct drm_device *dev, const char *where)
 static int
 i915_gem_evict_something(struct drm_device *dev)
 {
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_gem_object *obj;
 	struct drm_i915_gem_object *obj_priv;
 	int ret = 0;
@@ -1123,7 +1130,7 @@ static int
 i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment)
 {
 	struct drm_device *dev = obj->dev;
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_i915_gem_object *obj_priv = obj->driver_private;
 	struct drm_memrange_node *free_space;
 	int page_count, ret;
@@ -1706,7 +1713,7 @@ i915_dispatch_gem_execbuffer(struct drm_device *dev,
 			      struct drm_i915_gem_execbuffer *exec,
 			      uint64_t exec_offset)
 {
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_clip_rect __user *boxes = (struct drm_clip_rect __user *)
 					     (uintptr_t) exec->cliprects_ptr;
 	int nbox = exec->num_cliprects;
@@ -1788,7 +1795,7 @@ int
 i915_gem_execbuffer(struct drm_device *dev, void *data,
 		    struct drm_file *file_priv)
 {
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_i915_file_private *i915_file_priv = file_priv->driver_priv;
 	struct drm_i915_gem_execbuffer *args = data;
 	struct drm_i915_gem_exec_object *exec_list = NULL;
@@ -2028,7 +2035,7 @@ void
 i915_gem_object_unpin(struct drm_gem_object *obj)
 {
 	struct drm_device *dev = obj->dev;
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_i915_gem_object *obj_priv = obj->driver_private;
 
 	i915_verify_inactive(dev, __FILE__, __LINE__);
@@ -2242,7 +2249,7 @@ i915_gem_evict_from_list(struct drm_device *dev, struct list_head *head)
 static int
 i915_gem_idle(struct drm_device *dev)
 {
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	uint32_t seqno, cur_seqno, last_seqno;
 	int stuck;
 
@@ -2310,10 +2317,10 @@ i915_gem_idle(struct drm_device *dev)
 	return 0;
 }
 
-static int
+int
 i915_gem_init_ringbuffer(struct drm_device *dev)
 {
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_gem_object *obj;
 	struct drm_i915_gem_object *obj_priv;
 	int ret;
@@ -2352,17 +2359,16 @@ i915_gem_init_ringbuffer(struct drm_device *dev)
 	dev_priv->ring.virtual_start = dev_priv->ring.map.handle;
 
 	/* Stop the ring if it's running. */
-	I915_WRITE(LP_RING + RING_LEN, 0);
-	I915_WRITE(LP_RING + RING_HEAD, 0);
-	I915_WRITE(LP_RING + RING_TAIL, 0);
-	I915_WRITE(LP_RING + RING_START, 0);
+	I915_WRITE(PRB0_CTL, 0);
+        I915_WRITE(PRB0_HEAD, 0);
+        I915_WRITE(PRB0_TAIL, 0);
+	I915_WRITE(PRB0_START, 0);
 
 	/* Initialize the ring. */
-	I915_WRITE(LP_RING + RING_START, obj_priv->gtt_offset);
-	I915_WRITE(LP_RING + RING_LEN,
-		   ((obj->size - 4096) & RING_NR_PAGES) |
-		   RING_NO_REPORT |
-		   RING_VALID);
+	I915_WRITE(PRB0_START, obj_priv->gtt_offset);
+	I915_WRITE(PRB0_CTL, (((obj->size - 4096) & RING_NR_PAGES) |
+			      RING_NO_REPORT |
+			      RING_VALID));
 
 	/* Update our cache of the ring state */
 	i915_kernel_lost_context(dev);
@@ -2370,10 +2376,10 @@ i915_gem_init_ringbuffer(struct drm_device *dev)
 	return 0;
 }
 
-static void
+void
 i915_gem_cleanup_ringbuffer(struct drm_device *dev)
 {
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 
 	if (dev_priv->ring.ring_obj == NULL)
 		return;
@@ -2390,7 +2396,7 @@ int
 i915_gem_entervt_ioctl(struct drm_device *dev, void *data,
 		       struct drm_file *file_priv)
 {
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	int ret;
 
 	if (dev_priv->mm.wedged) {
@@ -2432,7 +2438,7 @@ static int i915_gem_active_info(char *buf, char **start, off_t offset,
 {
 	struct drm_minor *minor = (struct drm_minor *) data; 
 	struct drm_device *dev = minor->dev;
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_i915_gem_object *obj_priv;
 	int len = 0;
 
@@ -2471,7 +2477,7 @@ static int i915_gem_flushing_info(char *buf, char **start, off_t offset,
 {
 	struct drm_minor *minor = (struct drm_minor *) data; 
 	struct drm_device *dev = minor->dev;
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_i915_gem_object *obj_priv;
 	int len = 0;
 
@@ -2509,7 +2515,7 @@ static int i915_gem_inactive_info(char *buf, char **start, off_t offset,
 {
 	struct drm_minor *minor = (struct drm_minor *) data; 
 	struct drm_device *dev = minor->dev;
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_i915_gem_object *obj_priv;
 	int len = 0;
 
@@ -2547,7 +2553,7 @@ static int i915_gem_request_info(char *buf, char **start, off_t offset,
 {
 	struct drm_minor *minor = (struct drm_minor *) data; 
 	struct drm_device *dev = minor->dev;
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_i915_gem_request *gem_request;
 	int len = 0;
 
@@ -2578,7 +2584,7 @@ static int i915_gem_seqno_info(char *buf, char **start, off_t offset,
 {
 	struct drm_minor *minor = (struct drm_minor *) data; 
 	struct drm_device *dev = minor->dev;
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	int len = 0;
 
 	if (offset > DRM_PROC_LIMIT) {
@@ -2603,7 +2609,7 @@ static int i915_interrupt_info(char *buf, char **start, off_t offset,
 {
 	struct drm_minor *minor = (struct drm_minor *) data; 
 	struct drm_device *dev = minor->dev;
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	int len = 0;
 
 	if (offset > DRM_PROC_LIMIT) {
@@ -2614,15 +2620,15 @@ static int i915_interrupt_info(char *buf, char **start, off_t offset,
 	*start = &buf[offset];
 	*eof = 0;
 	DRM_PROC_PRINT("Interrupt enable:    %08x\n",
-		       I915_READ(I915REG_INT_ENABLE_R));
+		       I915_READ(IER));
 	DRM_PROC_PRINT("Interrupt identity:  %08x\n",
-		       I915_READ(I915REG_INT_IDENTITY_R));
+		       I915_READ(IIR));
 	DRM_PROC_PRINT("Interrupt mask:      %08x\n",
-		       I915_READ(I915REG_INT_MASK_R));
+		       I915_READ(IMR));
 	DRM_PROC_PRINT("Pipe A stat:         %08x\n",
-		       I915_READ(I915REG_PIPEASTAT));
+		       I915_READ(PIPEASTAT));
 	DRM_PROC_PRINT("Pipe B stat:         %08x\n",
-		       I915_READ(I915REG_PIPEBSTAT));
+		       I915_READ(PIPEBSTAT));
 	DRM_PROC_PRINT("Interrupts received: %d\n",
 		       atomic_read(&dev_priv->irq_received));
 	DRM_PROC_PRINT("Current sequence:    %d\n",
@@ -2688,7 +2694,7 @@ void
 i915_gem_lastclose(struct drm_device *dev)
 {
 	int ret;
-	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 
 	mutex_lock(&dev->struct_mutex);