Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into...

Conflicts:

	shared-core/i915_init.c - reconcile with airlied's new code

diff --cc linux-core/drm_crtc.c
Simple merge

diff --cc linux-core/drm_crtc.h
index 560c38f,584788e..f8d7da2
--- 1/linux-core/drm_crtc.h
--- 2/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@@ -417,7 -418,7 +418,7 @@@ struct drm_mode_config 
        /* DamagePtr rotationDamage? */
        /* DGA stuff? */
        struct drm_mode_config_funcs *funcs;
--      int fb_base;
++      unsigned long fb_base;
  };
  
  struct drm_output *drm_output_create(struct drm_device *dev,

diff --cc linux-core/drm_objects.h
Simple merge

diff --cc shared-core/i915_drv.h
Simple merge

diff --cc shared-core/i915_init.c
index b98f155,5872aeb..3e44dd5
--- 1/shared-core/i915_init.c
--- 2/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@@ -146,8 -150,6 +146,8 @@@ int i915_driver_load(drm_device_t *dev
                return -ENODEV;
        }
  
-       DRM_DEBUG("fb_base: 0x%08lx\n", dev_priv->baseaddr);
++      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);
        if (ret != 0) {
@@@ -175,9 -177,13 +175,12 @@@
        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, 0,
 -                     prealloc_size >> PAGE_SHIFT);
 +      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);
++      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,
@@@ -203,13 -208,7 +206,8 @@@
        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);
-       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;