From: Dave Airlie Date: Mon, 20 Dec 2010 00:54:48 +0000 (+1000) Subject: drm/radeon: use aperture size not vram size for overlap tests X-Git-Url: https://git.karo-electronics.de/?p=mv-sheeva.git;a=commitdiff_plain;h=68d3059665c4a57223f855eb02f9ab7ce5b3a593 drm/radeon: use aperture size not vram size for overlap tests This fixes a problem where the wrong card conflicts with vesafb in my x2 system. Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index efa211898fe..6abea32be5e 100644 --- a/drivers/gpu/drm/radeon/radeon_fb.c +++ b/drivers/gpu/drm/radeon/radeon_fb.c @@ -245,7 +245,7 @@ static int radeonfb_create(struct radeon_fbdev *rfbdev, goto out_unref; } info->apertures->ranges[0].base = rdev->ddev->mode_config.fb_base; - info->apertures->ranges[0].size = rdev->mc.real_vram_size; + info->apertures->ranges[0].size = rdev->mc.aper_size; info->fix.mmio_start = 0; info->fix.mmio_len = 0;