diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-10-02 09:19:09 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-10-05 10:00:58 +1000 |
| commit | dfee5614e4d83a32cef9193a8b19bc1d8900f93d (patch) | |
| tree | 5f9eb131ec16cb917db72f3f881901d03fd9dc30 /drivers/gpu/drm/radeon/r100.c | |
| parent | 185974dd596e67e73906790c2a4a4579d75911e6 (diff) | |
| download | blackbird-op-linux-dfee5614e4d83a32cef9193a8b19bc1d8900f93d.tar.gz blackbird-op-linux-dfee5614e4d83a32cef9193a8b19bc1d8900f93d.zip | |
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.c | 8 |
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) mode1 = &rdev->mode_info.crtcs[0]->base.mode; pixel_bytes1 = rdev->mode_info.crtcs[0]->base.fb->bits_per_pixel / 8; } - if (rdev->mode_info.crtcs[1]->base.enabled) { - mode2 = &rdev->mode_info.crtcs[1]->base.mode; - pixel_bytes2 = rdev->mode_info.crtcs[1]->base.fb->bits_per_pixel / 8; + if (!(rdev->flags & RADEON_SINGLE_CRTC)) { + if (rdev->mode_info.crtcs[1]->base.enabled) { + mode2 = &rdev->mode_info.crtcs[1]->base.mode; + pixel_bytes2 = rdev->mode_info.crtcs[1]->base.fb->bits_per_pixel / 8; + } } min_mem_eff.full = rfixed_const_8(0); |
