From b59285d738b1a832b12d9258bd6f1db8f7e61f08 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Tue, 10 Apr 2007 10:31:10 -0700
Subject: Move i915 init code to new file, i915_init.c, and create a new high
 level init routine that runs at driver load time.

---
 shared-core/i915_init.c | 157 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 157 insertions(+)
 create mode 100644 shared-core/i915_init.c

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
new file mode 100644
index 00000000..e03ed429
--- /dev/null
+++ b/shared-core/i915_init.c
@@ -0,0 +1,157 @@
+#include "drmP.h"
+#include "drm.h"
+#include "drm_sarea.h"
+#include "i915_drm.h"
+#include "i915_drv.h"
+
+int i915_driver_load(drm_device_t *dev, unsigned long flags)
+{
+	drm_i915_private_t *dev_priv;
+	drm_i915_init_t init;
+	int ret;
+
+	dev_priv = drm_alloc(sizeof(drm_i915_private_t), DRM_MEM_DRIVER);
+	if (dev_priv == NULL)
+		return DRM_ERR(ENOMEM);
+
+	memset(dev_priv, 0, sizeof(drm_i915_private_t));
+	dev->dev_private = (void *)dev_priv;
+//	dev_priv->flags = flags;
+
+	/* i915 has 4 more counters */
+	dev->counters += 4;
+	dev->types[6] = _DRM_STAT_IRQ;
+	dev->types[7] = _DRM_STAT_PRIMARY;
+	dev->types[8] = _DRM_STAT_SECONDARY;
+	dev->types[9] = _DRM_STAT_DMA;
+
+	if (IS_I9XX(dev)) {
+		dev_priv->mmiobase = drm_get_resource_start(dev, 0);
+		dev_priv->mmiolen = drm_get_resource_len(dev, 0);
+	} else if (drm_get_resource_start(dev, 1)) {
+		dev_priv->mmiobase = drm_get_resource_start(dev, 1);
+		dev_priv->mmiolen = drm_get_resource_len(dev, 1);
+	} else {
+		DRM_ERROR("Unable to find MMIO registers\n");
+		return -ENODEV;
+	}
+
+	ret = drm_addmap(dev, dev_priv->mmiobase, dev_priv->mmiolen,
+			 _DRM_REGISTERS, _DRM_READ_ONLY, &dev_priv->mmio_map);
+	if (ret != 0) {
+		DRM_ERROR("Cannot add mapping for MMIO registers\n");
+		return ret;
+	}
+
+	
+	ret = drm_setup(dev);
+	if (ret) {
+		DRM_ERROR("drm_setup failed\n");
+		return ret;
+	}
+
+	DRM_GETSAREA();
+	if (!dev_priv->sarea) {
+		DRM_ERROR("can not find sarea!\n");
+		dev->dev_private = (void *)dev_priv;
+		i915_dma_cleanup(dev);
+		return DRM_ERR(EINVAL);
+	}
+
+	/* FIXME: where does the sarea_priv really go? */
+	dev_priv->sarea_priv = kmalloc(sizeof(drm_i915_sarea_t), GFP_KERNEL);
+
+	/* FIXME: need real front buffer offset */
+	dev_priv->sarea_priv->front_handle = 0xa0000000 + 1024*1024;
+
+	drm_bo_driver_init(dev);
+	/* this probably doesn't belong here - TODO */
+	drm_framebuffer_set_object(dev, dev_priv->sarea_priv->front_handle);
+	intel_modeset_init(dev);
+	drm_set_desired_modes(dev);
+
+	/* FIXME: command ring needs AGP space, do we own it at this point? */
+	dev_priv->ring.Start = 0xa0000000;
+	dev_priv->ring.End = 128*1024;
+	dev_priv->ring.Size = 128*1024;
+	dev_priv->ring.tail_mask = dev_priv->ring.Size - 1;
+
+	dev_priv->ring.map.offset = dev_priv->ring.Start;
+	dev_priv->ring.map.size = dev_priv->ring.Size;
+	dev_priv->ring.map.type = 0;
+	dev_priv->ring.map.flags = 0;
+	dev_priv->ring.map.mtrr = 0;
+
+	drm_core_ioremap(&dev_priv->ring.map, dev);
+
+	if (dev_priv->ring.map.handle == NULL) {
+		dev->dev_private = (void *)dev_priv;
+		i915_dma_cleanup(dev);
+		DRM_ERROR("can not ioremap virtual address for"
+			  " ring buffer\n");
+		return DRM_ERR(ENOMEM);
+	}
+
+	dev_priv->ring.virtual_start = dev_priv->ring.map.handle;
+	dev_priv->cpp = 4;
+	dev_priv->sarea_priv->pf_current_page = 0;
+
+	/* We are using separate values as placeholders for mechanisms for
+	 * private backbuffer/depthbuffer usage.
+	 */
+	dev_priv->use_mi_batchbuffer_start = 0;
+
+	/* Allow hardware batchbuffers unless told otherwise.
+	 */
+	dev_priv->allow_batchbuffer = 1;
+
+	/* Program Hardware Status Page */
+	dev_priv->status_page_dmah = drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE, 
+	    0xffffffff);
+
+	if (!dev_priv->status_page_dmah) {
+		dev->dev_private = (void *)dev_priv;
+		i915_dma_cleanup(dev);
+		DRM_ERROR("Can not allocate hardware status page\n");
+		return DRM_ERR(ENOMEM);
+	}
+	dev_priv->hw_status_page = dev_priv->status_page_dmah->vaddr;
+	dev_priv->dma_status_page = dev_priv->status_page_dmah->busaddr;
+	
+	memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
+	DRM_DEBUG("hw status page @ %p\n", dev_priv->hw_status_page);
+
+	I915_WRITE(0x02080, dev_priv->dma_status_page);
+	DRM_DEBUG("Enabled hardware status page\n");
+
+	return 0;
+}
+
+int i915_driver_unload(drm_device_t *dev)
+{
+	drm_i915_private_t *dev_priv = dev->dev_private;
+
+	intel_modeset_cleanup(dev);
+	drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER);
+
+	dev->dev_private = NULL;
+	return 0;
+}
+
+void i915_driver_lastclose(drm_device_t * dev)
+{
+	drm_i915_private_t *dev_priv = dev->dev_private;
+	
+	i915_mem_takedown(&(dev_priv->agp_heap));
+
+	i915_dma_cleanup(dev);
+
+	dev_priv->mmio_map = NULL;
+}
+
+void i915_driver_preclose(drm_device_t * dev, DRMFILE filp)
+{
+	drm_i915_private_t *dev_priv = dev->dev_private;
+	i915_mem_release(dev, filp, dev_priv->agp_heap);
+}
+
-- 
cgit v1.2.3


From b329f91502a20cc6def44b7bea6cbc8b016edd5e Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@airlied2.(none)>
Date: Wed, 11 Apr 2007 14:04:18 +1000
Subject: use the baseaddr at least

---
 shared-core/i915_init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index e454c9fc..038e3939 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -64,7 +64,7 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	dev_priv->sarea_priv = kmalloc(sizeof(drm_i915_sarea_t), GFP_KERNEL);
 
 	/* FIXME: need real front buffer offset */
-	dev_priv->sarea_priv->front_handle = 0xa0000000 + 1024*1024;
+	dev_priv->sarea_priv->front_handle = dev_priv->baseaddr + 1024*1024;
 
 	drm_bo_driver_init(dev);
 	/* this probably doesn't belong here - TODO */
@@ -73,7 +73,7 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	drm_set_desired_modes(dev);
 
 	/* FIXME: command ring needs AGP space, do we own it at this point? */
-	dev_priv->ring.Start = 0xa0000000;
+	dev_priv->ring.Start = dev_priv->baseaddr;
 	dev_priv->ring.End = 128*1024;
 	dev_priv->ring.Size = 128*1024;
 	dev_priv->ring.tail_mask = dev_priv->ring.Size - 1;
-- 
cgit v1.2.3


From add7a928ad1819df17d5764d06fb81985b285d08 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@airlied2.(none)>
Date: Wed, 11 Apr 2007 14:43:02 +1000
Subject: comment out unworkable code

---
 shared-core/i915_init.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 038e3939..61c128cb 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -45,7 +45,7 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 		return ret;
 	}
 
-	
+#if 0	
 	ret = drm_setup(dev);
 	if (ret) {
 		DRM_ERROR("drm_setup failed\n");
@@ -61,17 +61,17 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	}
 
 	/* FIXME: where does the sarea_priv really go? */
-	dev_priv->sarea_priv = kmalloc(sizeof(drm_i915_sarea_t), GFP_KERNEL);
+        //	dev_priv->sarea_priv = kmalloc(sizeof(drm_i915_sarea_t), GFP_KERNEL);
 
 	/* FIXME: need real front buffer offset */
-	dev_priv->sarea_priv->front_handle = dev_priv->baseaddr + 1024*1024;
-
+        ///	dev_priv->sarea_priv->front_handle = dev_priv->baseaddr + 1024*1024;
+#endif
 	drm_bo_driver_init(dev);
 	/* this probably doesn't belong here - TODO */
 	//drm_framebuffer_set_object(dev, dev_priv->sarea_priv->front_handle);
 	intel_modeset_init(dev);
-	drm_set_desired_modes(dev);
-
+        //	drm_set_desired_modes(dev);
+#if 0
 	/* FIXME: command ring needs AGP space, do we own it at this point? */
 	dev_priv->ring.Start = dev_priv->baseaddr;
 	dev_priv->ring.End = 128*1024;
@@ -125,6 +125,7 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 
 	I915_WRITE(0x02080, dev_priv->dma_status_page);
 	DRM_DEBUG("Enabled hardware status page\n");
+#endif
 
 	return 0;
 }
-- 
cgit v1.2.3


From 32f6a58db216f23a7c71ca9c7eda56aaa8293078 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@airlied2.(none)>
Date: Wed, 11 Apr 2007 16:33:03 +1000
Subject: add initial drm_fb framebuffer

So far I can load fbcon, once I use my miniglx to add a framebuffer.
fbcon doesn't show anything on screen but baby steps and all that.
---
 shared-core/i915_init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 61c128cb..5af86f82 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -28,11 +28,11 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	if (IS_I9XX(dev)) {
 		dev_priv->mmiobase = drm_get_resource_start(dev, 0);
 		dev_priv->mmiolen = drm_get_resource_len(dev, 0);
-		dev_priv->baseaddr = drm_get_resource_start(dev, 2) & 0xff000000;
+		dev->mode_config.fb_base = dev_priv->baseaddr = drm_get_resource_start(dev, 2) & 0xff000000;
 	} else if (drm_get_resource_start(dev, 1)) {
 		dev_priv->mmiobase = drm_get_resource_start(dev, 1);
 		dev_priv->mmiolen = drm_get_resource_len(dev, 1);
-		dev_priv->baseaddr = drm_get_resource_start(dev, 0) & 0xff000000;
+		dev->mode_config.fb_base = dev_priv->baseaddr = drm_get_resource_start(dev, 0) & 0xff000000;
 	} else {
 		DRM_ERROR("Unable to find MMIO registers\n");
 		return -ENODEV;
-- 
cgit v1.2.3


From 78598fdaa8b23a199880a63b79f17cfd7f14cb0f Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Wed, 11 Apr 2007 07:07:54 -0700
Subject: Various changes for in-kernel modesetting:   - allow
 drm_buffer_object_create to be called w/o dev_mapping   - fixup i915 init
 code to allocate memory, fb and set modes right   - pass fb to
 drm_initial_config for setup   - change some debug output to make it easier
 to spot   - fixup lvds code to use DDC probing correctly

---
 shared-core/i915_init.c | 65 +++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 55 insertions(+), 10 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 5af86f82..d9fb485b 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -4,10 +4,23 @@
 #include "i915_drm.h"
 #include "i915_drv.h"
 
+/**
+ * i915_driver_load - setup chip and create an initial config
+ * @dev: DRM device
+ * @flags: startup flags
+ *
+ * The driver load routine has to do several things:
+ *   - drive output discovery via intel_modeset_init()
+ *   - initialize the memory manager
+ *   - allocate initial config memory
+ *   - setup the DRM framebuffer with the allocated memory
+ */
 int i915_driver_load(drm_device_t *dev, unsigned long flags)
 {
 	drm_i915_private_t *dev_priv;
 	drm_i915_init_t init;
+	drm_buffer_object_t *entry;
+	struct drm_framebuffer *fb;
 	int ret;
 
 	dev_priv = drm_alloc(sizeof(drm_i915_private_t), DRM_MEM_DRIVER);
@@ -45,7 +58,6 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 		return ret;
 	}
 
-#if 0	
 	ret = drm_setup(dev);
 	if (ret) {
 		DRM_ERROR("drm_setup failed\n");
@@ -60,17 +72,48 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 		return DRM_ERR(EINVAL);
 	}
 
-	/* FIXME: where does the sarea_priv really go? */
-        //	dev_priv->sarea_priv = kmalloc(sizeof(drm_i915_sarea_t), GFP_KERNEL);
+	/* FIXME: assume sarea_priv is right after SAREA */
+        dev_priv->sarea_priv = dev_priv->sarea->handle + sizeof(drm_sarea_t);
 
-	/* FIXME: need real front buffer offset */
-        ///	dev_priv->sarea_priv->front_handle = dev_priv->baseaddr + 1024*1024;
-#endif
+	/*
+	 * Initialize the memory manager for local and AGP space
+	 */
 	drm_bo_driver_init(dev);
-	/* this probably doesn't belong here - TODO */
-	//drm_framebuffer_set_object(dev, dev_priv->sarea_priv->front_handle);
+	/* FIXME: initial stolen area 8M init */
+#define SCANOUT_SIZE 1024*1024*8 /* big enough for 2048x1024 32bpp */
+	drm_bo_init_mm(dev, DRM_BO_MEM_PRIV0, dev->mode_config.fb_base,
+		       SCANOUT_SIZE);
+
+	/* Allocate scanout buffer and command ring */
+	/* FIXME: types and other args correct? */
+	drm_buffer_object_create(dev, SCANOUT_SIZE, drm_bo_type_dc,
+				 DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
+				 DRM_BO_FLAG_MEM_PRIV0 | DRM_BO_FLAG_NO_MOVE,
+				 0, PAGE_SIZE, 0,
+				 &entry);
+
+	DRM_DEBUG("allocated bo, start: 0x%lx, offset: 0x%lx\n",
+		  entry->buffer_start, entry->offset);
 	intel_modeset_init(dev);
-        //	drm_set_desired_modes(dev);
+
+	fb = drm_framebuffer_create(dev);
+	if (!fb) {
+		DRM_ERROR("failed to allocate fb\n");
+		return -EINVAL;
+	}
+
+	fb->width = 1024;
+	fb->height = 768;
+	fb->pitch = 1024;
+	fb->bits_per_pixel = 32;
+	fb->depth = 32;
+	fb->offset = entry->offset;
+	fb->bo = entry;
+
+	drm_initial_config(dev, fb, false);
+	drmfb_probe(dev, fb);
+        drm_set_desired_modes(dev);
+
 #if 0
 	/* FIXME: command ring needs AGP space, do we own it at this point? */
 	dev_priv->ring.Start = dev_priv->baseaddr;
@@ -133,8 +176,10 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 int i915_driver_unload(drm_device_t *dev)
 {
 	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_framebuffer *fb;
 
-	intel_modeset_cleanup(dev);
+	/* FIXME: remove framebuffer */
+	//intel_modeset_cleanup(dev);
 	drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER);
 
 	dev->dev_private = NULL;
-- 
cgit v1.2.3


From cc7faa4de80a68d5a7a484046b9b42de961cdbef Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Wed, 11 Apr 2007 07:21:24 -0700
Subject: fix modeset cleanup for LVDS and reenable it in i915.

---
 shared-core/i915_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index d9fb485b..43c535d2 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -179,7 +179,7 @@ int i915_driver_unload(drm_device_t *dev)
 	struct drm_framebuffer *fb;
 
 	/* FIXME: remove framebuffer */
-	//intel_modeset_cleanup(dev);
+	intel_modeset_cleanup(dev);
 	drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER);
 
 	dev->dev_private = NULL;
-- 
cgit v1.2.3


From 8dd75bd601f5fbf9793afc7b869a278050aa17d5 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Wed, 11 Apr 2007 11:47:58 -0700
Subject: Add aperture size and preallocation probing (from intelfb), cleanup
 load code to be more general.

---
 shared-core/i915_init.c | 132 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 119 insertions(+), 13 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 43c535d2..fba633fd 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -1,9 +1,108 @@
+/*
+ * Copyright (c) 2007 Intel Corporation
+ *   Jesse Barnes <jesse.barnes@intel.com>
+ *
+ * Copyright © 2002, 2003 David Dawes <dawes@xfree86.org>
+ *                   2004 Sylvain Meyer
+ *
+ * GPL/BSD dual license
+ */
 #include "drmP.h"
 #include "drm.h"
 #include "drm_sarea.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
 
+/**
+ * i915_probe_agp - get AGP bootup configuration
+ * @pdev: PCI device
+ * @aperture_size: returns AGP aperture configured size
+ * @preallocated_size: returns size of BIOS preallocated AGP space
+ *
+ * Since Intel integrated graphics are UMA, the BIOS has to set aside
+ * some RAM for the framebuffer at early boot.  This code figures out
+ * how much was set aside so we can use it for our own purposes.
+ */
+int i915_probe_agp(struct pci_dev *pdev, unsigned long *aperture_size,
+		   unsigned long *preallocated_size)
+{
+	struct pci_dev *bridge_dev;
+	u16 tmp = 0;
+	unsigned long overhead;
+
+	bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0,0));
+	if (!bridge_dev) {
+		DRM_ERROR("bridge device not found\n");
+		return -1;
+	}
+
+	/* Get the fb aperture size and "stolen" memory amount. */
+	pci_read_config_word(bridge_dev, INTEL_GMCH_CTRL, &tmp);
+	pci_dev_put(bridge_dev);
+
+	*aperture_size = 1024 * 1024;
+	*preallocated_size = 1024 * 1024;
+
+	switch (pdev->device) {
+	case PCI_DEVICE_ID_INTEL_82915G_IG:
+	case PCI_DEVICE_ID_INTEL_82915GM_IG:
+	case PCI_DEVICE_ID_INTEL_82945G_IG:
+	case PCI_DEVICE_ID_INTEL_82945GM_IG:
+		/* 915 and 945 chipsets support a 256MB aperture.
+		   Aperture size is determined by inspected the
+		   base address of the aperture. */
+		if (pci_resource_start(pdev, 2) & 0x08000000)
+			*aperture_size *= 128;
+		else
+			*aperture_size *= 256;
+		break;
+	default:
+		if ((tmp & INTEL_GMCH_MEM_MASK) == INTEL_GMCH_MEM_64M)
+			*aperture_size *= 64;
+		else
+			*aperture_size *= 128;
+		break;
+	}
+
+	/*
+	 * Some of the preallocated space is taken by the GTT
+	 * and popup.  GTT is 1K per MB of aperture size, and popup is 4K.
+	 */
+	overhead = (*aperture_size / 1024) + 4096;
+	switch (tmp & INTEL_855_GMCH_GMS_MASK) {
+	case INTEL_855_GMCH_GMS_STOLEN_1M:
+		break; /* 1M already */
+	case INTEL_855_GMCH_GMS_STOLEN_4M:
+		*preallocated_size *= 4;
+		break;
+	case INTEL_855_GMCH_GMS_STOLEN_8M:
+		*preallocated_size *= 8;
+		break;
+	case INTEL_855_GMCH_GMS_STOLEN_16M:
+		*preallocated_size *= 16;
+		break;
+	case INTEL_855_GMCH_GMS_STOLEN_32M:
+		*preallocated_size *= 32;
+		break;
+	case INTEL_915G_GMCH_GMS_STOLEN_48M:
+		*preallocated_size *= 48;
+		break;
+	case INTEL_915G_GMCH_GMS_STOLEN_64M:
+		*preallocated_size *= 64;
+		break;
+	case INTEL_855_GMCH_GMS_DISABLED:
+		DRM_ERROR("video memory is disabled\n");
+		return -1;
+	default:
+		DRM_ERROR("unexpected GMCH_GMS value: 0x%02x\n",
+			tmp & INTEL_855_GMCH_GMS_MASK);
+		return -1;
+	}
+	*preallocated_size -= overhead;
+
+	return 0;
+}
+
 /**
  * i915_driver_load - setup chip and create an initial config
  * @dev: DRM device
@@ -21,7 +120,8 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	drm_i915_init_t init;
 	drm_buffer_object_t *entry;
 	struct drm_framebuffer *fb;
-	int ret;
+	unsigned long agp_size, prealloc_size;
+	int hsize, vsize, bytes_per_pixel, size, ret;
 
 	dev_priv = drm_alloc(sizeof(drm_i915_private_t), DRM_MEM_DRIVER);
 	if (dev_priv == NULL)
@@ -41,11 +141,13 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	if (IS_I9XX(dev)) {
 		dev_priv->mmiobase = drm_get_resource_start(dev, 0);
 		dev_priv->mmiolen = drm_get_resource_len(dev, 0);
-		dev->mode_config.fb_base = dev_priv->baseaddr = drm_get_resource_start(dev, 2) & 0xff000000;
+		dev->mode_config.fb_base = dev_priv->baseaddr =
+			drm_get_resource_start(dev, 2) & 0xff000000;
 	} else if (drm_get_resource_start(dev, 1)) {
 		dev_priv->mmiobase = drm_get_resource_start(dev, 1);
 		dev_priv->mmiolen = drm_get_resource_len(dev, 1);
-		dev->mode_config.fb_base = dev_priv->baseaddr = drm_get_resource_start(dev, 0) & 0xff000000;
+		dev->mode_config.fb_base = dev_priv->baseaddr =
+			drm_get_resource_start(dev, 0) & 0xff000000;
 	} else {
 		DRM_ERROR("Unable to find MMIO registers\n");
 		return -ENODEV;
@@ -79,14 +181,18 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	 * Initialize the memory manager for local and AGP space
 	 */
 	drm_bo_driver_init(dev);
-	/* FIXME: initial stolen area 8M init */
-#define SCANOUT_SIZE 1024*1024*8 /* big enough for 2048x1024 32bpp */
-	drm_bo_init_mm(dev, DRM_BO_MEM_PRIV0, dev->mode_config.fb_base,
-		       SCANOUT_SIZE);
+
+	i915_probe_agp(dev->pdev, &agp_size, &prealloc_size);
+	drm_bo_init_mm(dev, DRM_BO_MEM_PRIV0, dev_priv->baseaddr,
+		       prealloc_size);
 
 	/* Allocate scanout buffer and command ring */
 	/* FIXME: types and other args correct? */
-	drm_buffer_object_create(dev, SCANOUT_SIZE, drm_bo_type_dc,
+	hsize = 1280;
+	vsize = 800;
+	bytes_per_pixel = 4;
+	size = hsize * vsize * bytes_per_pixel;
+	drm_buffer_object_create(dev, size, drm_bo_type_dc,
 				 DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
 				 DRM_BO_FLAG_MEM_PRIV0 | DRM_BO_FLAG_NO_MOVE,
 				 0, PAGE_SIZE, 0,
@@ -102,11 +208,11 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 		return -EINVAL;
 	}
 
-	fb->width = 1024;
-	fb->height = 768;
-	fb->pitch = 1024;
-	fb->bits_per_pixel = 32;
-	fb->depth = 32;
+	fb->width = hsize;
+	fb->height = vsize;
+	fb->pitch = hsize;
+	fb->bits_per_pixel = bytes_per_pixel * 8;
+	fb->depth = bytes_per_pixel * 8;
 	fb->offset = entry->offset;
 	fb->bo = entry;
 
-- 
cgit v1.2.3


From 9d7160c43a7475b9d2ab06c5c353acb9456efa12 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Wed, 11 Apr 2007 12:52:57 -0700
Subject: Use new kernel buffer object type and cleanup agp probing.

---
 shared-core/i915_init.c | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index fba633fd..b942b70f 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -44,24 +44,19 @@ int i915_probe_agp(struct pci_dev *pdev, unsigned long *aperture_size,
 	*preallocated_size = 1024 * 1024;
 
 	switch (pdev->device) {
-	case PCI_DEVICE_ID_INTEL_82915G_IG:
-	case PCI_DEVICE_ID_INTEL_82915GM_IG:
-	case PCI_DEVICE_ID_INTEL_82945G_IG:
-	case PCI_DEVICE_ID_INTEL_82945GM_IG:
-		/* 915 and 945 chipsets support a 256MB aperture.
-		   Aperture size is determined by inspected the
-		   base address of the aperture. */
-		if (pci_resource_start(pdev, 2) & 0x08000000)
-			*aperture_size *= 128;
-		else
-			*aperture_size *= 256;
-		break;
-	default:
+	case PCI_DEVICE_ID_INTEL_82830_CGC:
+	case PCI_DEVICE_ID_INTEL_82845G_HB:
+	case PCI_DEVICE_ID_INTEL_82855GM_IG:
+	case PCI_DEVICE_ID_INTEL_82865_IG:
 		if ((tmp & INTEL_GMCH_MEM_MASK) == INTEL_GMCH_MEM_64M)
 			*aperture_size *= 64;
 		else
 			*aperture_size *= 128;
 		break;
+	default:
+		/* 9xx supports large sizes, just look at the length */
+		*aperture_size = pci_resource_len(pdev, 2);
+		break;
 	}
 
 	/*
@@ -192,7 +187,7 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	vsize = 800;
 	bytes_per_pixel = 4;
 	size = hsize * vsize * bytes_per_pixel;
-	drm_buffer_object_create(dev, size, drm_bo_type_dc,
+	drm_buffer_object_create(dev, size, drm_bo_type_kernel,
 				 DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
 				 DRM_BO_FLAG_MEM_PRIV0 | DRM_BO_FLAG_NO_MOVE,
 				 0, PAGE_SIZE, 0,
-- 
cgit v1.2.3


From fb6c5aacb9955248300e0c62f68a5a65b40e15e1 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 12 Apr 2007 11:54:49 +1000
Subject: only initialise modes when fbcon or fbset asks for it

---
 shared-core/i915_init.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index b942b70f..ebe73815 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -213,8 +213,6 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 
 	drm_initial_config(dev, fb, false);
 	drmfb_probe(dev, fb);
-        drm_set_desired_modes(dev);
-
 #if 0
 	/* FIXME: command ring needs AGP space, do we own it at this point? */
 	dev_priv->ring.Start = dev_priv->baseaddr;
-- 
cgit v1.2.3


From 0430a80fc7861a3397a3f2649dfeb9eff14359a5 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Wed, 11 Apr 2007 20:41:27 -0700
Subject: Remove debug statement about buffer objects

---
 shared-core/i915_init.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index b942b70f..7616b33e 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -193,8 +193,6 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 				 0, PAGE_SIZE, 0,
 				 &entry);
 
-	DRM_DEBUG("allocated bo, start: 0x%lx, offset: 0x%lx\n",
-		  entry->buffer_start, entry->offset);
 	intel_modeset_init(dev);
 
 	fb = drm_framebuffer_create(dev);
-- 
cgit v1.2.3


From 2160e267ff3e1a503ab7666b60ffe21f4a90b803 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Thu, 12 Apr 2007 09:01:53 -0700
Subject: Don't use drm_setup, do SAREA allocation and mapping directly
 instead.

---
 shared-core/i915_init.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 1a8af0ab..687eaa4b 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -114,8 +114,10 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	drm_i915_private_t *dev_priv;
 	drm_i915_init_t init;
 	drm_buffer_object_t *entry;
+	drm_local_map_t *map;
 	struct drm_framebuffer *fb;
 	unsigned long agp_size, prealloc_size;
+	unsigned long sareapage;
 	int hsize, vsize, bytes_per_pixel, size, ret;
 
 	dev_priv = drm_alloc(sizeof(drm_i915_private_t), DRM_MEM_DRIVER);
@@ -155,9 +157,12 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 		return ret;
 	}
 
-	ret = drm_setup(dev);
+	/* prebuild the SAREA */
+	sareapage = max(SAREA_MAX, PAGE_SIZE);
+	ret = drm_addmap(dev, 0, sareapage, _DRM_SHM, _DRM_CONTAINS_LOCK,
+			 &map);
 	if (ret) {
-		DRM_ERROR("drm_setup failed\n");
+		DRM_ERROR("SAREA setup failed\n");
 		return ret;
 	}
 
-- 
cgit v1.2.3


From e183a091ff44e5b03ec521696830c45b2ce9ce87 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Thu, 12 Apr 2007 11:40:12 -0700
Subject: Initialize the hw lock waitqueue so we don't hang in drm_lastclose.

---
 shared-core/i915_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 687eaa4b..f0ab4574 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -173,6 +173,7 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 		i915_dma_cleanup(dev);
 		return DRM_ERR(EINVAL);
 	}
+	init_waitqueue_head(&dev->lock.lock_queue);
 
 	/* FIXME: assume sarea_priv is right after SAREA */
         dev_priv->sarea_priv = dev_priv->sarea->handle + sizeof(drm_sarea_t);
@@ -280,7 +281,6 @@ int i915_driver_unload(drm_device_t *dev)
 	drm_i915_private_t *dev_priv = dev->dev_private;
 	struct drm_framebuffer *fb;
 
-	/* FIXME: remove framebuffer */
 	intel_modeset_cleanup(dev);
 	drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER);
 
-- 
cgit v1.2.3


From cc471a361fc7058df4fb8d15d9c9a8b5cdd3dd77 Mon Sep 17 00:00:00 2001
From: David Airlie <airlied@asimov.stargames.com.au>
Date: Fri, 13 Apr 2007 14:33:52 +1000
Subject: i915/drm: clean up a lot of the i915/drm startup/teardown sequences

When the kernel driver is loaded it sets up a lot of stuff..
it tears down the same stuff on unload.

This add a new map type called DRM_DRIVER which means the driver will clean the mapping up
and fix up the map cleaner
---
 shared-core/i915_init.c | 132 +++++++++++++++++++++++++++---------------------
 1 file changed, 74 insertions(+), 58 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index f0ab4574..be702624 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -151,7 +151,7 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	}
 
 	ret = drm_addmap(dev, dev_priv->mmiobase, dev_priv->mmiolen,
-			 _DRM_REGISTERS, _DRM_READ_ONLY, &dev_priv->mmio_map);
+			 _DRM_REGISTERS, _DRM_READ_ONLY|_DRM_DRIVER, &dev_priv->mmio_map);
 	if (ret != 0) {
 		DRM_ERROR("Cannot add mapping for MMIO registers\n");
 		return ret;
@@ -159,20 +159,13 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 
 	/* prebuild the SAREA */
 	sareapage = max(SAREA_MAX, PAGE_SIZE);
-	ret = drm_addmap(dev, 0, sareapage, _DRM_SHM, _DRM_CONTAINS_LOCK,
-			 &map);
+	ret = drm_addmap(dev, 0, sareapage, _DRM_SHM, _DRM_CONTAINS_LOCK|_DRM_DRIVER,
+			 &dev_priv->sarea);
 	if (ret) {
 		DRM_ERROR("SAREA setup failed\n");
 		return ret;
 	}
 
-	DRM_GETSAREA();
-	if (!dev_priv->sarea) {
-		DRM_ERROR("can not find sarea!\n");
-		dev->dev_private = (void *)dev_priv;
-		i915_dma_cleanup(dev);
-		return DRM_ERR(EINVAL);
-	}
 	init_waitqueue_head(&dev->lock.lock_queue);
 
 	/* FIXME: assume sarea_priv is right after SAREA */
@@ -187,61 +180,34 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	drm_bo_init_mm(dev, DRM_BO_MEM_PRIV0, dev_priv->baseaddr,
 		       prealloc_size);
 
-	/* Allocate scanout buffer and command ring */
-	/* FIXME: types and other args correct? */
-	hsize = 1280;
-	vsize = 800;
-	bytes_per_pixel = 4;
-	size = hsize * vsize * bytes_per_pixel;
-	drm_buffer_object_create(dev, size, drm_bo_type_kernel,
-				 DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
-				 DRM_BO_FLAG_MEM_PRIV0 | DRM_BO_FLAG_NO_MOVE,
-				 0, PAGE_SIZE, 0,
-				 &entry);
-
-	intel_modeset_init(dev);
-
-	fb = drm_framebuffer_create(dev);
-	if (!fb) {
-		DRM_ERROR("failed to allocate fb\n");
+	size = PRIMARY_RINGBUFFER_SIZE;
+	ret = drm_buffer_object_create(dev, size, drm_bo_type_kernel,
+				       DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
+				       DRM_BO_FLAG_MEM_PRIV0 |
+				       DRM_BO_FLAG_NO_MOVE,
+				       DRM_BO_HINT_DONT_FENCE, 0x1, 0,
+				       &dev_priv->ring_buffer);
+	if (ret < 0) {
+		DRM_ERROR("Unable to allocate ring buffer\n");
 		return -EINVAL;
 	}
 
-	fb->width = hsize;
-	fb->height = vsize;
-	fb->pitch = hsize;
-	fb->bits_per_pixel = bytes_per_pixel * 8;
-	fb->depth = bytes_per_pixel * 8;
-	fb->offset = entry->offset;
-	fb->bo = entry;
-
-	drm_initial_config(dev, fb, false);
-	drmfb_probe(dev, fb);
-#if 0
-	/* FIXME: command ring needs AGP space, do we own it at this point? */
-	dev_priv->ring.Start = dev_priv->baseaddr;
-	dev_priv->ring.End = 128*1024;
-	dev_priv->ring.Size = 128*1024;
+	/* remap the buffer object properly */
+	dev_priv->ring.Start = dev_priv->ring_buffer->offset + dev_priv->baseaddr;
+	dev_priv->ring.End = dev_priv->ring.Start + size;
+	dev_priv->ring.Size = size;
 	dev_priv->ring.tail_mask = dev_priv->ring.Size - 1;
 
-	dev_priv->ring.map.offset = dev_priv->ring.Start;
-	dev_priv->ring.map.size = dev_priv->ring.Size;
-	dev_priv->ring.map.type = 0;
-	dev_priv->ring.map.flags = 0;
-	dev_priv->ring.map.mtrr = 0;
+	dev_priv->ring.virtual_start = ioremap((dev_priv->ring.Start), (dev_priv->ring_buffer->mem.num_pages * PAGE_SIZE));
 
-	drm_core_ioremap(&dev_priv->ring.map, dev);
 
-	if (dev_priv->ring.map.handle == NULL) {
-		dev->dev_private = (void *)dev_priv;
-		i915_dma_cleanup(dev);
-		DRM_ERROR("can not ioremap virtual address for"
-			  " ring buffer\n");
-		return DRM_ERR(ENOMEM);
-	}
+	DRM_DEBUG("ring start %08X, %08X, %08X\n", dev_priv->ring.Start, dev_priv->ring.virtual_start, dev_priv->ring.Size);
+	I915_WRITE(LP_RING + RING_HEAD, 0);
+	I915_WRITE(LP_RING + RING_TAIL, 0);
+	I915_WRITE(LP_RING + RING_START, dev_priv->ring.Start);
+	I915_WRITE(LP_RING + RING_LEN, ((dev_priv->ring.Size - 4096) & RING_NR_PAGES) |
+		   (RING_NO_REPORT | RING_VALID));
 
-	dev_priv->ring.virtual_start = dev_priv->ring.map.handle;
-	dev_priv->cpp = 4;
 	dev_priv->sarea_priv->pf_current_page = 0;
 
 	/* We are using separate values as placeholders for mechanisms for
@@ -271,8 +237,40 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 
 	I915_WRITE(0x02080, dev_priv->dma_status_page);
 	DRM_DEBUG("Enabled hardware status page\n");
+
+#if 1
+	/* Allocate scanout buffer and command ring */
+	/* FIXME: types and other args correct? */
+	hsize = 1280;
+	vsize = 800;
+	bytes_per_pixel = 4;
+	size = hsize * vsize * bytes_per_pixel;
+	drm_buffer_object_create(dev, size, drm_bo_type_kernel,
+				 DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
+				 DRM_BO_FLAG_MEM_PRIV0 | DRM_BO_FLAG_NO_MOVE,
+				 0, PAGE_SIZE, 0,
+				 &entry);
 #endif
+	intel_modeset_init(dev);
+
+#if 1
+	fb = drm_framebuffer_create(dev);
+	if (!fb) {
+		DRM_ERROR("failed to allocate fb\n");
+		return -EINVAL;
+	}
 
+	fb->width = hsize;
+	fb->height = vsize;
+	fb->pitch = hsize;
+	fb->bits_per_pixel = bytes_per_pixel * 8;
+	fb->depth = bytes_per_pixel * 8;
+	fb->offset = entry->offset;
+	fb->bo = entry;
+
+	drm_initial_config(dev, fb, false);
+	drmfb_probe(dev, fb);
+#endif
 	return 0;
 }
 
@@ -281,7 +279,26 @@ int i915_driver_unload(drm_device_t *dev)
 	drm_i915_private_t *dev_priv = dev->dev_private;
 	struct drm_framebuffer *fb;
 
+	if (dev_priv->status_page_dmah) {
+		drm_pci_free(dev, dev_priv->status_page_dmah);
+		dev_priv->status_page_dmah = NULL;
+		dev_priv->hw_status_page = NULL;
+		dev_priv->dma_status_page = 0;
+		/* Need to rewrite hardware status page */
+		I915_WRITE(0x02080, 0x1ffff000);
+	}
+
+	I915_WRITE(LP_RING + RING_LEN, 0);
+
+	iounmap(dev_priv->ring.virtual_start);
+
+	drm_bo_driver_finish(dev);
+
 	intel_modeset_cleanup(dev);
+        DRM_DEBUG("%p, %p\n", dev_priv->mmio_map, dev_priv->sarea);
+        drm_rmmap(dev, dev_priv->mmio_map);
+        drm_rmmap(dev, dev_priv->sarea);
+
 	drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER);
 
 	dev->dev_private = NULL;
@@ -296,7 +313,6 @@ void i915_driver_lastclose(drm_device_t * dev)
 
 	i915_dma_cleanup(dev);
 
-	dev_priv->mmio_map = NULL;
 }
 
 void i915_driver_preclose(drm_device_t * dev, DRMFILE filp)
-- 
cgit v1.2.3


From 65619cab276ba1f00014f9701b8347e2b834abe4 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Sat, 14 Apr 2007 15:35:21 -0700
Subject: Fix PRIV0 memory initialization (mm_init takes pages, not bytes),
 align fb allocation correctly, and use drm_mem_reg_iomap to map ring buffer
 object.

---
 shared-core/i915_init.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index be702624..273a1116 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -177,8 +177,9 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	drm_bo_driver_init(dev);
 
 	i915_probe_agp(dev->pdev, &agp_size, &prealloc_size);
+	DRM_DEBUG("setting up %d bytes of PRIV0 space\n", prealloc_size);
 	drm_bo_init_mm(dev, DRM_BO_MEM_PRIV0, dev_priv->baseaddr,
-		       prealloc_size);
+		       prealloc_size >> PAGE_SHIFT);
 
 	size = PRIMARY_RINGBUFFER_SIZE;
 	ret = drm_buffer_object_create(dev, size, drm_bo_type_kernel,
@@ -198,8 +199,11 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	dev_priv->ring.Size = size;
 	dev_priv->ring.tail_mask = dev_priv->ring.Size - 1;
 
-	dev_priv->ring.virtual_start = ioremap((dev_priv->ring.Start), (dev_priv->ring_buffer->mem.num_pages * PAGE_SIZE));
 
+	ret = drm_mem_reg_ioremap(dev, &dev_priv->ring_buffer->mem,
+				  &dev_priv->ring.virtual_start);
+	if (ret)
+		DRM_ERROR("error mapping ring buffer: %d\n", ret);
 
 	DRM_DEBUG("ring start %08X, %08X, %08X\n", dev_priv->ring.Start, dev_priv->ring.virtual_start, dev_priv->ring.Size);
 	I915_WRITE(LP_RING + RING_HEAD, 0);
@@ -248,7 +252,7 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	drm_buffer_object_create(dev, size, drm_bo_type_kernel,
 				 DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
 				 DRM_BO_FLAG_MEM_PRIV0 | DRM_BO_FLAG_NO_MOVE,
-				 0, PAGE_SIZE, 0,
+				 0, 0, 0,
 				 &entry);
 #endif
 	intel_modeset_init(dev);
-- 
cgit v1.2.3


From 79aa1d54746f33c33ffbf98fb96ccbf88c3cb390 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Tue, 17 Apr 2007 18:16:38 +1000
Subject: another large overhaul of interactions with userspace...

We need to keep a list of user created fbs to nuke on master exit.
We also need to use the bo properly.
---
 shared-core/i915_init.c | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 273a1116..2ed7a822 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -138,12 +138,12 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	if (IS_I9XX(dev)) {
 		dev_priv->mmiobase = drm_get_resource_start(dev, 0);
 		dev_priv->mmiolen = drm_get_resource_len(dev, 0);
-		dev->mode_config.fb_base = dev_priv->baseaddr =
+		dev->mode_config.fb_base =
 			drm_get_resource_start(dev, 2) & 0xff000000;
 	} else if (drm_get_resource_start(dev, 1)) {
 		dev_priv->mmiobase = drm_get_resource_start(dev, 1);
 		dev_priv->mmiolen = drm_get_resource_len(dev, 1);
-		dev->mode_config.fb_base = dev_priv->baseaddr =
+		dev->mode_config.fb_base =
 			drm_get_resource_start(dev, 0) & 0xff000000;
 	} else {
 		DRM_ERROR("Unable to find MMIO registers\n");
@@ -178,14 +178,18 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 
 	i915_probe_agp(dev->pdev, &agp_size, &prealloc_size);
 	DRM_DEBUG("setting up %d bytes of PRIV0 space\n", prealloc_size);
-	drm_bo_init_mm(dev, DRM_BO_MEM_PRIV0, dev_priv->baseaddr,
+	drm_bo_init_mm(dev, DRM_BO_MEM_PRIV0, 0,
 		       prealloc_size >> PAGE_SHIFT);
 
+	I915_WRITE(LP_RING + RING_LEN, 0);
+	I915_WRITE(LP_RING + RING_HEAD, 0);
+	I915_WRITE(LP_RING + RING_TAIL, 0);
+
 	size = PRIMARY_RINGBUFFER_SIZE;
 	ret = drm_buffer_object_create(dev, size, drm_bo_type_kernel,
 				       DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
 				       DRM_BO_FLAG_MEM_PRIV0 |
-				       DRM_BO_FLAG_NO_MOVE,
+				       DRM_BO_FLAG_NO_EVICT,
 				       DRM_BO_HINT_DONT_FENCE, 0x1, 0,
 				       &dev_priv->ring_buffer);
 	if (ret < 0) {
@@ -194,23 +198,17 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	}
 
 	/* remap the buffer object properly */
-	dev_priv->ring.Start = dev_priv->ring_buffer->offset + dev_priv->baseaddr;
+	dev_priv->ring.Start = dev_priv->ring_buffer->offset;
 	dev_priv->ring.End = dev_priv->ring.Start + size;
 	dev_priv->ring.Size = size;
 	dev_priv->ring.tail_mask = dev_priv->ring.Size - 1;
 
-
 	ret = drm_mem_reg_ioremap(dev, &dev_priv->ring_buffer->mem,
 				  &dev_priv->ring.virtual_start);
 	if (ret)
 		DRM_ERROR("error mapping ring buffer: %d\n", ret);
 
 	DRM_DEBUG("ring start %08X, %08X, %08X\n", dev_priv->ring.Start, dev_priv->ring.virtual_start, dev_priv->ring.Size);
-	I915_WRITE(LP_RING + RING_HEAD, 0);
-	I915_WRITE(LP_RING + RING_TAIL, 0);
-	I915_WRITE(LP_RING + RING_START, dev_priv->ring.Start);
-	I915_WRITE(LP_RING + RING_LEN, ((dev_priv->ring.Size - 4096) & RING_NR_PAGES) |
-		   (RING_NO_REPORT | RING_VALID));
 
 	dev_priv->sarea_priv->pf_current_page = 0;
 
@@ -294,11 +292,22 @@ int i915_driver_unload(drm_device_t *dev)
 
 	I915_WRITE(LP_RING + RING_LEN, 0);
 
-	iounmap(dev_priv->ring.virtual_start);
+	intel_modeset_cleanup(dev);
+
+	drm_mem_reg_iounmap(dev, &dev_priv->ring_buffer->mem,
+			    dev_priv->ring.virtual_start);
+
+	mutex_lock(&dev->struct_mutex);
+	drm_bo_usage_deref_locked(dev_priv->ring_buffer);
+	mutex_unlock(&dev->struct_mutex);
+
+	if (drm_bo_clean_mm(dev, DRM_BO_MEM_PRIV0)) {
+		DRM_ERROR("Memory manager type 3 not clean. "
+			  "Delaying takedown\n");
+	}
 
 	drm_bo_driver_finish(dev);
 
-	intel_modeset_cleanup(dev);
         DRM_DEBUG("%p, %p\n", dev_priv->mmio_map, dev_priv->sarea);
         drm_rmmap(dev, dev_priv->mmio_map);
         drm_rmmap(dev, dev_priv->sarea);
-- 
cgit v1.2.3


From 32b5616cc681e404f671b4bc3b030ee24b753d4a Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue, 17 Apr 2007 16:08:26 +0100
Subject: Correct PCI ID for i845

---
 shared-core/i915_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 2ed7a822..5872aeb3 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -45,7 +45,7 @@ int i915_probe_agp(struct pci_dev *pdev, unsigned long *aperture_size,
 
 	switch (pdev->device) {
 	case PCI_DEVICE_ID_INTEL_82830_CGC:
-	case PCI_DEVICE_ID_INTEL_82845G_HB:
+	case PCI_DEVICE_ID_INTEL_82845G_IG:
 	case PCI_DEVICE_ID_INTEL_82855GM_IG:
 	case PCI_DEVICE_ID_INTEL_82865_IG:
 		if ((tmp & INTEL_GMCH_MEM_MASK) == INTEL_GMCH_MEM_64M)
-- 
cgit v1.2.3


From 4e4d9cbeb3f52b605e46aad8ae1a947ca236079f Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Tue, 17 Apr 2007 10:00:37 -0700
Subject: Move initial framebuffer allocation and configuration to
 drm_initial_config, remove i915_driver_load fb related stuff.  Add a small
 helper for setting up outputs.

---
 shared-core/i915_init.c | 48 ++++++++----------------------------------------
 1 file changed, 8 insertions(+), 40 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 273a1116..b98f155b 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -112,13 +112,9 @@ int i915_probe_agp(struct pci_dev *pdev, unsigned long *aperture_size,
 int i915_driver_load(drm_device_t *dev, unsigned long flags)
 {
 	drm_i915_private_t *dev_priv;
-	drm_i915_init_t init;
-	drm_buffer_object_t *entry;
-	drm_local_map_t *map;
-	struct drm_framebuffer *fb;
 	unsigned long agp_size, prealloc_size;
 	unsigned long sareapage;
-	int hsize, vsize, bytes_per_pixel, size, ret;
+	int size, ret;
 
 	dev_priv = drm_alloc(sizeof(drm_i915_private_t), DRM_MEM_DRIVER);
 	if (dev_priv == NULL)
@@ -150,6 +146,8 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 		return -ENODEV;
 	}
 
+	DRM_DEBUG("fb_base: 0x%08lx\n", dev_priv->baseaddr);
+
 	ret = drm_addmap(dev, dev_priv->mmiobase, dev_priv->mmiolen,
 			 _DRM_REGISTERS, _DRM_READ_ONLY|_DRM_DRIVER, &dev_priv->mmio_map);
 	if (ret != 0) {
@@ -177,7 +175,7 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	drm_bo_driver_init(dev);
 
 	i915_probe_agp(dev->pdev, &agp_size, &prealloc_size);
-	DRM_DEBUG("setting up %d bytes of PRIV0 space\n", prealloc_size);
+	DRM_DEBUG("setting up %ld bytes of PRIV0 space\n", prealloc_size);
 	drm_bo_init_mm(dev, DRM_BO_MEM_PRIV0, dev_priv->baseaddr,
 		       prealloc_size >> PAGE_SHIFT);
 
@@ -199,13 +197,14 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	dev_priv->ring.Size = size;
 	dev_priv->ring.tail_mask = dev_priv->ring.Size - 1;
 
-
+	/* FIXME: need wrapper with PCI mem checks */
 	ret = drm_mem_reg_ioremap(dev, &dev_priv->ring_buffer->mem,
 				  &dev_priv->ring.virtual_start);
 	if (ret)
 		DRM_ERROR("error mapping ring buffer: %d\n", ret);
 
-	DRM_DEBUG("ring start %08X, %08X, %08X\n", dev_priv->ring.Start, dev_priv->ring.virtual_start, dev_priv->ring.Size);
+	DRM_DEBUG("ring start %08lX, %p, %08lX\n", dev_priv->ring.Start,
+		  dev_priv->ring.virtual_start, dev_priv->ring.Size);
 	I915_WRITE(LP_RING + RING_HEAD, 0);
 	I915_WRITE(LP_RING + RING_TAIL, 0);
 	I915_WRITE(LP_RING + RING_START, dev_priv->ring.Start);
@@ -242,46 +241,15 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	I915_WRITE(0x02080, dev_priv->dma_status_page);
 	DRM_DEBUG("Enabled hardware status page\n");
 
-#if 1
-	/* Allocate scanout buffer and command ring */
-	/* FIXME: types and other args correct? */
-	hsize = 1280;
-	vsize = 800;
-	bytes_per_pixel = 4;
-	size = hsize * vsize * bytes_per_pixel;
-	drm_buffer_object_create(dev, size, drm_bo_type_kernel,
-				 DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
-				 DRM_BO_FLAG_MEM_PRIV0 | DRM_BO_FLAG_NO_MOVE,
-				 0, 0, 0,
-				 &entry);
-#endif
 	intel_modeset_init(dev);
+	drm_initial_config(dev, false);
 
-#if 1
-	fb = drm_framebuffer_create(dev);
-	if (!fb) {
-		DRM_ERROR("failed to allocate fb\n");
-		return -EINVAL;
-	}
-
-	fb->width = hsize;
-	fb->height = vsize;
-	fb->pitch = hsize;
-	fb->bits_per_pixel = bytes_per_pixel * 8;
-	fb->depth = bytes_per_pixel * 8;
-	fb->offset = entry->offset;
-	fb->bo = entry;
-
-	drm_initial_config(dev, fb, false);
-	drmfb_probe(dev, fb);
-#endif
 	return 0;
 }
 
 int i915_driver_unload(drm_device_t *dev)
 {
 	drm_i915_private_t *dev_priv = dev->dev_private;
-	struct drm_framebuffer *fb;
 
 	if (dev_priv->status_page_dmah) {
 		drm_pci_free(dev, dev_priv->status_page_dmah);
-- 
cgit v1.2.3


From 7c9e19ba55dcdf212845253648194115639fe7b6 Mon Sep 17 00:00:00 2001
From: David Airlie <airlied@asimov.stargames.com.au>
Date: Fri, 13 Apr 2007 16:43:55 +1000
Subject: clean up ring buffer and TTM in i915_driver_unload

I've commented out the framebuffer for now
---
 shared-core/i915_init.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 3e44dd54..0c9ef4d4 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -265,6 +265,7 @@ int i915_driver_unload(drm_device_t *dev)
 	drm_mem_reg_iounmap(dev, &dev_priv->ring_buffer->mem,
 			    dev_priv->ring.virtual_start);
 
+	DRM_DEBUG("usage is %d\n", dev_priv->ring_buffer->usage);
 	mutex_lock(&dev->struct_mutex);
 	drm_bo_usage_deref_locked(dev_priv->ring_buffer);
 	mutex_unlock(&dev->struct_mutex);
-- 
cgit v1.2.3


From eba00df1203040905d38bf0ef449d25d6dbdb72c Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Thu, 10 May 2007 13:16:05 +0100
Subject: Just some minor cleanups.

---
 shared-core/i915_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 0c9ef4d4..43040e6e 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -202,7 +202,7 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 
 	/* FIXME: need wrapper with PCI mem checks */
 	ret = drm_mem_reg_ioremap(dev, &dev_priv->ring_buffer->mem,
-				  &dev_priv->ring.virtual_start);
+				  (void **) &dev_priv->ring.virtual_start);
 	if (ret)
 		DRM_ERROR("error mapping ring buffer: %d\n", ret);
 
-- 
cgit v1.2.3


From a18b4befb9b76c4b2662ff6caa0e4f0975eb8e9c Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Thu, 17 May 2007 09:00:06 -0700
Subject: Fix FB pitch value (we had it wrong and were working around it in a
 few places). Add new FB hooks to the drm driver structure and make i915 use
 them for an Intel specific FB driver.  This will allow acceleration and
 better handling of the command stream.

---
 shared-core/i915_init.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 0c9ef4d4..510e853b 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -211,6 +211,13 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 
 	dev_priv->sarea_priv->pf_current_page = 0;
 
+	memset((void *)(dev_priv->ring.virtual_start), 0, dev_priv->ring.Size);
+
+	I915_WRITE(LP_RING + RING_START, dev_priv->ring.Start);
+	I915_WRITE(LP_RING + RING_LEN,
+		   ((dev_priv->ring.Size - 4096) & RING_NR_PAGES) |
+		   (RING_NO_REPORT | RING_VALID));
+
 	/* We are using separate values as placeholders for mechanisms for
 	 * private backbuffer/depthbuffer usage.
 	 */
@@ -236,7 +243,7 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
 	DRM_DEBUG("hw status page @ %p\n", dev_priv->hw_status_page);
 
-	I915_WRITE(0x02080, dev_priv->dma_status_page);
+	I915_WRITE(I915REG_HWS_PGA, dev_priv->dma_status_page);
 	DRM_DEBUG("Enabled hardware status page\n");
 
 	intel_modeset_init(dev);
@@ -255,7 +262,7 @@ int i915_driver_unload(drm_device_t *dev)
 		dev_priv->hw_status_page = NULL;
 		dev_priv->dma_status_page = 0;
 		/* Need to rewrite hardware status page */
-		I915_WRITE(0x02080, 0x1ffff000);
+		I915_WRITE(I915REG_HWS_PGA, 0x1ffff000);
 	}
 
 	I915_WRITE(LP_RING + RING_LEN, 0);
-- 
cgit v1.2.3


From e918d2b7814e2cf5345dba63031c402010b1d3e4 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Tue, 22 May 2007 13:38:58 -0700
Subject: Call preallocated space VRAM instead of PRIV0 to be more consistent
 with other drivers.

---
 shared-core/i915_init.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 61576aae..7516b2ce 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -175,8 +175,8 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	drm_bo_driver_init(dev);
 
 	i915_probe_agp(dev->pdev, &agp_size, &prealloc_size);
-	DRM_DEBUG("setting up %ld bytes of PRIV0 space\n", prealloc_size);
-	drm_bo_init_mm(dev, DRM_BO_MEM_PRIV0, 0, prealloc_size >> PAGE_SHIFT);
+	DRM_DEBUG("setting up %ld bytes of VRAM space\n", prealloc_size);
+	drm_bo_init_mm(dev, DRM_BO_MEM_VRAM, 0, prealloc_size >> PAGE_SHIFT);
 
 	I915_WRITE(LP_RING + RING_LEN, 0);
 	I915_WRITE(LP_RING + RING_HEAD, 0);
@@ -185,7 +185,7 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
 	size = PRIMARY_RINGBUFFER_SIZE;
 	ret = drm_buffer_object_create(dev, size, drm_bo_type_kernel,
 				       DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
-				       DRM_BO_FLAG_MEM_PRIV0 |
+				       DRM_BO_FLAG_MEM_VRAM |
 				       DRM_BO_FLAG_NO_EVICT,
 				       DRM_BO_HINT_DONT_FENCE, 0x1, 0,
 				       &dev_priv->ring_buffer);
@@ -277,7 +277,7 @@ int i915_driver_unload(drm_device_t *dev)
 	drm_bo_usage_deref_locked(dev_priv->ring_buffer);
 	mutex_unlock(&dev->struct_mutex);
 
-	if (drm_bo_clean_mm(dev, DRM_BO_MEM_PRIV0)) {
+	if (drm_bo_clean_mm(dev, DRM_BO_MEM_VRAM)) {
 		DRM_ERROR("Memory manager type 3 not clean. "
 			  "Delaying takedown\n");
 	}
-- 
cgit v1.2.3


From 14c49df06bb0b1adc0fa2a9bd575c454d39c7cf0 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri, 29 Jun 2007 20:14:09 +0100
Subject: merge fixes

---
 shared-core/i915_init.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 83219e49..e4a2cdef 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -275,7 +275,7 @@ int i915_driver_unload(drm_device_t *dev)
 
 	DRM_DEBUG("usage is %d\n", atomic_read(&dev_priv->ring_buffer->usage));
 	mutex_lock(&dev->struct_mutex);
-	drm_bo_usage_deref_locked(dev_priv->ring_buffer);
+	drm_bo_usage_deref_locked(&dev_priv->ring_buffer);
 	mutex_unlock(&dev->struct_mutex);
 
 	if (drm_bo_clean_mm(dev, DRM_BO_MEM_VRAM)) {
@@ -302,7 +302,6 @@ void i915_driver_lastclose(drm_device_t * dev)
 	i915_mem_takedown(&(dev_priv->agp_heap));
 
 	i915_dma_cleanup(dev);
-
 }
 
 void i915_driver_preclose(drm_device_t * dev, DRMFILE filp)
-- 
cgit v1.2.3


From 70fd9351ed6c666def710fd61b542a7c975d9ac9 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri, 29 Jun 2007 21:04:17 +0100
Subject: Move out the code from i915_dma_cleanup to unload to match existing
 code.

This needs verifying.
---
 shared-core/i915_init.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index e4a2cdef..fd102b35 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -257,6 +257,10 @@ int i915_driver_unload(drm_device_t *dev)
 {
 	drm_i915_private_t *dev_priv = dev->dev_private;
 
+	if (dev_priv->ring.virtual_start) {
+		drm_core_ioremapfree(&dev_priv->ring.map, dev);
+	}
+
 	if (dev_priv->status_page_dmah) {
 		drm_pci_free(dev, dev_priv->status_page_dmah);
 		dev_priv->status_page_dmah = NULL;
@@ -266,6 +270,12 @@ int i915_driver_unload(drm_device_t *dev)
 		I915_WRITE(I915REG_HWS_PGA, 0x1ffff000);
 	}
 
+	if (dev_priv->status_gfx_addr) {
+		dev_priv->status_gfx_addr = 0;
+		drm_core_ioremapfree(&dev_priv->hws_map, dev);
+		I915_WRITE(I915REG_HWS_PGA, 0x1ffff000);
+	}
+
 	I915_WRITE(LP_RING + RING_LEN, 0);
 
 	intel_modeset_cleanup(dev);
-- 
cgit v1.2.3


From 972ec4fa25059c84ed103c28efcb17f9f97a6d74 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jesse.barnes@intel.com>
Date: Tue, 25 Sep 2007 16:18:01 -0700
Subject: Hack out i915_mem_takedown

We may want to make the old i915 memory manager obsolete eventually, and in the
meantime the takedown causes problems on unload so remove it for now.
---
 shared-core/i915_init.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 065afcdf..918bbcb8 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -291,12 +291,12 @@ int i915_driver_unload(struct drm_device *dev)
 	DRM_DEBUG("usage is %d\n", atomic_read(&dev_priv->ring_buffer->usage));
 	mutex_lock(&dev->struct_mutex);
 	drm_bo_usage_deref_locked(&dev_priv->ring_buffer);
-	mutex_unlock(&dev->struct_mutex);
 
 	if (drm_bo_clean_mm(dev, DRM_BO_MEM_VRAM)) {
 		DRM_ERROR("Memory manager type 3 not clean. "
 			  "Delaying takedown\n");
 	}
+	mutex_unlock(&dev->struct_mutex);
 
 	drm_bo_driver_finish(dev);
 
@@ -315,15 +315,14 @@ void i915_driver_lastclose(struct drm_device *dev)
 	struct drm_i915_private *dev_priv = dev->dev_private;
 
 	i915_do_cleanup_pageflip(dev);
-	
-	i915_mem_takedown(&(dev_priv->agp_heap));
-
+	//i915_mem_takedown(&(dev_priv->agp_heap));
 	i915_dma_cleanup(dev);
 }
 
 void i915_driver_preclose(struct drm_device *dev, struct drm_file *filp)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
-	i915_mem_release(dev, filp, dev_priv->agp_heap);
+
+	//i915_mem_release(dev, filp, dev_priv->agp_heap);
 }
 
-- 
cgit v1.2.3


From bf9bd5671c184e1caeeb25ead588cbb2ab77c360 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Thu, 27 Sep 2007 14:21:29 +0100
Subject: Create memory pool for TT memory

---
 shared-core/i915_init.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 918bbcb8..8e419b8a 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -175,8 +175,10 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 	drm_bo_driver_init(dev);
 
 	i915_probe_agp(dev->pdev, &agp_size, &prealloc_size);
-	DRM_DEBUG("setting up %ld bytes of VRAM space\n", prealloc_size);
+	printk("setting up %ld bytes of VRAM space\n", prealloc_size);
+	printk("setting up %ld bytes of TT space\n", (agp_size - prealloc_size));
 	drm_bo_init_mm(dev, DRM_BO_MEM_VRAM, 0, prealloc_size >> PAGE_SHIFT);
+	drm_bo_init_mm(dev, DRM_BO_MEM_TT, prealloc_size >> PAGE_SHIFT, (agp_size - prealloc_size) >> PAGE_SHIFT);
 
 	I915_WRITE(LP_RING + RING_LEN, 0);
 	I915_WRITE(LP_RING + RING_HEAD, 0);
@@ -292,6 +294,10 @@ int i915_driver_unload(struct drm_device *dev)
 	mutex_lock(&dev->struct_mutex);
 	drm_bo_usage_deref_locked(&dev_priv->ring_buffer);
 
+	if (drm_bo_clean_mm(dev, DRM_BO_MEM_TT)) {
+		DRM_ERROR("Memory manager type 3 not clean. "
+			  "Delaying takedown\n");
+	}
 	if (drm_bo_clean_mm(dev, DRM_BO_MEM_VRAM)) {
 		DRM_ERROR("Memory manager type 3 not clean. "
 			  "Delaying takedown\n");
-- 
cgit v1.2.3


From e239882b1e90cba0297118ec7dc432bea06b0bd0 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Tue, 4 Dec 2007 15:36:36 +0100
Subject: Modesetting Hotplug

---
 shared-core/i915_init.c | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 3b43c722..588cd17e 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -30,7 +30,7 @@ int i915_probe_agp(struct pci_dev *pdev, unsigned long *aperture_size,
 	u16 tmp = 0;
 	unsigned long overhead;
 
-	bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0,0));
+	bridge_dev = pci_find_slot(0, PCI_DEVFN(0,0));
 	if (!bridge_dev) {
 		DRM_ERROR("bridge device not found\n");
 		return -1;
@@ -249,9 +249,20 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 	}
 	DRM_DEBUG("Enabled hardware status page\n");
 
+	dev_priv->wq = create_singlethread_workqueue("i915");
+	if (dev_priv == 0) {
+		DRM_DEBUG("Error\n");
+	}
+
+
 	intel_modeset_init(dev);
 	drm_initial_config(dev, false);
 
+	drm_mm_print(&dev->bm.man[DRM_BO_MEM_VRAM].manager, "VRAM");
+	drm_mm_print(&dev->bm.man[DRM_BO_MEM_TT].manager, "TT");
+
+	drm_irq_install(dev);
+
 	return 0;
 }
 
@@ -259,9 +270,15 @@ int i915_driver_unload(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
 
+	I915_WRITE(LP_RING + RING_LEN, 0);
+
+	intel_modeset_cleanup(dev);
+
+#if 0
 	if (dev_priv->ring.virtual_start) {
 		drm_core_ioremapfree(&dev_priv->ring.map, dev);
 	}
+#endif
 
 	if (dev_priv->status_page_dmah) {
 		drm_pci_free(dev, dev_priv->status_page_dmah);
@@ -278,10 +295,6 @@ int i915_driver_unload(struct drm_device *dev)
 		I915_WRITE(I915REG_HWS_PGA, 0x1ffff000);
 	}
 
-	I915_WRITE(LP_RING + RING_LEN, 0);
-
-	intel_modeset_cleanup(dev);
-
 	drm_mem_reg_iounmap(dev, &dev_priv->ring_buffer->mem,
 			    dev_priv->ring.virtual_start);
 
@@ -310,20 +323,3 @@ int i915_driver_unload(struct drm_device *dev)
 	dev->dev_private = NULL;
 	return 0;
 }
-
-void i915_driver_lastclose(struct drm_device *dev)
-{
-	struct drm_i915_private *dev_priv = dev->dev_private;
-
-	i915_do_cleanup_pageflip(dev);
-	//i915_mem_takedown(&(dev_priv->agp_heap));
-	i915_dma_cleanup(dev);
-}
-
-void i915_driver_preclose(struct drm_device *dev, struct drm_file *filp)
-{
-	struct drm_i915_private *dev_priv = dev->dev_private;
-
-	//i915_mem_release(dev, filp, dev_priv->agp_heap);
-}
-
-- 
cgit v1.2.3


From ea915c77e169a50ca7dc557512212eafa93e2205 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Tue, 18 Dec 2007 02:52:09 +0100
Subject: Fixed build

---
 shared-core/i915_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 588cd17e..ebdcd5d3 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -30,7 +30,7 @@ int i915_probe_agp(struct pci_dev *pdev, unsigned long *aperture_size,
 	u16 tmp = 0;
 	unsigned long overhead;
 
-	bridge_dev = pci_find_slot(0, PCI_DEVFN(0,0));
+	bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0,0));
 	if (!bridge_dev) {
 		DRM_ERROR("bridge device not found\n");
 		return -1;
-- 
cgit v1.2.3


From b13dc383df85d75cb1ea422f4d13efc2a4a8a732 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 18 Dec 2007 17:41:20 +1100
Subject: remove output names

---
 shared-core/i915_init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 3b43c722..e44cb930 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -188,8 +188,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 	ret = drm_buffer_object_create(dev, size, drm_bo_type_kernel,
 				       DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
 				       DRM_BO_FLAG_MEM_VRAM |
-				       DRM_BO_FLAG_NO_EVICT |
-				       DRM_BO_HINT_DONT_FENCE, 0, 0x1, 0,
+				       DRM_BO_FLAG_NO_EVICT,
+				       DRM_BO_HINT_DONT_FENCE, 0x1, 0,
 				       &dev_priv->ring_buffer);
 	if (ret < 0) {
 		DRM_ERROR("Unable to allocate or pin ring buffer\n");
-- 
cgit v1.2.3


From a2254c5a9670a3e865f0eb5acd46e905c9b146ce Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Mon, 28 Jan 2008 03:12:29 +0100
Subject: Added cursor support

---
 shared-core/i915_init.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 3b271b17..792c40bb 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -131,6 +131,11 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 	dev->types[8] = _DRM_STAT_SECONDARY;
 	dev->types[9] = _DRM_STAT_DMA;
 
+	if (IS_I9XX(dev)) {
+		pci_read_config_dword(dev->pdev, 0x5C, &dev_priv->stolen_base);
+		DRM_DEBUG("stolen base %p\n", (void*)dev_priv->stolen_base);
+	}
+
 	if (IS_I9XX(dev)) {
 		dev_priv->mmiobase = drm_get_resource_start(dev, 0);
 		dev_priv->mmiolen = drm_get_resource_len(dev, 0);
-- 
cgit v1.2.3


From 8bf8cd63bb4631b57ceb27058f81d767a94edc74 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 14 Feb 2008 07:37:34 +1000
Subject: missing bits

---
 shared-core/i915_init.c | 58 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 18 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 792c40bb..c2d8964e 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -113,7 +113,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 {
 	struct drm_i915_private *dev_priv;
 	unsigned long agp_size, prealloc_size;
-	unsigned long sareapage;
 	int size, ret;
 
 	dev_priv = drm_alloc(sizeof(struct drm_i915_private), DRM_MEM_DRIVER);
@@ -160,20 +159,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 		return ret;
 	}
 
-	/* prebuild the SAREA */
-	sareapage = max(SAREA_MAX, PAGE_SIZE);
-	ret = drm_addmap(dev, 0, sareapage, _DRM_SHM, _DRM_CONTAINS_LOCK|_DRM_DRIVER,
-			 &dev_priv->sarea);
-	if (ret) {
-		DRM_ERROR("SAREA setup failed\n");
-		return ret;
-	}
-
-	init_waitqueue_head(&dev->lock.lock_queue);
-
-	/* FIXME: assume sarea_priv is right after SAREA */
-        dev_priv->sarea_priv = dev_priv->sarea->handle + sizeof(struct drm_sarea);
-
 	/*
 	 * Initialize the memory manager for local and AGP space
 	 */
@@ -216,7 +201,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 	DRM_DEBUG("ring start %08lX, %p, %08lX\n", dev_priv->ring.Start,
 		  dev_priv->ring.virtual_start, dev_priv->ring.Size);
 
-	dev_priv->sarea_priv->pf_current_page = 0;
+	//
 
 	memset((void *)(dev_priv->ring.virtual_start), 0, dev_priv->ring.Size);
 
@@ -319,12 +304,49 @@ int i915_driver_unload(struct drm_device *dev)
 
 	drm_bo_driver_finish(dev);
 
-        DRM_DEBUG("%p, %p\n", dev_priv->mmio_map, dev_priv->sarea);
+        DRM_DEBUG("%p\n", dev_priv->mmio_map);
         drm_rmmap(dev, dev_priv->mmio_map);
-        drm_rmmap(dev, dev_priv->sarea);
 
 	drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER);
 
 	dev->dev_private = NULL;
 	return 0;
 }
+
+int i915_master_create(struct drm_device *dev, struct drm_master *master)
+{
+	struct drm_i915_master_private *master_priv;
+	unsigned long sareapage;
+	int ret;
+
+	master_priv = drm_calloc(1, sizeof(*master_priv), DRM_MEM_DRIVER);
+	if (!master_priv)
+		return -ENOMEM;
+
+	/* prebuild the SAREA */
+	sareapage = max(SAREA_MAX, PAGE_SIZE);
+	ret = drm_addmap(dev, 0, sareapage, _DRM_SHM, _DRM_CONTAINS_LOCK|_DRM_DRIVER,
+			 &master_priv->sarea);
+	if (ret) {
+		DRM_ERROR("SAREA setup failed\n");
+		return ret;
+	}
+	master_priv->sarea_priv = master_priv->sarea->handle + sizeof(struct drm_sarea);
+	master_priv->sarea_priv->pf_current_page = 0;
+
+	master->driver_priv = master_priv;
+	return 0;
+}
+
+void i915_master_destroy(struct drm_device *dev, struct drm_master *master)
+{
+	struct drm_i915_master_private *master_priv = master->driver_priv;
+
+	if (!master_priv)
+		return;
+
+        drm_rmmap(dev, master_priv->sarea);
+	drm_free(master_priv, sizeof(*master_priv), DRM_MEM_DRIVER);
+
+	master->driver_priv = NULL;
+}
-- 
cgit v1.2.3


From 8caf6e95712bfae8d1a42ffabafcbb9686766116 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Tue, 19 Feb 2008 15:17:24 +0000
Subject: Fix up conflicts for DRI2 (untested)

---
 shared-core/i915_init.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index c2d8964e..fe2fb389 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -269,6 +269,19 @@ int i915_driver_unload(struct drm_device *dev)
 		drm_core_ioremapfree(&dev_priv->ring.map, dev);
 	}
 #endif
+	if (dev_priv->sarea_kmap.virtual) {
+		drm_bo_kunmap(&dev_priv->sarea_kmap);
+		dev_priv->sarea_kmap.virtual = NULL;
+		dev->primary->master->lock.hw_lock = NULL;
+		dev->sigdata.lock = NULL;
+	}
+
+	if (dev_priv->sarea_bo) {
+		mutex_lock(&dev->struct_mutex);
+		drm_bo_usage_deref_locked(&dev_priv->sarea_bo);
+		mutex_unlock(&dev->struct_mutex);
+		dev_priv->sarea_bo = NULL;
+	}
 
 	if (dev_priv->status_page_dmah) {
 		drm_pci_free(dev, dev_priv->status_page_dmah);
-- 
cgit v1.2.3


From 2c409f9a07a9d815b95fc8a5a4705d7988afe5df Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 18 Feb 2008 10:39:21 +1000
Subject: ttm: make sure userspace can't destroy kernel create memory managers

---
 shared-core/i915_init.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index fe2fb389..b2d3f0d0 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -167,8 +167,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 	i915_probe_agp(dev->pdev, &agp_size, &prealloc_size);
 	printk("setting up %ld bytes of VRAM space\n", prealloc_size);
 	printk("setting up %ld bytes of TT space\n", (agp_size - prealloc_size));
-	drm_bo_init_mm(dev, DRM_BO_MEM_VRAM, 0, prealloc_size >> PAGE_SHIFT);
-	drm_bo_init_mm(dev, DRM_BO_MEM_TT, prealloc_size >> PAGE_SHIFT, (agp_size - prealloc_size) >> PAGE_SHIFT);
+	drm_bo_init_mm(dev, DRM_BO_MEM_VRAM, 0, prealloc_size >> PAGE_SHIFT, 1);
+	drm_bo_init_mm(dev, DRM_BO_MEM_TT, prealloc_size >> PAGE_SHIFT, (agp_size - prealloc_size) >> PAGE_SHIFT, 1);
 
 	I915_WRITE(LP_RING + RING_LEN, 0);
 	I915_WRITE(LP_RING + RING_HEAD, 0);
@@ -305,11 +305,11 @@ int i915_driver_unload(struct drm_device *dev)
 	mutex_lock(&dev->struct_mutex);
 	drm_bo_usage_deref_locked(&dev_priv->ring_buffer);
 
-	if (drm_bo_clean_mm(dev, DRM_BO_MEM_TT)) {
+	if (drm_bo_clean_mm(dev, DRM_BO_MEM_TT, 1)) {
 		DRM_ERROR("Memory manager type 3 not clean. "
 			  "Delaying takedown\n");
 	}
-	if (drm_bo_clean_mm(dev, DRM_BO_MEM_VRAM)) {
+	if (drm_bo_clean_mm(dev, DRM_BO_MEM_VRAM, 1)) {
 		DRM_ERROR("Memory manager type 3 not clean. "
 			  "Delaying takedown\n");
 	}
-- 
cgit v1.2.3


From 01dcc47d895997f77c9457558e974d41c23ed4e1 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 28 Feb 2008 16:24:17 +1000
Subject: drm: add modesetting as a driver feature.

This change adds a driver feature that for i915 is controlled by a module
parameter. You now need to do insmod i915.ko modeset=1 to enable it the
modesetting paths.

It also fixes up lots of X paths. I can run my new DDX driver on this code
with and without modesetting enabled
---
 shared-core/i915_init.c | 226 ++++++++++++++++++++++++++++--------------------
 1 file changed, 132 insertions(+), 94 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index b2d3f0d0..a2e08bc1 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -153,106 +153,113 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 	DRM_DEBUG("fb_base: 0x%08lx\n", dev->mode_config.fb_base);
 
 	ret = drm_addmap(dev, dev_priv->mmiobase, dev_priv->mmiolen,
-			 _DRM_REGISTERS, _DRM_READ_ONLY|_DRM_DRIVER, &dev_priv->mmio_map);
+			 _DRM_REGISTERS, _DRM_KERNEL|_DRM_READ_ONLY|_DRM_DRIVER, &dev_priv->mmio_map);
 	if (ret != 0) {
 		DRM_ERROR("Cannot add mapping for MMIO registers\n");
 		return ret;
 	}
 
+#ifdef __linux__
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
+        intel_init_chipset_flush_compat(dev);
+#endif
+#endif
+
 	/*
 	 * Initialize the memory manager for local and AGP space
 	 */
 	drm_bo_driver_init(dev);
 
-	i915_probe_agp(dev->pdev, &agp_size, &prealloc_size);
-	printk("setting up %ld bytes of VRAM space\n", prealloc_size);
-	printk("setting up %ld bytes of TT space\n", (agp_size - prealloc_size));
-	drm_bo_init_mm(dev, DRM_BO_MEM_VRAM, 0, prealloc_size >> PAGE_SHIFT, 1);
-	drm_bo_init_mm(dev, DRM_BO_MEM_TT, prealloc_size >> PAGE_SHIFT, (agp_size - prealloc_size) >> PAGE_SHIFT, 1);
-
-	I915_WRITE(LP_RING + RING_LEN, 0);
-	I915_WRITE(LP_RING + RING_HEAD, 0);
-	I915_WRITE(LP_RING + RING_TAIL, 0);
-
-	size = PRIMARY_RINGBUFFER_SIZE;
-	ret = drm_buffer_object_create(dev, size, drm_bo_type_kernel,
-				       DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
-				       DRM_BO_FLAG_MEM_VRAM |
-				       DRM_BO_FLAG_NO_EVICT,
-				       DRM_BO_HINT_DONT_FENCE, 0x1, 0,
-				       &dev_priv->ring_buffer);
-	if (ret < 0) {
-		DRM_ERROR("Unable to allocate or pin ring buffer\n");
-		return -EINVAL;
-	}
-
-	/* remap the buffer object properly */
-	dev_priv->ring.Start = dev_priv->ring_buffer->offset;
-	dev_priv->ring.End = dev_priv->ring.Start + size;
-	dev_priv->ring.Size = size;
-	dev_priv->ring.tail_mask = dev_priv->ring.Size - 1;
-
-	/* FIXME: need wrapper with PCI mem checks */
-	ret = drm_mem_reg_ioremap(dev, &dev_priv->ring_buffer->mem,
-				  (void **) &dev_priv->ring.virtual_start);
-	if (ret)
-		DRM_ERROR("error mapping ring buffer: %d\n", ret);
-
-	DRM_DEBUG("ring start %08lX, %p, %08lX\n", dev_priv->ring.Start,
-		  dev_priv->ring.virtual_start, dev_priv->ring.Size);
+	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+		i915_probe_agp(dev->pdev, &agp_size, &prealloc_size);
+		printk("setting up %ld bytes of VRAM space\n", prealloc_size);
+		printk("setting up %ld bytes of TT space\n", (agp_size - prealloc_size));
+		drm_bo_init_mm(dev, DRM_BO_MEM_VRAM, 0, prealloc_size >> PAGE_SHIFT, 1);
+		drm_bo_init_mm(dev, DRM_BO_MEM_TT, prealloc_size >> PAGE_SHIFT, (agp_size - prealloc_size) >> PAGE_SHIFT, 1);
+		
+		I915_WRITE(LP_RING + RING_LEN, 0);
+		I915_WRITE(LP_RING + RING_HEAD, 0);
+		I915_WRITE(LP_RING + RING_TAIL, 0);
+
+		size = PRIMARY_RINGBUFFER_SIZE;
+		ret = drm_buffer_object_create(dev, size, drm_bo_type_kernel,
+					       DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
+					       DRM_BO_FLAG_MEM_VRAM |
+					       DRM_BO_FLAG_NO_EVICT,
+					       DRM_BO_HINT_DONT_FENCE, 0x1, 0,
+					       &dev_priv->ring_buffer);
+		if (ret < 0) {
+			DRM_ERROR("Unable to allocate or pin ring buffer\n");
+			return -EINVAL;
+		}
+		
+		/* remap the buffer object properly */
+		dev_priv->ring.Start = dev_priv->ring_buffer->offset;
+		dev_priv->ring.End = dev_priv->ring.Start + size;
+		dev_priv->ring.Size = size;
+		dev_priv->ring.tail_mask = dev_priv->ring.Size - 1;
+
+		/* FIXME: need wrapper with PCI mem checks */
+		ret = drm_mem_reg_ioremap(dev, &dev_priv->ring_buffer->mem,
+					  (void **) &dev_priv->ring.virtual_start);
+		if (ret)
+			DRM_ERROR("error mapping ring buffer: %d\n", ret);
+		
+		DRM_DEBUG("ring start %08lX, %p, %08lX\n", dev_priv->ring.Start,
+			  dev_priv->ring.virtual_start, dev_priv->ring.Size);
 
 	//
 
-	memset((void *)(dev_priv->ring.virtual_start), 0, dev_priv->ring.Size);
-
-	I915_WRITE(LP_RING + RING_START, dev_priv->ring.Start);
-	I915_WRITE(LP_RING + RING_LEN,
-		   ((dev_priv->ring.Size - 4096) & RING_NR_PAGES) |
-		   (RING_NO_REPORT | RING_VALID));
-
-	/* We are using separate values as placeholders for mechanisms for
-	 * private backbuffer/depthbuffer usage.
-	 */
-	dev_priv->use_mi_batchbuffer_start = 0;
+		memset((void *)(dev_priv->ring.virtual_start), 0, dev_priv->ring.Size);
+		
+		I915_WRITE(LP_RING + RING_START, dev_priv->ring.Start);
+		I915_WRITE(LP_RING + RING_LEN,
+			   ((dev_priv->ring.Size - 4096) & RING_NR_PAGES) |
+			   (RING_NO_REPORT | RING_VALID));
+
+		/* We are using separate values as placeholders for mechanisms for
+		 * private backbuffer/depthbuffer usage.
+		 */
+		dev_priv->use_mi_batchbuffer_start = 0;
+		
+		/* Allow hardware batchbuffers unless told otherwise.
+		 */
+		dev_priv->allow_batchbuffer = 1;
+
+		/* Program Hardware Status Page */
+		if (!IS_G33(dev)) {
+			dev_priv->status_page_dmah = 
+				drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE, 0xffffffff);
+			
+			if (!dev_priv->status_page_dmah) {
+				dev->dev_private = (void *)dev_priv;
+				i915_dma_cleanup(dev);
+				DRM_ERROR("Can not allocate hardware status page\n");
+				return -ENOMEM;
+			}
+			dev_priv->hw_status_page = dev_priv->status_page_dmah->vaddr;
+			dev_priv->dma_status_page = dev_priv->status_page_dmah->busaddr;
+			
+			memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
+			
+			I915_WRITE(I915REG_HWS_PGA, dev_priv->dma_status_page);
+		}
+		DRM_DEBUG("Enabled hardware status page\n");
 
-	/* Allow hardware batchbuffers unless told otherwise.
-	 */
-	dev_priv->allow_batchbuffer = 1;
-
-	/* Program Hardware Status Page */
-	if (!IS_G33(dev)) {
-		dev_priv->status_page_dmah = 
-			drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE, 0xffffffff);
-
-		if (!dev_priv->status_page_dmah) {
-			dev->dev_private = (void *)dev_priv;
-			i915_dma_cleanup(dev);
-			DRM_ERROR("Can not allocate hardware status page\n");
-			return -ENOMEM;
+		dev_priv->wq = create_singlethread_workqueue("i915");
+		if (dev_priv == 0) {
+		  DRM_DEBUG("Error\n");
 		}
-		dev_priv->hw_status_page = dev_priv->status_page_dmah->vaddr;
-		dev_priv->dma_status_page = dev_priv->status_page_dmah->busaddr;
 
-		memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
+		intel_modeset_init(dev);
+		drm_initial_config(dev, false);
 
-		I915_WRITE(I915REG_HWS_PGA, dev_priv->dma_status_page);
-	}
-	DRM_DEBUG("Enabled hardware status page\n");
+		drm_mm_print(&dev->bm.man[DRM_BO_MEM_VRAM].manager, "VRAM");
+		drm_mm_print(&dev->bm.man[DRM_BO_MEM_TT].manager, "TT");
 
-	dev_priv->wq = create_singlethread_workqueue("i915");
-	if (dev_priv == 0) {
-		DRM_DEBUG("Error\n");
+		drm_irq_install(dev);
 	}
 
-
-	intel_modeset_init(dev);
-	drm_initial_config(dev, false);
-
-	drm_mm_print(&dev->bm.man[DRM_BO_MEM_VRAM].manager, "VRAM");
-	drm_mm_print(&dev->bm.man[DRM_BO_MEM_TT].manager, "TT");
-
-	drm_irq_install(dev);
-
 	return 0;
 }
 
@@ -262,7 +269,10 @@ int i915_driver_unload(struct drm_device *dev)
 
 	I915_WRITE(LP_RING + RING_LEN, 0);
 
-	intel_modeset_cleanup(dev);
+
+	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+		intel_modeset_cleanup(dev);
+	}
 
 #if 0
 	if (dev_priv->ring.virtual_start) {
@@ -298,25 +308,33 @@ int i915_driver_unload(struct drm_device *dev)
 		I915_WRITE(I915REG_HWS_PGA, 0x1ffff000);
 	}
 
-	drm_mem_reg_iounmap(dev, &dev_priv->ring_buffer->mem,
-			    dev_priv->ring.virtual_start);
+	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+		drm_mem_reg_iounmap(dev, &dev_priv->ring_buffer->mem,
+				    dev_priv->ring.virtual_start);
 
-	DRM_DEBUG("usage is %d\n", atomic_read(&dev_priv->ring_buffer->usage));
-	mutex_lock(&dev->struct_mutex);
-	drm_bo_usage_deref_locked(&dev_priv->ring_buffer);
+		DRM_DEBUG("usage is %d\n", atomic_read(&dev_priv->ring_buffer->usage));
+		mutex_lock(&dev->struct_mutex);
+		drm_bo_usage_deref_locked(&dev_priv->ring_buffer);
 
-	if (drm_bo_clean_mm(dev, DRM_BO_MEM_TT, 1)) {
-		DRM_ERROR("Memory manager type 3 not clean. "
-			  "Delaying takedown\n");
-	}
-	if (drm_bo_clean_mm(dev, DRM_BO_MEM_VRAM, 1)) {
-		DRM_ERROR("Memory manager type 3 not clean. "
-			  "Delaying takedown\n");
+		if (drm_bo_clean_mm(dev, DRM_BO_MEM_TT, 1)) {
+			DRM_ERROR("Memory manager type 3 not clean. "
+				  "Delaying takedown\n");
+		}
+		if (drm_bo_clean_mm(dev, DRM_BO_MEM_VRAM, 1)) {
+			DRM_ERROR("Memory manager type 3 not clean. "
+				  "Delaying takedown\n");
+		}
+		mutex_unlock(&dev->struct_mutex);
 	}
-	mutex_unlock(&dev->struct_mutex);
 
 	drm_bo_driver_finish(dev);
 
+#ifdef __linux__
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
+        intel_init_chipset_flush_compat(dev);
+#endif
+#endif
+
         DRM_DEBUG("%p\n", dev_priv->mmio_map);
         drm_rmmap(dev, dev_priv->mmio_map);
 
@@ -363,3 +381,23 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master)
 
 	master->driver_priv = NULL;
 }
+
+void i915_driver_preclose(struct drm_device * dev, struct drm_file *file_priv)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+	if (drm_core_check_feature(dev, DRIVER_MODESET))
+		i915_mem_release(dev, file_priv, dev_priv->agp_heap);
+}
+
+void i915_driver_lastclose(struct drm_device * dev)
+{
+	struct drm_i915_private *dev_priv = dev->dev_private;
+
+	if (drm_core_check_feature(dev, DRIVER_MODESET))
+		return;
+
+	if (dev_priv->agp_heap)
+		i915_mem_takedown(&(dev_priv->agp_heap));
+	
+	i915_dma_cleanup(dev);
+}
-- 
cgit v1.2.3


From 4dbf447f4305e3c2aa8914b5ccfc07d9bf8ef28e Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@panoply-rh.(none)>
Date: Wed, 5 Mar 2008 15:28:38 +1000
Subject: drm: fixup compat with old x.org drivers

---
 shared-core/i915_init.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index a2e08bc1..1f22d171 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -401,3 +401,12 @@ void i915_driver_lastclose(struct drm_device * dev)
 	
 	i915_dma_cleanup(dev);
 }
+
+int i915_driver_firstopen(struct drm_device *dev)
+{
+	if (drm_core_check_feature(dev, DRIVER_MODESET))
+		return 0;
+
+	drm_bo_driver_init(dev);
+	return 0;
+}
-- 
cgit v1.2.3


From cf28ca4212662c3c7e4bfbe51aee307ac539fb3d Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 7 Mar 2008 13:03:32 +1100
Subject: actually turn the irq off

---
 shared-core/i915_init.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 1f22d171..3d8a1dca 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -271,6 +271,7 @@ int i915_driver_unload(struct drm_device *dev)
 
 
 	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+		drm_irq_uninstall(dev);
 		intel_modeset_cleanup(dev);
 	}
 
-- 
cgit v1.2.3


From 52748d17923b7e501b707b950227864c0b64d8a1 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@panoply-rh.(none)>
Date: Tue, 11 Mar 2008 11:49:27 +1000
Subject: drm: hopefully fix cursors on 965

---
 shared-core/i915_init.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 3d8a1dca..274322e1 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -130,6 +130,14 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 	dev->types[8] = _DRM_STAT_SECONDARY;
 	dev->types[9] = _DRM_STAT_DMA;
 
+	if (IS_MOBILE(dev) || IS_I9XX(dev))
+		dev_priv->cursor_needs_physical = true;
+	else
+		dev_priv->cursor_needs_physical = false;
+
+	if (IS_I965G(dev) || IS_G33(dev))
+		dev_priv->cursor_needs_physical = false;
+
 	if (IS_I9XX(dev)) {
 		pci_read_config_dword(dev->pdev, 0x5C, &dev_priv->stolen_base);
 		DRM_DEBUG("stolen base %p\n", (void*)dev_priv->stolen_base);
-- 
cgit v1.2.3


From 5a7f4b3074d5cda909fc7329bc91da11d89181e1 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@panoply-rh.(none)>
Date: Tue, 11 Mar 2008 16:05:26 +1000
Subject: drm: fix oops on unload.

if we are unloading the module, there is no master so therefore no lock
---
 shared-core/i915_init.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 274322e1..fa2fc3da 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -277,7 +277,6 @@ int i915_driver_unload(struct drm_device *dev)
 
 	I915_WRITE(LP_RING + RING_LEN, 0);
 
-
 	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
 		drm_irq_uninstall(dev);
 		intel_modeset_cleanup(dev);
@@ -291,7 +290,6 @@ int i915_driver_unload(struct drm_device *dev)
 	if (dev_priv->sarea_kmap.virtual) {
 		drm_bo_kunmap(&dev_priv->sarea_kmap);
 		dev_priv->sarea_kmap.virtual = NULL;
-		dev->primary->master->lock.hw_lock = NULL;
 		dev->sigdata.lock = NULL;
 	}
 
-- 
cgit v1.2.3


From 2d0411cb7544ea45b5879d4f454cb9ee3c9ff5fb Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@panoply-rh.(none)>
Date: Mon, 17 Mar 2008 16:34:15 +1000
Subject: i915: safety check the sarea map still exists

---
 shared-core/i915_init.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index fa2fc3da..a76acb4e 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -383,7 +383,9 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master)
 	if (!master_priv)
 		return;
 
-        drm_rmmap(dev, master_priv->sarea);
+	if (master_priv->sarea)
+		drm_rmmap(dev, master_priv->sarea);
+		
 	drm_free(master_priv, sizeof(*master_priv), DRM_MEM_DRIVER);
 
 	master->driver_priv = NULL;
-- 
cgit v1.2.3


From a2edd07f20df67e741026097c5d46f12296d7c9d Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@nietzche.virtuousgeek.org>
Date: Tue, 8 Apr 2008 12:44:52 -0700
Subject: Add devname in modeset case

If the driver is 'modeset' enabled, it'll register it's interrupt
handler at load time.  Set the devname in this case so that
/proc/interrupts makes sense.
---
 shared-core/i915_init.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index a76acb4e..ce6f1656 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -265,6 +265,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 		drm_mm_print(&dev->bm.man[DRM_BO_MEM_VRAM].manager, "VRAM");
 		drm_mm_print(&dev->bm.man[DRM_BO_MEM_TT].manager, "TT");
 
+		dev->devname = DRIVER_NAME;
 		drm_irq_install(dev);
 	}
 
-- 
cgit v1.2.3


From 8dc4d4fa1f1394c2faed89760e1183287577fed3 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Tue, 22 Apr 2008 18:41:28 -0700
Subject: i915: allocate devname at init time

Since it'll be freed at unload time, we should alloc devname rather than
pointing to the DRIVER_NAME string.
---
 shared-core/i915_init.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index ce6f1656..53574eb7 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -265,7 +265,10 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 		drm_mm_print(&dev->bm.man[DRM_BO_MEM_VRAM].manager, "VRAM");
 		drm_mm_print(&dev->bm.man[DRM_BO_MEM_TT].manager, "TT");
 
-		dev->devname = DRIVER_NAME;
+		dev->devname = kstrdup(DRIVER_NAME, GFP_KERNEL);
+		if (!dev->devname)
+			return -ENOMEM;
+
 		drm_irq_install(dev);
 	}
 
-- 
cgit v1.2.3


From 12725a37af691345e74fe22d53300abec2581852 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Fri, 9 May 2008 14:19:00 -0700
Subject: i915:  add basic VBT support

Map the VBIOS (and therefore VBT) at init time for use by various output
initialization routines.
---
 shared-core/i915_init.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 53574eb7..8824b959 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -12,6 +12,7 @@
 #include "drm_sarea.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
+#include "intel_bios.h"
 
 /**
  * i915_probe_agp - get AGP bootup configuration
@@ -259,6 +260,12 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 		  DRM_DEBUG("Error\n");
 		}
 
+		ret = intel_find_bios(dev);
+		if (ret) {
+			DRM_ERROR("failed to find VBT\n");
+			return -ENODEV;
+		}
+
 		intel_modeset_init(dev);
 		drm_initial_config(dev, false);
 
-- 
cgit v1.2.3


From dce34421947d1828ff76c001281107e937e307d4 Mon Sep 17 00:00:00 2001
From: Hong Liu <hong.liu@intel.com>
Date: Fri, 9 May 2008 10:08:36 +0800
Subject: fixup i915 workqueue handling when modeset=1

Fixup workqueue creation error handling and make sure we destroy the queue on
unload.
---
 shared-core/i915_init.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 8824b959..b9e7e17b 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -256,7 +256,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 		DRM_DEBUG("Enabled hardware status page\n");
 
 		dev_priv->wq = create_singlethread_workqueue("i915");
-		if (dev_priv == 0) {
+		if (dev_priv->wq == 0) {
 		  DRM_DEBUG("Error\n");
 		}
 
@@ -291,6 +291,7 @@ int i915_driver_unload(struct drm_device *dev)
 	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
 		drm_irq_uninstall(dev);
 		intel_modeset_cleanup(dev);
+		destroy_workqueue(dev_priv->wq);
 	}
 
 #if 0
-- 
cgit v1.2.3


From af60d87869303d7f17352c82d2fb1cebb9a8f7ff Mon Sep 17 00:00:00 2001
From: Hong Liu <hong.liu@intel.com>
Date: Mon, 12 May 2008 14:38:49 +0800
Subject: fix G33 hardware status page in modeset

We need to alloc a hw status page bo for G33 if modeset is enabled since the 2D
driver can't alloc gfx memory when working in drm modeset.
---
 shared-core/i915_init.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index b9e7e17b..7183f81f 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -252,6 +252,38 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 			memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
 			
 			I915_WRITE(I915REG_HWS_PGA, dev_priv->dma_status_page);
+		} else {
+			size = 4 * 1024;
+			ret = drm_buffer_object_create(dev, size,
+					drm_bo_type_kernel,
+					DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
+					DRM_BO_FLAG_MEM_VRAM |
+					DRM_BO_FLAG_NO_EVICT,
+					DRM_BO_HINT_DONT_FENCE, 0x1, 0,
+					&dev_priv->hws_bo);
+			if (ret < 0) {
+				DRM_ERROR("Unable to allocate or pin ring buffer\n");
+				return -EINVAL;
+			}
+			dev_priv->status_gfx_addr =
+				dev_priv->hws_bo->offset & (0x1ffff << 12);
+			dev_priv->hws_map.offset = dev->agp->base +
+				dev_priv->hws_bo->offset;
+			dev_priv->hws_map.size = size;
+			dev_priv->hws_map.type = 0;
+			dev_priv->hws_map.flags = 0;
+			dev_priv->hws_map.mtrr = 0;
+
+			drm_core_ioremap(&dev_priv->hws_map, dev);
+			if (dev_priv->hws_map.handle == NULL) {
+				dev_priv->status_gfx_addr = 0;
+				DRM_ERROR("can not ioremap virtual addr"
+					  " for G33 hw status page\n");
+				return -ENOMEM;
+			}
+			dev_priv->hw_status_page = dev_priv->hws_map.handle;
+			memset(dev_priv->hw_status_page, 0, size);
+			I915_WRITE(I915REG_HWS_PGA, dev_priv->status_gfx_addr);
 		}
 		DRM_DEBUG("Enabled hardware status page\n");
 
@@ -324,6 +356,7 @@ int i915_driver_unload(struct drm_device *dev)
 	if (dev_priv->status_gfx_addr) {
 		dev_priv->status_gfx_addr = 0;
 		drm_core_ioremapfree(&dev_priv->hws_map, dev);
+		drm_bo_usage_deref_unlocked(&dev_priv->hws_bo);
 		I915_WRITE(I915REG_HWS_PGA, 0x1ffff000);
 	}
 
-- 
cgit v1.2.3


From f1b9bbe2b8f2339359afa39bf27702eca6f6c975 Mon Sep 17 00:00:00 2001
From: Hong Liu <hong.liu@intel.com>
Date: Mon, 12 May 2008 16:14:38 +0800
Subject: modeset init code cleanup

moving modeset init code into one function and correct error
handling druing i915 init
---
 shared-core/i915_init.c | 331 ++++++++++++++++++++++++++++--------------------
 1 file changed, 197 insertions(+), 134 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 7183f81f..22577c7f 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -99,6 +99,181 @@ int i915_probe_agp(struct pci_dev *pdev, unsigned long *aperture_size,
 	return 0;
 }
 
+int i915_load_modeset_init(struct drm_device *dev)
+{
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	unsigned long agp_size, prealloc_size;
+	int size, ret = 0;
+
+	i915_probe_agp(dev->pdev, &agp_size, &prealloc_size);
+	printk("setting up %ld bytes of VRAM space\n", prealloc_size);
+	printk("setting up %ld bytes of TT space\n", (agp_size - prealloc_size));
+
+	drm_bo_init_mm(dev, DRM_BO_MEM_VRAM, 0, prealloc_size >> PAGE_SHIFT, 1);
+	drm_bo_init_mm(dev, DRM_BO_MEM_TT, prealloc_size >> PAGE_SHIFT,
+		       (agp_size - prealloc_size) >> PAGE_SHIFT, 1);
+	I915_WRITE(LP_RING + RING_LEN, 0);
+	I915_WRITE(LP_RING + RING_HEAD, 0);
+	I915_WRITE(LP_RING + RING_TAIL, 0);
+
+	size = PRIMARY_RINGBUFFER_SIZE;
+	ret = drm_buffer_object_create(dev, size, drm_bo_type_kernel,
+			DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
+			DRM_BO_FLAG_MEM_VRAM |
+			DRM_BO_FLAG_NO_EVICT,
+			DRM_BO_HINT_DONT_FENCE, 0x1, 0,
+			&dev_priv->ring_buffer);
+	if (ret < 0) {
+		DRM_ERROR("Unable to allocate or pin ring buffer\n");
+		goto clean_mm;
+	}
+
+	/* remap the buffer object properly */
+	dev_priv->ring.Start = dev_priv->ring_buffer->offset;
+	dev_priv->ring.End = dev_priv->ring.Start + size;
+	dev_priv->ring.Size = size;
+	dev_priv->ring.tail_mask = dev_priv->ring.Size - 1;
+
+	/* FIXME: need wrapper with PCI mem checks */
+	ret = drm_mem_reg_ioremap(dev, &dev_priv->ring_buffer->mem,
+				  (void **) &dev_priv->ring.virtual_start);
+	if (ret) {
+		DRM_ERROR("error mapping ring buffer: %d\n", ret);
+		goto destroy_ringbuffer;
+	}
+
+	DRM_DEBUG("ring start %08lX, %p, %08lX\n", dev_priv->ring.Start,
+			dev_priv->ring.virtual_start, dev_priv->ring.Size);
+
+	memset((void *)(dev_priv->ring.virtual_start), 0, dev_priv->ring.Size);
+	I915_WRITE(LP_RING + RING_START, dev_priv->ring.Start);
+	I915_WRITE(LP_RING + RING_LEN,
+			((dev_priv->ring.Size - 4096) & RING_NR_PAGES) |
+			(RING_NO_REPORT | RING_VALID));
+
+	/* We are using separate values as placeholders for mechanisms for
+	 * private backbuffer/depthbuffer usage.
+	 */
+	dev_priv->use_mi_batchbuffer_start = 0;
+
+	/* Allow hardware batchbuffers unless told otherwise.
+	 */
+	dev_priv->allow_batchbuffer = 1;
+
+	/* Program Hardware Status Page */
+	if (!IS_G33(dev)) {
+		dev_priv->status_page_dmah = 
+			drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE, 0xffffffff);
+
+		if (!dev_priv->status_page_dmah) {
+			DRM_ERROR("Can not allocate hardware status page\n");
+			ret = -ENOMEM;
+			goto destroy_ringbuffer;
+		}
+		dev_priv->hw_status_page = dev_priv->status_page_dmah->vaddr;
+		dev_priv->dma_status_page = dev_priv->status_page_dmah->busaddr;
+
+		memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
+
+		I915_WRITE(I915REG_HWS_PGA, dev_priv->dma_status_page);
+	} else {
+		size = 4 * 1024;
+		ret = drm_buffer_object_create(dev, size,
+				drm_bo_type_kernel,
+				DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
+				DRM_BO_FLAG_MEM_VRAM |
+				DRM_BO_FLAG_NO_EVICT,
+				DRM_BO_HINT_DONT_FENCE, 0x1, 0,
+				&dev_priv->hws_bo);
+		if (ret < 0) {
+			DRM_ERROR("Unable to allocate or pin hw status page\n");
+			ret = -EINVAL;
+			goto destroy_ringbuffer;
+		}
+
+		dev_priv->status_gfx_addr =
+			dev_priv->hws_bo->offset & (0x1ffff << 12);
+		dev_priv->hws_map.offset = dev->agp->base +
+			dev_priv->hws_bo->offset;
+		dev_priv->hws_map.size = size;
+		dev_priv->hws_map.type= 0;
+		dev_priv->hws_map.flags= 0;
+		dev_priv->hws_map.mtrr = 0;
+
+		drm_core_ioremap(&dev_priv->hws_map, dev);
+		if (dev_priv->hws_map.handle == NULL) {
+			dev_priv->status_gfx_addr = 0;
+			DRM_ERROR("can not ioremap virtual addr for"
+					"G33 hw status page\n");
+			ret = -ENOMEM;
+			goto destroy_hws;
+		}
+		dev_priv->hw_status_page = dev_priv->hws_map.handle;
+		memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
+		I915_WRITE(I915REG_HWS_PGA, dev_priv->status_gfx_addr);
+	}
+	DRM_DEBUG("Enabled hardware status page\n");
+
+	dev_priv->wq = create_singlethread_workqueue("i915");
+	if (dev_priv->wq == 0) {
+		DRM_DEBUG("Error\n");
+		ret = -EINVAL;
+		goto destroy_hws;
+	}
+
+	ret = intel_find_bios(dev);
+	if (ret) {
+		DRM_ERROR("failed to find VBT\n");
+		ret = -ENODEV;
+		goto destroy_wq;
+	}
+
+	intel_modeset_init(dev);
+	drm_initial_config(dev, false);
+
+	drm_mm_print(&dev->bm.man[DRM_BO_MEM_VRAM].manager, "VRAM");
+	drm_mm_print(&dev->bm.man[DRM_BO_MEM_TT].manager, "TT");
+
+	dev->devname = kstrdup(DRIVER_NAME, GFP_KERNEL);
+	if (!dev->devname) {
+		ret = -ENOMEM;
+		goto modeset_cleanup;
+	}
+
+	ret = drm_irq_install(dev);
+	if (ret) {
+		kfree(dev->devname);
+		goto modeset_cleanup;
+	}
+	return 0;
+
+modeset_cleanup:
+	intel_modeset_cleanup(dev);
+destroy_wq:
+	destroy_workqueue(dev_priv->wq);
+destroy_hws:
+	if (!IS_G33(dev)) {
+		if (dev_priv->status_page_dmah)
+			drm_pci_free(dev, dev_priv->status_page_dmah);
+	} else {
+		if (dev_priv->hws_map.handle)
+			drm_core_ioremapfree(&dev_priv->hws_map, dev);
+		if (dev_priv->hws_bo)
+			drm_bo_usage_deref_unlocked(&dev_priv->hws_bo);
+	}
+	I915_WRITE(I915REG_HWS_PGA, 0x1ffff000);
+destroy_ringbuffer:
+	if (dev_priv->ring.virtual_start)
+		drm_mem_reg_iounmap(dev, &dev_priv->ring_buffer->mem,
+				    dev_priv->ring.virtual_start);
+	if (dev_priv->ring_buffer)
+		drm_bo_usage_deref_unlocked(&dev_priv->ring_buffer);
+clean_mm:
+	drm_bo_clean_mm(dev, DRM_BO_MEM_VRAM, 1);
+	drm_bo_clean_mm(dev, DRM_BO_MEM_TT, 1);
+	return ret;
+}
+
 /**
  * i915_driver_load - setup chip and create an initial config
  * @dev: DRM device
@@ -113,8 +288,7 @@ int i915_probe_agp(struct pci_dev *pdev, unsigned long *aperture_size,
 int i915_driver_load(struct drm_device *dev, unsigned long flags)
 {
 	struct drm_i915_private *dev_priv;
-	unsigned long agp_size, prealloc_size;
-	int size, ret;
+	int ret = 0;
 
 	dev_priv = drm_alloc(sizeof(struct drm_i915_private), DRM_MEM_DRIVER);
 	if (dev_priv == NULL)
@@ -156,16 +330,18 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 			drm_get_resource_start(dev, 0) & 0xff000000;
 	} else {
 		DRM_ERROR("Unable to find MMIO registers\n");
-		return -ENODEV;
+		ret = -ENODEV;
+		goto free_priv;
 	}
 
 	DRM_DEBUG("fb_base: 0x%08lx\n", dev->mode_config.fb_base);
 
 	ret = drm_addmap(dev, dev_priv->mmiobase, dev_priv->mmiolen,
-			 _DRM_REGISTERS, _DRM_KERNEL|_DRM_READ_ONLY|_DRM_DRIVER, &dev_priv->mmio_map);
+			 _DRM_REGISTERS, _DRM_KERNEL|_DRM_READ_ONLY|_DRM_DRIVER,
+			 &dev_priv->mmio_map);
 	if (ret != 0) {
 		DRM_ERROR("Cannot add mapping for MMIO registers\n");
-		return ret;
+		goto free_priv;
 	}
 
 #ifdef __linux__
@@ -177,141 +353,28 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 	/*
 	 * Initialize the memory manager for local and AGP space
 	 */
-	drm_bo_driver_init(dev);
+	ret = drm_bo_driver_init(dev);
+	if (ret) {
+		DRM_ERROR("fail to init memory manager for local & AGP space\n");
+		goto out_rmmap;
+	}
 
 	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
-		i915_probe_agp(dev->pdev, &agp_size, &prealloc_size);
-		printk("setting up %ld bytes of VRAM space\n", prealloc_size);
-		printk("setting up %ld bytes of TT space\n", (agp_size - prealloc_size));
-		drm_bo_init_mm(dev, DRM_BO_MEM_VRAM, 0, prealloc_size >> PAGE_SHIFT, 1);
-		drm_bo_init_mm(dev, DRM_BO_MEM_TT, prealloc_size >> PAGE_SHIFT, (agp_size - prealloc_size) >> PAGE_SHIFT, 1);
-		
-		I915_WRITE(LP_RING + RING_LEN, 0);
-		I915_WRITE(LP_RING + RING_HEAD, 0);
-		I915_WRITE(LP_RING + RING_TAIL, 0);
-
-		size = PRIMARY_RINGBUFFER_SIZE;
-		ret = drm_buffer_object_create(dev, size, drm_bo_type_kernel,
-					       DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
-					       DRM_BO_FLAG_MEM_VRAM |
-					       DRM_BO_FLAG_NO_EVICT,
-					       DRM_BO_HINT_DONT_FENCE, 0x1, 0,
-					       &dev_priv->ring_buffer);
+		ret = i915_load_modeset_init(dev);
 		if (ret < 0) {
-			DRM_ERROR("Unable to allocate or pin ring buffer\n");
-			return -EINVAL;
+			DRM_ERROR("failed to init modeset\n");
+			goto driver_fini;
 		}
-		
-		/* remap the buffer object properly */
-		dev_priv->ring.Start = dev_priv->ring_buffer->offset;
-		dev_priv->ring.End = dev_priv->ring.Start + size;
-		dev_priv->ring.Size = size;
-		dev_priv->ring.tail_mask = dev_priv->ring.Size - 1;
-
-		/* FIXME: need wrapper with PCI mem checks */
-		ret = drm_mem_reg_ioremap(dev, &dev_priv->ring_buffer->mem,
-					  (void **) &dev_priv->ring.virtual_start);
-		if (ret)
-			DRM_ERROR("error mapping ring buffer: %d\n", ret);
-		
-		DRM_DEBUG("ring start %08lX, %p, %08lX\n", dev_priv->ring.Start,
-			  dev_priv->ring.virtual_start, dev_priv->ring.Size);
-
-	//
-
-		memset((void *)(dev_priv->ring.virtual_start), 0, dev_priv->ring.Size);
-		
-		I915_WRITE(LP_RING + RING_START, dev_priv->ring.Start);
-		I915_WRITE(LP_RING + RING_LEN,
-			   ((dev_priv->ring.Size - 4096) & RING_NR_PAGES) |
-			   (RING_NO_REPORT | RING_VALID));
-
-		/* We are using separate values as placeholders for mechanisms for
-		 * private backbuffer/depthbuffer usage.
-		 */
-		dev_priv->use_mi_batchbuffer_start = 0;
-		
-		/* Allow hardware batchbuffers unless told otherwise.
-		 */
-		dev_priv->allow_batchbuffer = 1;
-
-		/* Program Hardware Status Page */
-		if (!IS_G33(dev)) {
-			dev_priv->status_page_dmah = 
-				drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE, 0xffffffff);
-			
-			if (!dev_priv->status_page_dmah) {
-				dev->dev_private = (void *)dev_priv;
-				i915_dma_cleanup(dev);
-				DRM_ERROR("Can not allocate hardware status page\n");
-				return -ENOMEM;
-			}
-			dev_priv->hw_status_page = dev_priv->status_page_dmah->vaddr;
-			dev_priv->dma_status_page = dev_priv->status_page_dmah->busaddr;
-			
-			memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
-			
-			I915_WRITE(I915REG_HWS_PGA, dev_priv->dma_status_page);
-		} else {
-			size = 4 * 1024;
-			ret = drm_buffer_object_create(dev, size,
-					drm_bo_type_kernel,
-					DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
-					DRM_BO_FLAG_MEM_VRAM |
-					DRM_BO_FLAG_NO_EVICT,
-					DRM_BO_HINT_DONT_FENCE, 0x1, 0,
-					&dev_priv->hws_bo);
-			if (ret < 0) {
-				DRM_ERROR("Unable to allocate or pin ring buffer\n");
-				return -EINVAL;
-			}
-			dev_priv->status_gfx_addr =
-				dev_priv->hws_bo->offset & (0x1ffff << 12);
-			dev_priv->hws_map.offset = dev->agp->base +
-				dev_priv->hws_bo->offset;
-			dev_priv->hws_map.size = size;
-			dev_priv->hws_map.type = 0;
-			dev_priv->hws_map.flags = 0;
-			dev_priv->hws_map.mtrr = 0;
-
-			drm_core_ioremap(&dev_priv->hws_map, dev);
-			if (dev_priv->hws_map.handle == NULL) {
-				dev_priv->status_gfx_addr = 0;
-				DRM_ERROR("can not ioremap virtual addr"
-					  " for G33 hw status page\n");
-				return -ENOMEM;
-			}
-			dev_priv->hw_status_page = dev_priv->hws_map.handle;
-			memset(dev_priv->hw_status_page, 0, size);
-			I915_WRITE(I915REG_HWS_PGA, dev_priv->status_gfx_addr);
-		}
-		DRM_DEBUG("Enabled hardware status page\n");
-
-		dev_priv->wq = create_singlethread_workqueue("i915");
-		if (dev_priv->wq == 0) {
-		  DRM_DEBUG("Error\n");
-		}
-
-		ret = intel_find_bios(dev);
-		if (ret) {
-			DRM_ERROR("failed to find VBT\n");
-			return -ENODEV;
-		}
-
-		intel_modeset_init(dev);
-		drm_initial_config(dev, false);
-
-		drm_mm_print(&dev->bm.man[DRM_BO_MEM_VRAM].manager, "VRAM");
-		drm_mm_print(&dev->bm.man[DRM_BO_MEM_TT].manager, "TT");
-
-		dev->devname = kstrdup(DRIVER_NAME, GFP_KERNEL);
-		if (!dev->devname)
-			return -ENOMEM;
-
-		drm_irq_install(dev);
 	}
-
 	return 0;
+
+driver_fini:
+	drm_bo_driver_finish(dev);
+out_rmmap:
+	drm_rmmap(dev, dev_priv->mmio_map);
+free_priv:
+	drm_free(dev_priv, sizeof(struct drm_i915_private), DRM_MEM_DRIVER);
+	return ret;
 }
 
 int i915_driver_unload(struct drm_device *dev)
-- 
cgit v1.2.3


From 5be53a0881c5248146c585015bf60bb2958773af Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Tue, 13 May 2008 09:24:47 +0200
Subject: i915: execbuf now works without i915_dma_init being called

---
 shared-core/i915_init.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 22577c7f..c0ca226a 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -155,10 +155,14 @@ int i915_load_modeset_init(struct drm_device *dev)
 	 * private backbuffer/depthbuffer usage.
 	 */
 	dev_priv->use_mi_batchbuffer_start = 0;
+	if (IS_I965G(dev)) /* 965 doesn't support older method */
+		dev_priv->use_mi_batchbuffer_start = 1;
 
 	/* Allow hardware batchbuffers unless told otherwise.
 	 */
 	dev_priv->allow_batchbuffer = 1;
+	dev_priv->max_validate_buffers = I915_MAX_VALIDATE_BUFFERS;
+	mutex_init(&dev_priv->cmdbuf_mutex);
 
 	/* Program Hardware Status Page */
 	if (!IS_G33(dev)) {
-- 
cgit v1.2.3


From ee631e1b8604a176b9118396998ce5bfc6475dae Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@nietzche.virtuousgeek.org>
Date: Tue, 13 May 2008 14:44:17 -0700
Subject: i915: register definition & header file cleanup

It would be nice if one day the DRM driver was the canonical source for
register definitions and core macros.  To that end, this patch cleans
things up quite a bit, removing redundant definitions (some with
different names referring to the same register) and generally tidying up
the header file.
---
 shared-core/i915_init.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 22577c7f..0bbad65e 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -112,9 +112,9 @@ int i915_load_modeset_init(struct drm_device *dev)
 	drm_bo_init_mm(dev, DRM_BO_MEM_VRAM, 0, prealloc_size >> PAGE_SHIFT, 1);
 	drm_bo_init_mm(dev, DRM_BO_MEM_TT, prealloc_size >> PAGE_SHIFT,
 		       (agp_size - prealloc_size) >> PAGE_SHIFT, 1);
-	I915_WRITE(LP_RING + RING_LEN, 0);
-	I915_WRITE(LP_RING + RING_HEAD, 0);
-	I915_WRITE(LP_RING + RING_TAIL, 0);
+	I915_WRITE(PRB0_CTL, 0);
+	I915_WRITE(PRB0_HEAD, 0);
+	I915_WRITE(PRB0_TAIL, 0);
 
 	size = PRIMARY_RINGBUFFER_SIZE;
 	ret = drm_buffer_object_create(dev, size, drm_bo_type_kernel,
@@ -146,10 +146,9 @@ int i915_load_modeset_init(struct drm_device *dev)
 			dev_priv->ring.virtual_start, dev_priv->ring.Size);
 
 	memset((void *)(dev_priv->ring.virtual_start), 0, dev_priv->ring.Size);
-	I915_WRITE(LP_RING + RING_START, dev_priv->ring.Start);
-	I915_WRITE(LP_RING + RING_LEN,
-			((dev_priv->ring.Size - 4096) & RING_NR_PAGES) |
-			(RING_NO_REPORT | RING_VALID));
+	I915_WRITE(PRB0_START, dev_priv->ring.Start);
+	I915_WRITE(PRB0_CTL, ((dev_priv->ring.Size - 4096) & RING_NR_PAGES) |
+		   (RING_NO_REPORT | RING_VALID));
 
 	/* We are using separate values as placeholders for mechanisms for
 	 * private backbuffer/depthbuffer usage.
@@ -175,7 +174,7 @@ int i915_load_modeset_init(struct drm_device *dev)
 
 		memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
 
-		I915_WRITE(I915REG_HWS_PGA, dev_priv->dma_status_page);
+		I915_WRITE(HWS_PGA, dev_priv->dma_status_page);
 	} else {
 		size = 4 * 1024;
 		ret = drm_buffer_object_create(dev, size,
@@ -210,7 +209,7 @@ int i915_load_modeset_init(struct drm_device *dev)
 		}
 		dev_priv->hw_status_page = dev_priv->hws_map.handle;
 		memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
-		I915_WRITE(I915REG_HWS_PGA, dev_priv->status_gfx_addr);
+		I915_WRITE(HWS_PGA, dev_priv->status_gfx_addr);
 	}
 	DRM_DEBUG("Enabled hardware status page\n");
 
@@ -261,7 +260,7 @@ destroy_hws:
 		if (dev_priv->hws_bo)
 			drm_bo_usage_deref_unlocked(&dev_priv->hws_bo);
 	}
-	I915_WRITE(I915REG_HWS_PGA, 0x1ffff000);
+	I915_WRITE(HWS_PGA, 0x1ffff000);
 destroy_ringbuffer:
 	if (dev_priv->ring.virtual_start)
 		drm_mem_reg_iounmap(dev, &dev_priv->ring_buffer->mem,
@@ -381,7 +380,7 @@ int i915_driver_unload(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
 
-	I915_WRITE(LP_RING + RING_LEN, 0);
+	I915_WRITE(PRB0_CTL, 0);
 
 	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
 		drm_irq_uninstall(dev);
@@ -413,14 +412,14 @@ int i915_driver_unload(struct drm_device *dev)
 		dev_priv->hw_status_page = NULL;
 		dev_priv->dma_status_page = 0;
 		/* Need to rewrite hardware status page */
-		I915_WRITE(I915REG_HWS_PGA, 0x1ffff000);
+		I915_WRITE(HWS_PGA, 0x1ffff000);
 	}
 
 	if (dev_priv->status_gfx_addr) {
 		dev_priv->status_gfx_addr = 0;
 		drm_core_ioremapfree(&dev_priv->hws_map, dev);
 		drm_bo_usage_deref_unlocked(&dev_priv->hws_bo);
-		I915_WRITE(I915REG_HWS_PGA, 0x1ffff000);
+		I915_WRITE(HWS_PGA, 0x1ffff000);
 	}
 
 	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
-- 
cgit v1.2.3


From e8320a716d97504d91299d20d640b847c86e4b17 Mon Sep 17 00:00:00 2001
From: Hong Liu <hong.liu@intel.com>
Date: Mon, 19 May 2008 17:06:38 +0800
Subject: i915: init bo mm at driver init only when modeset=1

To avoid bo memory manager being inited twice, it will be called
at firstopen when modeset is not enabled.
---
 shared-core/i915_init.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 98908a50..f5fe5ba4 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -353,16 +353,17 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 #endif
 #endif
 
-	/*
-	 * Initialize the memory manager for local and AGP space
-	 */
-	ret = drm_bo_driver_init(dev);
-	if (ret) {
-		DRM_ERROR("fail to init memory manager for local & AGP space\n");
-		goto out_rmmap;
-	}
-
 	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+		/*
+		 * Initialize the memory manager for local and AGP space
+		 */
+		ret = drm_bo_driver_init(dev);
+		if (ret) {
+			DRM_ERROR("fail to init memory manager for "
+				  "local & AGP space\n");
+			goto out_rmmap;
+		}
+
 		ret = i915_load_modeset_init(dev);
 		if (ret < 0) {
 			DRM_ERROR("failed to init modeset\n");
-- 
cgit v1.2.3


From 9fc4ea5c00dfb91ebff893fb5092e768155cc2e2 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Fri, 23 May 2008 18:42:47 -0700
Subject: i915: do a better job of parsing VBIOS data

Add code to get panel modes from the VBIOS if present and check whether certain
outputs exist.  Should make our display detection code a little more robust.
---
 shared-core/i915_init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index f5fe5ba4..bda15e01 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -224,9 +224,9 @@ int i915_load_modeset_init(struct drm_device *dev)
 		goto destroy_hws;
 	}
 
-	ret = intel_find_bios(dev);
+	ret = intel_init_bios(dev);
 	if (ret) {
-		DRM_ERROR("failed to find VBT\n");
+		DRM_ERROR("failed to find VBIOS tables\n");
 		ret = -ENODEV;
 		goto destroy_wq;
 	}
-- 
cgit v1.2.3


From df8cd54286fbae5903d8ede390ec4a11cb6c4b6c Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 29 May 2008 14:02:14 +1000
Subject: modesetting: reorganise code into core and helper functions.

This splits a lot of the core modesetting code out into a file of
helper functions, that are only called from themselves and/or the driver.

The driver gets called into more often or can call these functions from itself
if it is a helper using driver.

I've broken framebuffer resize doing this but I didn't like the API for that
in any case.
---
 shared-core/i915_init.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index bda15e01..f03f8949 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -13,6 +13,7 @@
 #include "i915_drm.h"
 #include "i915_drv.h"
 #include "intel_bios.h"
+#include "intel_drv.h"
 
 /**
  * i915_probe_agp - get AGP bootup configuration
@@ -232,7 +233,7 @@ int i915_load_modeset_init(struct drm_device *dev)
 	}
 
 	intel_modeset_init(dev);
-	drm_initial_config(dev, false);
+	drm_helper_initial_config(dev, false);
 
 	drm_mm_print(&dev->bm.man[DRM_BO_MEM_VRAM].manager, "VRAM");
 	drm_mm_print(&dev->bm.man[DRM_BO_MEM_TT].manager, "TT");
-- 
cgit v1.2.3


From c2fc142ea7e9dd651702773efbc9c3366f977aa6 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Fri, 6 Jun 2008 21:54:38 +0100
Subject:     [intel] remove settable use_mi_batchbuffer_start

    The driver can know what hardware requires MI_BATCH_BUFFER vs
    MI_BATCH_BUFFER_START; there's no reason to let user mode configure this.
---
 shared-core/i915_init.c | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index f03f8949..f2c07fc6 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -151,13 +151,6 @@ int i915_load_modeset_init(struct drm_device *dev)
 	I915_WRITE(PRB0_CTL, ((dev_priv->ring.Size - 4096) & RING_NR_PAGES) |
 		   (RING_NO_REPORT | RING_VALID));
 
-	/* We are using separate values as placeholders for mechanisms for
-	 * private backbuffer/depthbuffer usage.
-	 */
-	dev_priv->use_mi_batchbuffer_start = 0;
-	if (IS_I965G(dev)) /* 965 doesn't support older method */
-		dev_priv->use_mi_batchbuffer_start = 1;
-
 	/* Allow hardware batchbuffers unless told otherwise.
 	 */
 	dev_priv->allow_batchbuffer = 1;
-- 
cgit v1.2.3


From 4a2e29bf9982165deeeabb5c585fc0a8a659f380 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Wed, 11 Jun 2008 15:59:01 -0700
Subject: Use GEM in modesetting

Use GEM for ring buffer setup and framebuffer allocation.  This means reworking
the hardware status page stuff a bit (just use the basic range allocator for
vram for now) and #ifdef'ing out the TTM & DRI2 code.  Works well enough to
load/unload several times and display fbcon on my T61 (though there's still
some unexplained console corruption).
---
 shared-core/i915_init.c | 193 +++++++++++++++++++++++-------------------------
 1 file changed, 92 insertions(+), 101 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index ba02f485..3f310770 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -100,24 +100,11 @@ int i915_probe_agp(struct pci_dev *pdev, unsigned long *aperture_size,
 	return 0;
 }
 
-int i915_load_modeset_init(struct drm_device *dev)
+static int i915_init_hwstatus(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
-	unsigned long agp_size, prealloc_size;
-	int size, ret = 0;
-
-	i915_probe_agp(dev->pdev, &agp_size, &prealloc_size);
-	printk("setting up %ld bytes of VRAM space\n", prealloc_size);
-	printk("setting up %ld bytes of TT space\n", (agp_size - prealloc_size));
-	ret = i915_gem_init_ringbuffer(dev);
-	if (ret)
-		goto out;
-
-	/* Allow hardware batchbuffers unless told otherwise.
-	 */
-	dev_priv->allow_batchbuffer = 1;
-	dev_priv->max_validate_buffers = I915_MAX_VALIDATE_BUFFERS;
-	mutex_init(&dev_priv->cmdbuf_mutex);
+	struct drm_memrange_node *free_space;
+	int ret = 0;
 
 	/* Program Hardware Status Page */
 	if (!IS_G33(dev)) {
@@ -127,52 +114,105 @@ int i915_load_modeset_init(struct drm_device *dev)
 		if (!dev_priv->status_page_dmah) {
 			DRM_ERROR("Can not allocate hardware status page\n");
 			ret = -ENOMEM;
-			goto destroy_ringbuffer;
+			goto out;
 		}
-		dev_priv->hw_status_page = dev_priv->status_page_dmah->vaddr;
+		dev_priv->hws_vaddr = dev_priv->status_page_dmah->vaddr;
 		dev_priv->dma_status_page = dev_priv->status_page_dmah->busaddr;
 
-		memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
-
 		I915_WRITE(HWS_PGA, dev_priv->dma_status_page);
 	} else {
-		size = 4 * 1024;
-		ret = drm_buffer_object_create(dev, size,
-				drm_bo_type_kernel,
-				DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
-				DRM_BO_FLAG_MEM_VRAM |
-				DRM_BO_FLAG_NO_EVICT,
-				DRM_BO_HINT_DONT_FENCE, 0x1, 0,
-				&dev_priv->hws_bo);
-		if (ret < 0) {
+		free_space = drm_memrange_search_free(&dev_priv->vram,
+						      PAGE_SIZE,
+						      PAGE_SIZE, 0);
+		if (!free_space) {
+			DRM_ERROR("No free vram available, aborting\n");
+			ret = -ENOMEM;
+			goto out;
+		}
+
+		dev_priv->hws = drm_memrange_get_block(free_space, PAGE_SIZE,
+						       PAGE_SIZE);
+		if (!dev_priv->hws) {
 			DRM_ERROR("Unable to allocate or pin hw status page\n");
 			ret = -EINVAL;
-			goto destroy_ringbuffer;
+			goto out;
 		}
 
-		dev_priv->status_gfx_addr =
-			dev_priv->hws_bo->offset & (0x1ffff << 12);
+		dev_priv->hws_agpoffset = dev_priv->hws->start;
 		dev_priv->hws_map.offset = dev->agp->base +
-			dev_priv->hws_bo->offset;
-		dev_priv->hws_map.size = size;
+			dev_priv->hws->start;
+		dev_priv->hws_map.size = PAGE_SIZE;
 		dev_priv->hws_map.type= 0;
 		dev_priv->hws_map.flags= 0;
 		dev_priv->hws_map.mtrr = 0;
 
 		drm_core_ioremap(&dev_priv->hws_map, dev);
 		if (dev_priv->hws_map.handle == NULL) {
-			dev_priv->status_gfx_addr = 0;
+			dev_priv->hws_agpoffset = 0;
 			DRM_ERROR("can not ioremap virtual addr for"
 					"G33 hw status page\n");
 			ret = -ENOMEM;
-			goto destroy_hws;
+			goto out_free;
 		}
-		dev_priv->hw_status_page = dev_priv->hws_map.handle;
-		memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
-		I915_WRITE(HWS_PGA, dev_priv->status_gfx_addr);
+		dev_priv->hws_vaddr = dev_priv->hws_map.handle;
+		I915_WRITE(HWS_PGA, dev_priv->hws_agpoffset);
 	}
+
+	memset(dev_priv->hws_vaddr, 0, PAGE_SIZE);
+
 	DRM_DEBUG("Enabled hardware status page\n");
 
+	return 0;
+
+out_free:
+	/* free hws */
+out:
+	return ret;
+}
+
+static void i915_cleanup_hwstatus(struct drm_device *dev)
+{
+	struct drm_i915_private *dev_priv = dev->dev_private;
+
+	if (!IS_G33(dev)) {
+		if (dev_priv->status_page_dmah)
+			drm_pci_free(dev, dev_priv->status_page_dmah);
+	} else {
+		if (dev_priv->hws_map.handle)
+			drm_core_ioremapfree(&dev_priv->hws_map, dev);
+		if (dev_priv->hws)
+			drm_memrange_put_block(dev_priv->hws);
+	}
+	I915_WRITE(HWS_PGA, 0x1ffff000);
+}
+
+static int i915_load_modeset_init(struct drm_device *dev)
+{
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	unsigned long agp_size, prealloc_size;
+	int ret = 0;
+
+	i915_probe_agp(dev->pdev, &agp_size, &prealloc_size);
+
+	/* Basic memrange allocator for stolen space (aka vram) */
+	drm_memrange_init(&dev_priv->vram, 0, prealloc_size);
+	/* Let GEM Manage from end of prealloc space to end of aperture */
+	i915_gem_do_init(dev, prealloc_size, agp_size);
+
+	ret = i915_gem_init_ringbuffer(dev);
+	if (ret)
+		goto out;
+
+	ret = i915_init_hwstatus(dev);
+	if (ret)
+		goto destroy_ringbuffer;
+
+	/* Allow hardware batchbuffers unless told otherwise.
+	 */
+	dev_priv->allow_batchbuffer = 1;
+	dev_priv->max_validate_buffers = I915_MAX_VALIDATE_BUFFERS;
+	mutex_init(&dev_priv->cmdbuf_mutex);
+
 	dev_priv->wq = create_singlethread_workqueue("i915");
 	if (dev_priv->wq == 0) {
 		DRM_DEBUG("Error\n");
@@ -208,22 +248,9 @@ modeset_cleanup:
 destroy_wq:
 	destroy_workqueue(dev_priv->wq);
 destroy_hws:
-	if (!IS_G33(dev)) {
-		if (dev_priv->status_page_dmah)
-			drm_pci_free(dev, dev_priv->status_page_dmah);
-	} else {
-		if (dev_priv->hws_map.handle)
-			drm_core_ioremapfree(&dev_priv->hws_map, dev);
-		if (dev_priv->hws_bo)
-			drm_bo_usage_deref_unlocked(&dev_priv->hws_bo);
-	}
-	I915_WRITE(HWS_PGA, 0x1ffff000);
+	i915_cleanup_hwstatus(dev);
 destroy_ringbuffer:
-	if (dev_priv->ring.virtual_start)
-		drm_mem_reg_iounmap(dev, &dev_priv->ring_buffer->mem,
-				    dev_priv->ring.virtual_start);
-	if (dev_priv->ring_buffer)
-		drm_bo_usage_deref_unlocked(&dev_priv->ring_buffer);
+	i915_gem_cleanup_ringbuffer(dev);
 out:
 	return ret;
 }
@@ -318,26 +345,14 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 #endif
 
 	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
-		/*
-		 * Initialize the memory manager for local and AGP space
-		 */
-		ret = drm_bo_driver_init(dev);
-		if (ret) {
-			DRM_ERROR("fail to init memory manager for "
-				  "local & AGP space\n");
-			goto out_rmmap;
-		}
-
 		ret = i915_load_modeset_init(dev);
 		if (ret < 0) {
 			DRM_ERROR("failed to init modeset\n");
-			goto driver_fini;
+			goto out_rmmap;
 		}
 	}
 	return 0;
 
-driver_fini:
-	drm_bo_driver_finish(dev);
 out_rmmap:
 	drm_rmmap(dev, dev_priv->mmio_map);
 free_priv:
@@ -362,6 +377,8 @@ int i915_driver_unload(struct drm_device *dev)
 		drm_core_ioremapfree(&dev_priv->ring.map, dev);
 	}
 #endif
+
+#ifdef DRI2
 	if (dev_priv->sarea_kmap.virtual) {
 		drm_bo_kunmap(&dev_priv->sarea_kmap);
 		dev_priv->sarea_kmap.virtual = NULL;
@@ -374,44 +391,17 @@ int i915_driver_unload(struct drm_device *dev)
 		mutex_unlock(&dev->struct_mutex);
 		dev_priv->sarea_bo = NULL;
 	}
-
-	if (dev_priv->status_page_dmah) {
-		drm_pci_free(dev, dev_priv->status_page_dmah);
-		dev_priv->status_page_dmah = NULL;
-		dev_priv->hw_status_page = NULL;
-		dev_priv->dma_status_page = 0;
-		/* Need to rewrite hardware status page */
-		I915_WRITE(HWS_PGA, 0x1ffff000);
-	}
-
-	if (dev_priv->status_gfx_addr) {
-		dev_priv->status_gfx_addr = 0;
-		drm_core_ioremapfree(&dev_priv->hws_map, dev);
-		drm_bo_usage_deref_unlocked(&dev_priv->hws_bo);
-		I915_WRITE(HWS_PGA, 0x1ffff000);
-	}
+#endif
+	i915_cleanup_hwstatus(dev);
 
 	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
-		drm_mem_reg_iounmap(dev, &dev_priv->ring_buffer->mem,
-				    dev_priv->ring.virtual_start);
-
-		DRM_DEBUG("usage is %d\n", atomic_read(&dev_priv->ring_buffer->usage));
 		mutex_lock(&dev->struct_mutex);
-		drm_bo_usage_deref_locked(&dev_priv->ring_buffer);
-
-		if (drm_bo_clean_mm(dev, DRM_BO_MEM_TT, 1)) {
-			DRM_ERROR("Memory manager type 3 not clean. "
-				  "Delaying takedown\n");
-		}
-		if (drm_bo_clean_mm(dev, DRM_BO_MEM_VRAM, 1)) {
-			DRM_ERROR("Memory manager type 3 not clean. "
-				  "Delaying takedown\n");
-		}
+		i915_gem_cleanup_ringbuffer(dev);
 		mutex_unlock(&dev->struct_mutex);
+		drm_memrange_takedown(&dev_priv->vram);
+		i915_gem_lastclose(dev);
 	}
 
-	drm_bo_driver_finish(dev);
-
 #ifdef __linux__
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
         intel_init_chipset_flush_compat(dev);
@@ -493,7 +483,7 @@ void i915_driver_lastclose(struct drm_device * dev)
 	if (dev_priv->agp_heap)
 		i915_mem_takedown(&(dev_priv->agp_heap));
 
-#if defined(I915_HAVE_BUFFER)
+#if defined(DRI2)
 	if (dev_priv->sarea_kmap.virtual) {
 		drm_bo_kunmap(&dev_priv->sarea_kmap);
 		dev_priv->sarea_kmap.virtual = NULL;
@@ -516,7 +506,8 @@ int i915_driver_firstopen(struct drm_device *dev)
 {
 	if (drm_core_check_feature(dev, DRIVER_MODESET))
 		return 0;
-
+#if defined(I915_HAVE_BUFFER) && defined(I915_TTM)
 	drm_bo_driver_init(dev);
+#endif
 	return 0;
 }
-- 
cgit v1.2.3


From af6efc3d778b96164849f822331938c4cdf8f4b2 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 4 Aug 2008 14:53:45 +1000
Subject: i915/radeon: use rmmap locked

---
 shared-core/i915_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 3a652e8d..dc218688 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -443,7 +443,7 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master)
 		return;
 
 	if (master_priv->sarea)
-		drm_rmmap(dev, master_priv->sarea);
+		drm_rmmap_locked(dev, master_priv->sarea);
 		
 	drm_free(master_priv, sizeof(*master_priv), DRM_MEM_DRIVER);
 
-- 
cgit v1.2.3


From 1c6abcefdc37f5cbb447e8fee1f3805fd7d19bea Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed, 13 Aug 2008 11:39:22 -0700
Subject: i915: setup hardware status page if physical addrs are required

Needed for the modesetting case where we initialize the ring at load time.
---
 shared-core/i915_init.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 4f2d3a4f..b21351c0 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -100,6 +100,32 @@ int i915_probe_agp(struct pci_dev *pdev, unsigned long *aperture_size,
 	return 0;
 }
 
+static int
+i915_init_hws_phys(struct drm_device *dev)
+{
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	int ret = 0;
+
+	dev_priv->status_page_dmah = drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE,
+						   0xffffffff);
+
+	if (!dev_priv->status_page_dmah) {
+		DRM_ERROR("Can not allocate hardware status page\n");
+		ret = -ENOMEM;
+		goto out;
+	}
+	dev_priv->hw_status_page = dev_priv->status_page_dmah->vaddr;
+	dev_priv->dma_status_page = dev_priv->status_page_dmah->busaddr;
+
+	memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
+
+	I915_WRITE(HWS_PGA, dev_priv->dma_status_page);
+	DRM_DEBUG("hws kernel virt: 0x%p\n", dev_priv->hw_status_page);
+
+out:
+	return ret;
+}
+
 static int i915_load_modeset_init(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -113,6 +139,9 @@ static int i915_load_modeset_init(struct drm_device *dev)
 	/* Let GEM Manage from end of prealloc space to end of aperture */
 	i915_gem_do_init(dev, prealloc_size, agp_size);
 
+	if (!I915_NEED_GFX_HWS(dev))
+		i915_init_hws_phys(dev);
+
 	ret = i915_gem_init_ringbuffer(dev);
 	if (ret)
 		goto out;
@@ -354,6 +383,8 @@ int i915_driver_unload(struct drm_device *dev)
 		mutex_unlock(&dev->struct_mutex);
 		drm_mm_takedown(&dev_priv->vram);
 		i915_gem_lastclose(dev);
+		if (!I915_NEED_GFX_HWS(dev))
+			drm_pci_free(dev, dev_priv->status_page_dmah);
 	}
 
         drm_rmmap(dev, dev_priv->mmio_map);
-- 
cgit v1.2.3


From a2adc696569de830c7a95722dd111bff706a0bbc Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Sat, 16 Aug 2008 12:09:24 -0700
Subject: i915: finish removing TTM bits

Makes it build again.
---
 shared-core/i915_init.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'shared-core/i915_init.c')

diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 7b88cc8d..d6383929 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -519,8 +519,5 @@ int i915_driver_firstopen(struct drm_device *dev)
 {
 	if (drm_core_check_feature(dev, DRIVER_MODESET))
 		return 0;
-#if defined(I915_HAVE_BUFFER) && defined(I915_TTM)
-	drm_bo_driver_init(dev);
-#endif
 	return 0;
 }
-- 
cgit v1.2.3