aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_fb.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-10-01 19:19:09 -0400
committerDave Airlie <airlied@redhat.com>2009-10-04 20:00:58 -0400
commitdfee5614e4d83a32cef9193a8b19bc1d8900f93d (patch)
tree5f9eb131ec16cb917db72f3f881901d03fd9dc30 /drivers/gpu/drm/radeon/radeon_fb.c
parent185974dd596e67e73906790c2a4a4579d75911e6 (diff)
drm/radeon/kms: respect single crtc cards, only create one crtc. (v2)
Also add single crtc for RN50 chips. changes in v2: fix vblank init to respect single crtc flag fix r100 mode bandwidth to respect single crtc flag Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_fb.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_fb.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
index 1ba704eedefb..325e40b5e0b6 100644
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -146,6 +146,7 @@ int radeonfb_create(struct drm_device *dev,
146 unsigned long tmp; 146 unsigned long tmp;
147 bool fb_tiled = false; /* useful for testing */ 147 bool fb_tiled = false; /* useful for testing */
148 u32 tiling_flags = 0; 148 u32 tiling_flags = 0;
149 int crtc_count;
149 150
150 mode_cmd.width = surface_width; 151 mode_cmd.width = surface_width;
151 mode_cmd.height = surface_height; 152 mode_cmd.height = surface_height;
@@ -217,7 +218,11 @@ int radeonfb_create(struct drm_device *dev,
217 rfbdev = info->par; 218 rfbdev = info->par;
218 rfbdev->helper.funcs = &radeon_fb_helper_funcs; 219 rfbdev->helper.funcs = &radeon_fb_helper_funcs;
219 rfbdev->helper.dev = dev; 220 rfbdev->helper.dev = dev;
220 ret = drm_fb_helper_init_crtc_count(&rfbdev->helper, 2, 221 if (rdev->flags & RADEON_SINGLE_CRTC)
222 crtc_count = 1;
223 else
224 crtc_count = 2;
225 ret = drm_fb_helper_init_crtc_count(&rfbdev->helper, crtc_count,
221 RADEONFB_CONN_LIMIT); 226 RADEONFB_CONN_LIMIT);
222 if (ret) 227 if (ret)
223 goto out_unref; 228 goto out_unref;