Got broken during the evergreen merge. Fixes fdo bug 27001. Signed-off-by: Alex Deucher <alexdeucher at gmail.com> --- drivers/gpu/drm/radeon/radeon_encoders.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index d61a141..30293be 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c @@ -865,6 +865,8 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t else if (radeon_encoder->devices & (ATOM_DEVICE_DFP_SUPPORT)) { if (dig->coherent_mode) args.v3.acConfig.fCoherentMode = 1; + if (radeon_encoder->pixel_clock > 165000) + args.v3.acConfig.fDualLinkConnector = 1; } } else if (ASIC_IS_DCE32(rdev)) { args.v2.acConfig.ucEncoderSel = dig->dig_encoder; @@ -888,6 +890,8 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t else if (radeon_encoder->devices & (ATOM_DEVICE_DFP_SUPPORT)) { if (dig->coherent_mode) args.v2.acConfig.fCoherentMode = 1; + if (radeon_encoder->pixel_clock > 165000) + args.v2.acConfig.fDualLinkConnector = 1; } } else { args.v1.ucConfig = ATOM_TRANSMITTER_CONFIG_CLKSRC_PPLL; -- 1.5.6.3 --00151748dd324ca7c104844cc292 Content-Type: text/x-diff; charset=US-ASCII; name="0001-drm-radeon-kms-atom-fix-dual-link-DVI-on-DCE3.2-4.0.patch" Content-Disposition: attachment; filename="0001-drm-radeon-kms-atom-fix-dual-link-DVI-on-DCE3.2-4.0.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_g821yoda0 RnJvbSA0OGQ5MWYzYmFjNzNlOGZkNTk5ODljNzcyYzA1NDBhNGUxMGQ1OThmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4IERldWNoZXIgPGFsZXhkZXVjaGVyQGdtYWlsLmNvbT4K RGF0ZTogVGh1LCAxNSBBcHIgMjAxMCAxNjo1NDozOCAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIGRy bS9yYWRlb24va21zL2F0b206IGZpeCBkdWFsLWxpbmsgRFZJIG9uIERDRTMuMi80LjAKCkdvdCBi cm9rZW4gZHVyaW5nIHRoZSBldmVyZ3JlZW4gbWVyZ2UuCkZpeGVzIGZkbyBidWcgMjcwMDEuCgpT aWduZWQtb2ZmLWJ5OiBBbGV4IERldWNoZXIgPGFsZXhkZXVjaGVyQGdtYWlsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9lbmNvZGVycy5jIHwgICAgNCArKysrCiAxIGZp bGVzIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9lbmNvZGVycy5jIGIvZHJpdmVycy9ncHUv ZHJtL3JhZGVvbi9yYWRlb25fZW5jb2RlcnMuYwppbmRleCBkNjFhMTQxLi4zMDI5M2JlIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9lbmNvZGVycy5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2VuY29kZXJzLmMKQEAgLTg2NSw2ICs4NjUsOCBA QCBhdG9tYmlvc19kaWdfdHJhbnNtaXR0ZXJfc2V0dXAoc3RydWN0IGRybV9lbmNvZGVyICplbmNv ZGVyLCBpbnQgYWN0aW9uLCB1aW50OF90CiAJCWVsc2UgaWYgKHJhZGVvbl9lbmNvZGVyLT5kZXZp Y2VzICYgKEFUT01fREVWSUNFX0RGUF9TVVBQT1JUKSkgewogCQkJaWYgKGRpZy0+Y29oZXJlbnRf bW9kZSkKIAkJCQlhcmdzLnYzLmFjQ29uZmlnLmZDb2hlcmVudE1vZGUgPSAxOworCQkJaWYgKHJh ZGVvbl9lbmNvZGVyLT5waXhlbF9jbG9jayA+IDE2NTAwMCkKKwkJCQlhcmdzLnYzLmFjQ29uZmln LmZEdWFsTGlua0Nvbm5lY3RvciA9IDE7CiAJCX0KIAl9IGVsc2UgaWYgKEFTSUNfSVNfRENFMzIo cmRldikpIHsKIAkJYXJncy52Mi5hY0NvbmZpZy51Y0VuY29kZXJTZWwgPSBkaWctPmRpZ19lbmNv ZGVyOwpAQCAtODg4LDYgKzg5MCw4IEBAIGF0b21iaW9zX2RpZ190cmFuc21pdHRlcl9zZXR1cChz dHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIsIGludCBhY3Rpb24sIHVpbnQ4X3QKIAkJZWxzZSBp ZiAocmFkZW9uX2VuY29kZXItPmRldmljZXMgJiAoQVRPTV9ERVZJQ0VfREZQX1NVUFBPUlQpKSB7 CiAJCQlpZiAoZGlnLT5jb2hlcmVudF9tb2RlKQogCQkJCWFyZ3MudjIuYWNDb25maWcuZkNvaGVy ZW50TW9kZSA9IDE7CisJCQlpZiAocmFkZW9uX2VuY29kZXItPnBpeGVsX2Nsb2NrID4gMTY1MDAw KQorCQkJCWFyZ3MudjIuYWNDb25maWcuZkR1YWxMaW5rQ29ubmVjdG9yID0gMTsKIAkJfQogCX0g ZWxzZSB7CiAJCWFyZ3MudjEudWNDb25maWcgPSBBVE9NX1RSQU5TTUlUVEVSX0NPTkZJR19DTEtT UkNfUFBMTDsKLS0gCjEuNS42LjMKCg== --00151748dd324ca7c104844cc292--