From cb355e4593ef09fe36c329448f9ecc019a4a5cac Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 20 Aug 2010 22:37:03 +0100 Subject: [PATCH] --- yaml --- r: 217938 b: refs/heads/master c: 5d607f9b038ea03f5e5b3064d2f3993f9ea67e1e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_dma.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ed2011774d8b..db5176e9218a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 995b6762f0fd54377bbfafdf5328b12de698bfa8 +refs/heads/master: 5d607f9b038ea03f5e5b3064d2f3993f9ea67e1e diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c index c52e16fe3d8c..8d52f01a6d90 100644 --- a/trunk/drivers/gpu/drm/i915/i915_dma.c +++ b/trunk/drivers/gpu/drm/i915/i915_dma.c @@ -1369,12 +1369,8 @@ static int i915_load_modeset_init(struct drm_device *dev, unsigned long agp_size) { struct drm_i915_private *dev_priv = dev->dev_private; - int fb_bar = IS_I9XX(dev) ? 2 : 0; int ret = 0; - dev->mode_config.fb_base = pci_resource_start(dev->pdev, fb_bar) & - 0xff000000; - /* Basic memrange allocator for stolen space (aka vram) */ drm_mm_init(&dev_priv->vram, 0, prealloc_size); DRM_INFO("set up %ldM of stolen space\n", prealloc_size / (1024*1024));