drm: Branch 'drm-gem' - 2 commits

[<an...@ke...>]

 linux-core/i915_gem.c        |   66 ++++++++++++++++++++++++++++++++++++++++++-
 linux-core/i915_gem_tiling.c |    3 -
 shared-core/i915_drv.h       |    6 +++
 3 files changed, 71 insertions(+), 4 deletions(-)

New commits:
commit e31d27857ffc1b01ca49e70b5ba6f7425414d7c8
Author: Eric Anholt <er...@an...>
Date:   Mon Jul 21 14:21:16 2008 -0700

    intel-gem: Remove recently added pci_read_base prototype.
    
    This is in pci.h in the fixed patch to the kernel.

diff --git a/linux-core/i915_gem_tiling.c b/linux-core/i915_gem_tiling.c
index c8177a7..2841ff1 100644
--- a/linux-core/i915_gem_tiling.c
+++ b/linux-core/i915_gem_tiling.c
@@ -30,9 +30,6 @@
 #include "i915_drm.h"
 #include "i915_drv.h"
 
-extern int pci_read_base(struct pci_dev *dev, unsigned int reg,
-    struct resource *res);
-
 /** @file i915_gem_tiling.c
  *
  * Support for managing tiling state of buffer objects.
commit 67d15215660407b07265c37d60ea5cac8930cef9
Author: Eric Anholt <er...@an...>
Date:   Tue Jul 1 12:31:37 2008 -0700

    intel-gem: Set up HWS when it needs a vaddr during GEM init.
    
    This requires an updated 2D driver to not try to set it up as well.

diff --git a/linux-core/i915_gem.c b/linux-core/i915_gem.c
index fff2074..b4c478f 100644
--- a/linux-core/i915_gem.c
+++ b/linux-core/i915_gem.c
@@ -2312,6 +2312,56 @@ i915_gem_idle(struct drm_device *dev)
 }
 
 static int
+i915_gem_init_hws(struct drm_device *dev)
+{
+	drm_i915_private_t *dev_priv = dev->dev_private;
+	struct drm_gem_object *obj;
+	struct drm_i915_gem_object *obj_priv;
+	int ret;
+
+	/* If we need a physical address for the status page, it's already
+	 * initialized at driver load time.
+	 */
+	if (!I915_NEED_GFX_HWS(dev))
+		return 0;
+
+	obj = drm_gem_object_alloc(dev, 4096);
+	if (obj == NULL) {
+		DRM_ERROR("Failed to allocate status page\n");
+		return -ENOMEM;
+	}
+	obj_priv = obj->driver_private;
+
+	ret = i915_gem_object_pin(obj, 4096);
+	if (ret != 0) {
+		drm_gem_object_unreference(obj);
+		return ret;
+	}
+
+	dev_priv->status_gfx_addr = obj_priv->gtt_offset;
+	dev_priv->hws_map.offset = dev->agp->base + obj_priv->gtt_offset;
+	dev_priv->hws_map.size = 4096;
+	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) {
+		DRM_ERROR("Failed to map status page.\n");
+		memset(&dev_priv->hws_map, 0, sizeof(dev_priv->hws_map));
+		drm_gem_object_unreference(obj);
+		return -EINVAL;
+	}
+	dev_priv->hws_obj = obj;
+	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);
+	DRM_DEBUG("hws offset: 0x%08x\n", dev_priv->status_gfx_addr);
+
+	return 0;
+}
+
+static int
 i915_gem_init_ringbuffer(struct drm_device *dev)
 {
 	drm_i915_private_t *dev_priv = dev->dev_private;
@@ -2319,6 +2369,10 @@ i915_gem_init_ringbuffer(struct drm_device *dev)
 	struct drm_i915_gem_object *obj_priv;
 	int ret;
 
+	ret = i915_gem_init_hws(dev);
+	if (ret != 0)
+		return ret;
+
 	obj = drm_gem_object_alloc(dev, 128 * 1024);
 	if (obj == NULL) {
 		DRM_ERROR("Failed to allocate ringbuffer\n");
@@ -2383,8 +2437,18 @@ i915_gem_cleanup_ringbuffer(struct drm_device *dev)
 
 	i915_gem_object_unpin(dev_priv->ring.ring_obj);
 	drm_gem_object_unreference(dev_priv->ring.ring_obj);
-
+	dev_priv->ring.ring_obj = NULL;
 	memset(&dev_priv->ring, 0, sizeof(dev_priv->ring));
+
+	if (dev_priv->hws_obj != NULL) {
+		i915_gem_object_unpin(dev_priv->hws_obj);
+		drm_gem_object_unreference(dev_priv->hws_obj);
+		dev_priv->hws_obj = NULL;
+		memset(&dev_priv->hws_map, 0, sizeof(dev_priv->hws_map));
+
+		/* Write high address into HWS_PGA when disabling. */
+		I915_WRITE(HWS_PGA, 0x1ffff000);
+	}
 }
 
 int
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index a9a431c..c57c292 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -114,6 +114,7 @@ typedef struct drm_i915_private {
 	uint32_t counter;
 	unsigned int status_gfx_addr;
 	drm_local_map_t hws_map;
+	struct drm_gem_object *hws_obj;
 
 	unsigned int cpp;
 
@@ -854,6 +855,11 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
 #define RING_VALID		0x00000001
 #define RING_INVALID		0x00000000
 
+/* Hardware status page address */
+#define HWS_PGA			0x2080
+#define HWS_ADDRESS_MASK	0xfffff000
+#define HWS_START_ADDRES_SHIFT	4
+
 /* Instruction parser error reg:
  */
 #define IPEIR			0x2088