diff options
| author |   Rafał Miłecki <zajec5@gmail.com> | 2010-02-26 08:44:57 +0000 |
|---|---|---|
| committer |   Dave Airlie <airlied@redhat.com> | 2010-03-01 16:09:41 +1000 |
| commit | 3464f114967b2f98f1bfe0eaf0a413bb51b4df1d (patch) | |
| tree | c2ec9e03bccbab4ae3ac457952fcf2980f7f324f /drivers/gpu | |
| parent | drm/radeon/kms: do not preset audio stuff and start timer when not using audio (diff) | |
| download | linux-dev-3464f114967b2f98f1bfe0eaf0a413bb51b4df1d.tar.xz linux-dev-3464f114967b2f98f1bfe0eaf0a413bb51b4df1d.zip | |
Revert "drm/radeon/kms: disable HDMI audio for now on rv710/rv730"
This commit "disabled" audio on RV710 and RV740 only, leaving RV770 and RV730.
The order is: CHIP_RV770 < CHIP_RV730 < CHIP_RV710 < CHIP_RV740.
It is not needed anway, as we do not even try to enable audio on RV770 and
newer. We call initializing function in r600.c only, not in rv770.c.
If there is something causing green tinges, it's HDMI mode setting for encoder
and I will try to debug that.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600_audio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c index 668ff4b11c60..58c3cb32f7b0 100644 --- a/drivers/gpu/drm/radeon/r600_audio.c +++ b/drivers/gpu/drm/radeon/r600_audio.c @@ -35,7 +35,7 @@ */ static int r600_audio_chipset_supported(struct radeon_device *rdev) { - return (rdev->family >= CHIP_R600 && rdev->family < CHIP_RV710) + return rdev->family >= CHIP_R600 || rdev->family == CHIP_RS600 || rdev->family == CHIP_RS690 || rdev->family == CHIP_RS740; |