diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2012-03-20 17:18:01 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-03-21 06:55:50 +0000 |
commit | 82d118efc65214f46138371a6daab5e7d71a723d (patch) | |
tree | 061cd7d438822465c6895cd18f9ba371303df347 /drivers/gpu/drm/radeon/radeon_atombios.c | |
parent | 43b3cd995f304c983393b7ed6563f09781bc41d0 (diff) | |
download | blackbird-obmc-linux-82d118efc65214f46138371a6daab5e7d71a723d.tar.gz blackbird-obmc-linux-82d118efc65214f46138371a6daab5e7d71a723d.zip |
drm/radeon/kms: fix up atom HPD gpio parsing for DCE6
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_atombios.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_atombios.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index 2554611e167c..7e2ba2580899 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -253,7 +253,9 @@ static struct radeon_hpd radeon_atom_get_hpd_info_from_gpio(struct radeon_device memset(&hpd, 0, sizeof(struct radeon_hpd)); - if (ASIC_IS_DCE4(rdev)) + if (ASIC_IS_DCE6(rdev)) + reg = SI_DC_GPIO_HPD_A; + else if (ASIC_IS_DCE4(rdev)) reg = EVERGREEN_DC_GPIO_HPD_A; else reg = AVIVO_DC_GPIO_HPD_A; |