diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2010-05-20 11:26:11 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-05-21 15:06:06 +1000 |
| commit | 45737447ed160faaba036c0709226bf9057f7b72 (patch) | |
| tree | 9fe0b0c7e5e164104334d94b048d6aaeab9c7e5b /drivers | |
| parent | c43ae476a5fef6719f8227a04cab70645f891349 (diff) | |
| download | linux-45737447ed160faaba036c0709226bf9057f7b72.tar.gz linux-45737447ed160faaba036c0709226bf9057f7b72.tar.bz2 linux-45737447ed160faaba036c0709226bf9057f7b72.zip | |
drm/radeon/kms: don't default display priority to high on rs4xx
Seems to cause issues with the sound hardware. Fixes kernel
bug 15982:
https://bugzilla.kernel.org/show_bug.cgi?id=15982
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_display.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index da85cad1152b..1006549d1570 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c @@ -983,8 +983,11 @@ void radeon_update_display_priority(struct radeon_device *rdev) /* set display priority to high for r3xx, rv515 chips * this avoids flickering due to underflow to the * display controllers during heavy acceleration. + * Don't force high on rs4xx igp chips as it seems to + * affect the sound card. See kernel bug 15982. */ - if (ASIC_IS_R300(rdev) || (rdev->family == CHIP_RV515)) + if ((ASIC_IS_R300(rdev) || (rdev->family == CHIP_RV515)) && + !(rdev->flags & RADEON_IS_IGP)) rdev->disp_priority = 2; else rdev->disp_priority = 0; |