diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/radeon/atombios_encoders.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c index 45bb2fce3ae6..468b874336f9 100644 --- a/drivers/gpu/drm/radeon/atombios_encoders.c +++ b/drivers/gpu/drm/radeon/atombios_encoders.c | |||
@@ -1438,7 +1438,7 @@ radeon_atom_encoder_dpms_ext(struct drm_encoder *encoder, | |||
1438 | switch (mode) { | 1438 | switch (mode) { |
1439 | case DRM_MODE_DPMS_ON: | 1439 | case DRM_MODE_DPMS_ON: |
1440 | default: | 1440 | default: |
1441 | if (ASIC_IS_DCE41(rdev)) { | 1441 | if (ASIC_IS_DCE41(rdev) || ASIC_IS_DCE61(rdev)) { |
1442 | atombios_external_encoder_setup(encoder, ext_encoder, | 1442 | atombios_external_encoder_setup(encoder, ext_encoder, |
1443 | EXTERNAL_ENCODER_ACTION_V3_ENABLE_OUTPUT); | 1443 | EXTERNAL_ENCODER_ACTION_V3_ENABLE_OUTPUT); |
1444 | atombios_external_encoder_setup(encoder, ext_encoder, | 1444 | atombios_external_encoder_setup(encoder, ext_encoder, |
@@ -1449,7 +1449,7 @@ radeon_atom_encoder_dpms_ext(struct drm_encoder *encoder, | |||
1449 | case DRM_MODE_DPMS_STANDBY: | 1449 | case DRM_MODE_DPMS_STANDBY: |
1450 | case DRM_MODE_DPMS_SUSPEND: | 1450 | case DRM_MODE_DPMS_SUSPEND: |
1451 | case DRM_MODE_DPMS_OFF: | 1451 | case DRM_MODE_DPMS_OFF: |
1452 | if (ASIC_IS_DCE41(rdev)) { | 1452 | if (ASIC_IS_DCE41(rdev) || ASIC_IS_DCE61(rdev)) { |
1453 | atombios_external_encoder_setup(encoder, ext_encoder, | 1453 | atombios_external_encoder_setup(encoder, ext_encoder, |
1454 | EXTERNAL_ENCODER_ACTION_V3_ENCODER_BLANKING); | 1454 | EXTERNAL_ENCODER_ACTION_V3_ENCODER_BLANKING); |
1455 | atombios_external_encoder_setup(encoder, ext_encoder, | 1455 | atombios_external_encoder_setup(encoder, ext_encoder, |
@@ -1822,7 +1822,7 @@ radeon_atom_encoder_init(struct radeon_device *rdev) | |||
1822 | break; | 1822 | break; |
1823 | } | 1823 | } |
1824 | 1824 | ||
1825 | if (ext_encoder && ASIC_IS_DCE41(rdev)) | 1825 | if (ext_encoder && (ASIC_IS_DCE41(rdev) || ASIC_IS_DCE61(rdev))) |
1826 | atombios_external_encoder_setup(encoder, ext_encoder, | 1826 | atombios_external_encoder_setup(encoder, ext_encoder, |
1827 | EXTERNAL_ENCODER_ACTION_V3_ENCODER_INIT); | 1827 | EXTERNAL_ENCODER_ACTION_V3_ENCODER_INIT); |
1828 | } | 1828 | } |
@@ -1911,7 +1911,7 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder, | |||
1911 | } | 1911 | } |
1912 | 1912 | ||
1913 | if (ext_encoder) { | 1913 | if (ext_encoder) { |
1914 | if (ASIC_IS_DCE41(rdev)) | 1914 | if (ASIC_IS_DCE41(rdev) || ASIC_IS_DCE61(rdev)) |
1915 | atombios_external_encoder_setup(encoder, ext_encoder, | 1915 | atombios_external_encoder_setup(encoder, ext_encoder, |
1916 | EXTERNAL_ENCODER_ACTION_V3_ENCODER_SETUP); | 1916 | EXTERNAL_ENCODER_ACTION_V3_ENCODER_SETUP); |
1917 | else | 1917 | else |