drm/radeon/kms: Add checks for TN in the DP bridge code
TN (trinity) uses DP bridges for LVDS and VGA just like llano. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
0671bdd798
commit
1d3949c4ab
|
@ -1438,7 +1438,7 @@ radeon_atom_encoder_dpms_ext(struct drm_encoder *encoder,
|
||||||
switch (mode) {
|
switch (mode) {
|
||||||
case DRM_MODE_DPMS_ON:
|
case DRM_MODE_DPMS_ON:
|
||||||
default:
|
default:
|
||||||
if (ASIC_IS_DCE41(rdev)) {
|
if (ASIC_IS_DCE41(rdev) || ASIC_IS_DCE61(rdev)) {
|
||||||
atombios_external_encoder_setup(encoder, ext_encoder,
|
atombios_external_encoder_setup(encoder, ext_encoder,
|
||||||
EXTERNAL_ENCODER_ACTION_V3_ENABLE_OUTPUT);
|
EXTERNAL_ENCODER_ACTION_V3_ENABLE_OUTPUT);
|
||||||
atombios_external_encoder_setup(encoder, ext_encoder,
|
atombios_external_encoder_setup(encoder, ext_encoder,
|
||||||
|
@ -1449,7 +1449,7 @@ radeon_atom_encoder_dpms_ext(struct drm_encoder *encoder,
|
||||||
case DRM_MODE_DPMS_STANDBY:
|
case DRM_MODE_DPMS_STANDBY:
|
||||||
case DRM_MODE_DPMS_SUSPEND:
|
case DRM_MODE_DPMS_SUSPEND:
|
||||||
case DRM_MODE_DPMS_OFF:
|
case DRM_MODE_DPMS_OFF:
|
||||||
if (ASIC_IS_DCE41(rdev)) {
|
if (ASIC_IS_DCE41(rdev) || ASIC_IS_DCE61(rdev)) {
|
||||||
atombios_external_encoder_setup(encoder, ext_encoder,
|
atombios_external_encoder_setup(encoder, ext_encoder,
|
||||||
EXTERNAL_ENCODER_ACTION_V3_ENCODER_BLANKING);
|
EXTERNAL_ENCODER_ACTION_V3_ENCODER_BLANKING);
|
||||||
atombios_external_encoder_setup(encoder, ext_encoder,
|
atombios_external_encoder_setup(encoder, ext_encoder,
|
||||||
|
@ -1822,7 +1822,7 @@ radeon_atom_encoder_init(struct radeon_device *rdev)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ext_encoder && ASIC_IS_DCE41(rdev))
|
if (ext_encoder && (ASIC_IS_DCE41(rdev) || ASIC_IS_DCE61(rdev)))
|
||||||
atombios_external_encoder_setup(encoder, ext_encoder,
|
atombios_external_encoder_setup(encoder, ext_encoder,
|
||||||
EXTERNAL_ENCODER_ACTION_V3_ENCODER_INIT);
|
EXTERNAL_ENCODER_ACTION_V3_ENCODER_INIT);
|
||||||
}
|
}
|
||||||
|
@ -1911,7 +1911,7 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ext_encoder) {
|
if (ext_encoder) {
|
||||||
if (ASIC_IS_DCE41(rdev))
|
if (ASIC_IS_DCE41(rdev) || ASIC_IS_DCE61(rdev))
|
||||||
atombios_external_encoder_setup(encoder, ext_encoder,
|
atombios_external_encoder_setup(encoder, ext_encoder,
|
||||||
EXTERNAL_ENCODER_ACTION_V3_ENCODER_SETUP);
|
EXTERNAL_ENCODER_ACTION_V3_ENCODER_SETUP);
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue