Merge branch 'drm-next-4.14' of git://people.freedesktop.org/~agd5f/linux into drm...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / radeon / radeon_fb.c

diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
index 356ad90a52383a755ffa168c2b7209d449232a1e..7fc63fecb8c1ea0d90d52766a2c00857aaf68e73 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -264,7 +264,6 @@ static int radeonfb_create(struct drm_fb_helper *helper,
 
        drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
 
-       info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;
        info->fbops = &radeonfb_ops;
 
        tmp = radeon_bo_gpu_offset(rbo) - rdev->mc.vram_start;
@@ -347,9 +346,12 @@ int radeon_fbdev_init(struct radeon_device *rdev)
        if (list_empty(&rdev->ddev->mode_config.connector_list))
                return 0;
 
-       /* select 8 bpp console on RN50 or 16MB cards */
-       if (ASIC_IS_RN50(rdev) || rdev->mc.real_vram_size <= (32*1024*1024))
+       /* select 8 bpp console on 8MB cards, or 16 bpp on RN50 or 32MB */
+       if (rdev->mc.real_vram_size <= (8*1024*1024))
                bpp_sel = 8;
+       else if (ASIC_IS_RN50(rdev) ||
+                rdev->mc.real_vram_size <= (32*1024*1024))
+               bpp_sel = 16;
 
        rfbdev = kzalloc(sizeof(struct radeon_fbdev), GFP_KERNEL);
        if (!rfbdev)