diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-01-04 23:31:08 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-01-04 23:31:08 +0100 |
| commit | 4f125010d2d02c481a0fdf5aee23a9f937bc5de1 (patch) | |
| tree | dcdcd2ba1d0bb980b57ced9a1b2b5b17c84c8f57 /drivers/gpu/drm/radeon/radeon_fb.c | |
| parent | drm/radeon/kms: add ARGB2101010 colorbuffer support for r500 (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | linux-4f125010d2d02c481a0fdf5aee23a9f937bc5de1.tar.xz linux-4f125010d2d02c481a0fdf5aee23a9f937bc5de1.zip | |
Merge branch 'master' of /home/airlied/kernel/linux-2.6 into drm-core-next
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_fb.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index f7b4762fa6b6..66324b5bb5ba 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->pixmap.size = 64*1024; info->pixmap.buf_align = 8; |