From 94a6488abe24e2d356075105f3be6d13fda7ccd6 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 18 Nov 2009 13:39:34 +1000 Subject: [PATCH] --- yaml --- r: 174597 b: refs/heads/master c: 47381156a8f0d793bacfa346cc4cc515399525f7 h: refs/heads/master i: 174595: 25d362398c27d06e10b84d2a575cf283ddb00b75 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_fb.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 79aaa4cbefd0..e1c7e5f24c9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f3b6a45f0805690269a7a9d265cbbc2f15b6c6e +refs/heads/master: 47381156a8f0d793bacfa346cc4cc515399525f7 diff --git a/trunk/drivers/gpu/drm/radeon/radeon_fb.c b/trunk/drivers/gpu/drm/radeon/radeon_fb.c index b38c4c8e2c61..cb2f16a0b8ff 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_fb.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_fb.c @@ -321,7 +321,14 @@ int radeon_parse_options(char *options) int radeonfb_probe(struct drm_device *dev) { - return drm_fb_helper_single_fb_probe(dev, 32, &radeonfb_create); + struct radeon_device *rdev = dev->dev_private; + int bpp_sel = 32; + + /* select 8 bpp console on RN50 or 16MB cards */ + if (ASIC_IS_RN50(rdev) || rdev->mc.real_vram_size <= (32*1024*1024)) + bpp_sel = 8; + + return drm_fb_helper_single_fb_probe(dev, bpp_sel, &radeonfb_create); } int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)