aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r100.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/r100.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/r100.c')
-rw-r--r--drivers/gpu/drm/radeon/r100.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 7bea923b1b29..5fe12c02d2dd 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -2135,9 +2135,11 @@ void r100_bandwidth_update(struct radeon_device *rdev)
2135 mode1 = &rdev->mode_info.crtcs[0]->base.mode; 2135 mode1 = &rdev->mode_info.crtcs[0]->base.mode;
2136 pixel_bytes1 = rdev->mode_info.crtcs[0]->base.fb->bits_per_pixel / 8; 2136 pixel_bytes1 = rdev->mode_info.crtcs[0]->base.fb->bits_per_pixel / 8;
2137 } 2137 }
2138 if (rdev->mode_info.crtcs[1]->base.enabled) { 2138 if (!(rdev->flags & RADEON_SINGLE_CRTC)) {
2139 mode2 = &rdev->mode_info.crtcs[1]->base.mode; 2139 if (rdev->mode_info.crtcs[1]->base.enabled) {
2140 pixel_bytes2 = rdev->mode_info.crtcs[1]->base.fb->bits_per_pixel / 8; 2140 mode2 = &rdev->mode_info.crtcs[1]->base.mode;
2141 pixel_bytes2 = rdev->mode_info.crtcs[1]->base.fb->bits_per_pixel / 8;
2142 }
2141 } 2143 }
2142 2144
2143 min_mem_eff.full = rfixed_const_8(0); 2145 min_mem_eff.full = rfixed_const_8(0);