diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-08-20 17:37:03 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-08 05:23:57 -0400 |
commit | 5d607f9b038ea03f5e5b3064d2f3993f9ea67e1e (patch) | |
tree | e5da4ce291125abbce7e572dbbf9bbac2c01c504 | |
parent | 995b6762f0fd54377bbfafdf5328b12de698bfa8 (diff) |
drm/i915: Remove redundant initialisation of fb_base
We do it whilst configuring dev->mode_config, so remove the out-of-place
earlier initialisation.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index c52e16fe3d8c..8d52f01a6d90 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
@@ -1369,12 +1369,8 @@ static int i915_load_modeset_init(struct drm_device *dev, | |||
1369 | unsigned long agp_size) | 1369 | unsigned long agp_size) |
1370 | { | 1370 | { |
1371 | struct drm_i915_private *dev_priv = dev->dev_private; | 1371 | struct drm_i915_private *dev_priv = dev->dev_private; |
1372 | int fb_bar = IS_I9XX(dev) ? 2 : 0; | ||
1373 | int ret = 0; | 1372 | int ret = 0; |
1374 | 1373 | ||
1375 | dev->mode_config.fb_base = pci_resource_start(dev->pdev, fb_bar) & | ||
1376 | 0xff000000; | ||
1377 | |||
1378 | /* Basic memrange allocator for stolen space (aka vram) */ | 1374 | /* Basic memrange allocator for stolen space (aka vram) */ |
1379 | drm_mm_init(&dev_priv->vram, 0, prealloc_size); | 1375 | drm_mm_init(&dev_priv->vram, 0, prealloc_size); |
1380 | DRM_INFO("set up %ldM of stolen space\n", prealloc_size / (1024*1024)); | 1376 | DRM_INFO("set up %ldM of stolen space\n", prealloc_size / (1024*1024)); |