From: Harry Wentland Subject: [PATCH 25/76] drm/amd/dal: fix DDC pad mode detection logic Date: Mon, 21 Nov 2016 18:00:45 -0500 Message-ID: <20161121230136.5208-26-harry.wentland@amd.com> References: <20161121230136.5208-1-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20161121230136.5208-1-harry.wentland-5C7GfCeVMHo@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Tony Cheng RnJvbTogVG9ueSBDaGVuZyA8dG9ueS5jaGVuZ0BhbWQuY29tPgoKLSB1c2UgcmVnX2hlbHBlciBt YWNybyBmb3IgYWxsIHJlZ2lzdGVyIGZpZWxkIGFjY2VzcwotIHJldmlzZSBsb2dpYyBmb2xsb3dp bmcgZ29sZGVuIENaIGRhbDIgbG9naWMKClNpZ25lZC1vZmYtYnk6IFRvbnkgQ2hlbmcgPHRvbnku Y2hlbmdAYW1kLmNvbT4KQWNrZWQtYnk6IEhhcnJ5IFdlbnRsYW5kIDxoYXJyeS53ZW50bGFuZEBh bWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGFsL2RjL2RjX2hlbHBlci5jICAgICAg fCAxMiArKysrKwogZHJpdmVycy9ncHUvZHJtL2FtZC9kYWwvZGMvZ3Bpby9od19kZGMuYyAgICB8 IDc4ICsrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rh bC9kYy9pbmMvcmVnX2hlbHBlci5oIHwgMTEgKysrKwogMyBmaWxlcyBjaGFuZ2VkLCA1MCBpbnNl cnRpb25zKCspLCA1MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2RhbC9kYy9kY19oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGFsL2RjL2RjX2hl bHBlci5jCmluZGV4IDg0MWQ1OGI4Y2Q3Yy4uNmFjODAxNDIyYzYzIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2RhbC9kYy9kY19oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2RhbC9kYy9kY19oZWxwZXIuYwpAQCAtNDksNiArNDksMTggQEAgdWludDMyX3QgZ2VuZXJp Y19yZWdfZ2V0Mihjb25zdCBzdHJ1Y3QgZGNfY29udGV4dCAqY3R4LCB1aW50MzJfdCBhZGRyLAog CXJldHVybiByZWdfdmFsOwogfQogCit1aW50MzJfdCBnZW5lcmljX3JlZ19nZXQzKGNvbnN0IHN0 cnVjdCBkY19jb250ZXh0ICpjdHgsIHVpbnQzMl90IGFkZHIsCisJCXVpbnQ4X3Qgc2hpZnQxLCB1 aW50MzJfdCBtYXNrMSwgdWludDMyX3QgKmZpZWxkX3ZhbHVlMSwKKwkJdWludDhfdCBzaGlmdDIs IHVpbnQzMl90IG1hc2syLCB1aW50MzJfdCAqZmllbGRfdmFsdWUyLAorCQl1aW50OF90IHNoaWZ0 MywgdWludDMyX3QgbWFzazMsIHVpbnQzMl90ICpmaWVsZF92YWx1ZTMpCit7CisJdWludDMyX3Qg cmVnX3ZhbCA9IGRtX3JlYWRfcmVnKGN0eCwgYWRkcik7CisJKmZpZWxkX3ZhbHVlMSA9IGdldF9y ZWdfZmllbGRfdmFsdWVfZXgocmVnX3ZhbCwgbWFzazEsIHNoaWZ0MSk7CisJKmZpZWxkX3ZhbHVl MiA9IGdldF9yZWdfZmllbGRfdmFsdWVfZXgocmVnX3ZhbCwgbWFzazIsIHNoaWZ0Mik7CisJKmZp ZWxkX3ZhbHVlMyA9IGdldF9yZWdfZmllbGRfdmFsdWVfZXgocmVnX3ZhbCwgbWFzazMsIHNoaWZ0 Myk7CisJcmV0dXJuIHJlZ192YWw7Cit9CisKIC8qIG5vdGU6ICB2YSB2ZXJzaW9uIG9mIHRoaXMg aXMgcHJldHR5IGJhZCBpZGVhLCBzaW5jZSB0aGVyZSBpcyBhIG91dHB1dCBwYXJhbWV0ZXIgcGFz cyBieSBwb2ludGVyCiAgKiBjb21waWxlciB3b24ndCBiZSBhYmxlIHRvIGNoZWNrIGZvciBzaXpl IG1hdGNoIGFuZCBpcyBwcm9uZSB0byBzdGFjayBjb3JydXB0aW9uIHR5cGUgb2YgYnVncwogCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2RhbC9kYy9ncGlvL2h3X2RkYy5jIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9kYWwvZGMvZ3Bpby9od19kZGMuYwppbmRleCBlMDI4NDNkMzI3MzUu LjQ3ZTBmOGYyNGE4NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kYWwvZGMvZ3Bp by9od19kZGMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2RhbC9kYy9ncGlvL2h3X2RkYy5j CkBAIC02Niw3ICs2Niw2IEBAIHN0YXRpYyBlbnVtIGdwaW9fcmVzdWx0IHNldF9jb25maWcoCiB7 CiAJc3RydWN0IGh3X2RkYyAqZGRjID0gSFdfRERDX0ZST01fQkFTRShwdHIpOwogCXN0cnVjdCBo d19ncGlvICpod19ncGlvID0gTlVMTDsKLQl1aW50MzJfdCBhZGRyOwogCXVpbnQzMl90IHJlZ3Zh bDsKIAl1aW50MzJfdCBkZGNfZGF0YV9wZF9lbiA9IDA7CiAJdWludDMyX3QgZGRjX2Nsa19wZF9l biA9IDA7CkBAIC03OSwyMiArNzgsMTAgQEAgc3RhdGljIGVudW0gZ3Bpb19yZXN1bHQgc2V0X2Nv bmZpZygKIAkJcmV0dXJuIEdQSU9fUkVTVUxUX05VTExfSEFORExFOwogCX0KIAotCS8qIHN3aXRj aCBkdWFsIG1vZGUgR1BJTyB0byBJMkMvQVVYIG1vZGUgKi8KLQlhZGRyID0gZGRjLT5iYXNlLnJl Z3MtPk1BU0tfcmVnOwotCi0JcmVndmFsID0gUkVHX1JFQUQoZ3Bpby5NQVNLX3JlZyk7Ci0KLQlk ZGNfZGF0YV9wZF9lbiA9IGdldF9yZWdfZmllbGRfdmFsdWVfZXgoCi0JCQlyZWd2YWwsCi0JCQlG TigsRENfR1BJT19EREMxREFUQV9QRF9FTikpOwotCi0JZGRjX2Nsa19wZF9lbiA9IGdldF9yZWdf ZmllbGRfdmFsdWVfZXgoCi0JCQlyZWd2YWwsCi0JCQlGTigsRENfR1BJT19EREMxQ0xLX1BEX0VO KSk7Ci0KLQlhdXhfcGFkX21vZGUgPSBnZXRfcmVnX2ZpZWxkX3ZhbHVlX2V4KAotCQkJcmVndmFs LAotCQkJRk4oLEFVWF9QQUQxX01PREUpKTsKKwlyZWd2YWwgPSBSRUdfR0VUXzMoZ3Bpby5NQVNL X3JlZywKKwkJCURDX0dQSU9fRERDMURBVEFfUERfRU4sICZkZGNfZGF0YV9wZF9lbiwKKwkJCURD X0dQSU9fRERDMUNMS19QRF9FTiwgJmRkY19jbGtfcGRfZW4sCisJCQlBVVhfUEFEMV9NT0RFLCAm YXV4X3BhZF9tb2RlKTsKIAogCXN3aXRjaCAoY29uZmlnX2RhdGEtPmNvbmZpZy5kZGMudHlwZSkg ewogCWNhc2UgR1BJT19ERENfQ09ORklHX1RZUEVfTU9ERV9JMkM6CkBAIC0xMDQsNTIgKzkxLDM5 IEBAIHN0YXRpYyBlbnVtIGdwaW9fcmVzdWx0IHNldF9jb25maWcoCiAJCSAqIGlzIHJlcXVpcmVk IGZvciBkZXRlY3Rpb24gb2YgQVVYIG1vZGUgKi8KIAkJaWYgKGh3X2dwaW8tPmJhc2UuZW4gIT0g R1BJT19ERENfTElORV9WSVBfUEFEKSB7CiAJCQlpZiAoIWRkY19kYXRhX3BkX2VuIHx8ICFkZGNf Y2xrX3BkX2VuKSB7Ci0JCQkJc2V0X3JlZ19maWVsZF92YWx1ZV9leCgKLQkJCQkJcmVndmFsLAot CQkJCQkxLAotCQkJCQlGTigsRENfR1BJT19EREMxREFUQV9QRF9FTikpOwotCi0JCQkJc2V0X3Jl Z19maWVsZF92YWx1ZV9leCgKLQkJCQkJcmVndmFsLAotCQkJCQkxLAotCQkJCQlGTigsRENfR1BJ T19EREMxQ0xLX1BEX0VOKSk7CiAKLQkJCQlSRUdfV1JJVEUoZ3Bpby5NQVNLX3JlZywgcmVndmFs KTsKKwkJCQlSRUdfU0VUXzIoZ3Bpby5NQVNLX3JlZywgcmVndmFsLAorCQkJCQkJRENfR1BJT19E REMxREFUQV9QRF9FTiwgMSwKKwkJCQkJCURDX0dQSU9fRERDMUNMS19QRF9FTiwgMSk7CiAKIAkJ CQlpZiAoY29uZmlnX2RhdGEtPnR5cGUgPT0KLQkJCQkJR1BJT19DT05GSUdfVFlQRV9JMkNfQVVY X0RVQUxfTU9ERSkKLQkJCQkJLyogc2hvdWxkIG5vdCBhZmZlY3Qgbm9ybWFsIEkyQyBSL1cgKi8K LQkJCQkJLyogW2FuYXVtb3ZdIGluIERBTDIsIHRoZXJlIHdhcwotCQkJCQkgKiBkY19zZXJ2aWNl X2RlbGF5X2luX21pY3Jvc2Vjb25kcygyNTAwKTsgKi8KKwkJCQkJCUdQSU9fQ09ORklHX1RZUEVf STJDX0FVWF9EVUFMX01PREUpCiAJCQkJCW1zbGVlcCgzKTsKIAkJCX0KIAkJfSBlbHNlIHsKLQkJ CXVpbnQzMl90IHJlZzIgPSByZWd2YWw7CisJCQl1aW50MzJfdCByZWcyOwogCQkJdWludDMyX3Qg c2RhX3BkX2RpcyA9IDA7CiAJCQl1aW50MzJfdCBzY2xfcGRfZGlzID0gMDsKIAotCQkJc2RhX3Bk X2RpcyA9IGdldF9yZWdfZmllbGRfdmFsdWVfZXgoCi0JCQkJCXJlZzIsCi0JCQkJCUZOKCxEQ19H UElPX1NEQV9QRF9ESVMpKTsKKwkJCXJlZzIgPSBSRUdfR0VUXzIoZ3Bpby5NQVNLX3JlZywKKwkJ CQkJRENfR1BJT19TREFfUERfRElTLCAmc2RhX3BkX2RpcywKKwkJCQkJRENfR1BJT19TQ0xfUERf RElTLCAmc2NsX3BkX2Rpcyk7CiAKLQkJCXNjbF9wZF9kaXMgPSBnZXRfcmVnX2ZpZWxkX3ZhbHVl X2V4KAotCQkJCQlyZWcyLAotCQkJCQlGTigsRENfR1BJT19TQ0xfUERfRElTKSk7CisJCQlpZiAo c2RhX3BkX2RpcykgeworCQkJCVJFR19TRVQoZ3Bpby5NQVNLX3JlZywgcmVndmFsLAorCQkJCQkJ RENfR1BJT19TREFfUERfRElTLCAwKTsKIAotCQkJaWYgKHNkYV9wZF9kaXMpCi0JCQkJc2RhX3Bk X2RpcyA9IDA7Ci0KLQkJCWlmICghc2NsX3BkX2RpcykKLQkJCQlzY2xfcGRfZGlzID0gMTsKKwkJ CQlpZiAoY29uZmlnX2RhdGEtPnR5cGUgPT0KKwkJCQkJCUdQSU9fQ09ORklHX1RZUEVfSTJDX0FV WF9EVUFMX01PREUpCisJCQkJCW1zbGVlcCgzKTsKKwkJCX0KIAotCQkJaWYgKHNkYV9wZF9kaXMg fHwgIXNjbF9wZF9kaXMpIHsKLQkJCQlSRUdfV1JJVEUoZ3Bpby5NQVNLX3JlZywgcmVnMik7CisJ CQlpZiAoIXNjbF9wZF9kaXMpIHsKKwkJCQlSRUdfU0VUKGdwaW8uTUFTS19yZWcsIHJlZ3ZhbCwK KwkJCQkJCURDX0dQSU9fU0NMX1BEX0RJUywgMSk7CiAKIAkJCQlpZiAoY29uZmlnX2RhdGEtPnR5 cGUgPT0KLQkJCQkJR1BJT19DT05GSUdfVFlQRV9JMkNfQVVYX0RVQUxfTU9ERSkKLQkJCQkJLyog c2hvdWxkIG5vdCBhZmZlY3Qgbm9ybWFsIEkyQyBSL1cgKi8KLQkJCQkJLyogW2FuYXVtb3ZdIGlu IERBTDIsIHRoZXJlIHdhcwotCQkJCQkgKiBkY19zZXJ2aWNlX2RlbGF5X2luX21pY3Jvc2Vjb25k cygyNTAwKTsgKi8KKwkJCQkJCUdQSU9fQ09ORklHX1RZUEVfSTJDX0FVWF9EVUFMX01PREUpCiAJ CQkJCW1zbGVlcCgzKTsKIAkJCX0KIAkJfQpAQCAtMTY2LDE0ICsxNDAsMTYgQEAgc3RhdGljIGVu dW0gZ3Bpb19yZXN1bHQgc2V0X2NvbmZpZygKIAkJCS8qIHNldCB0aGUgSTJDIHBhZCBtb2RlICov CiAJCQkvKiByZWFkIHRoZSByZWdpc3RlciBhZ2FpbiwKIAkJCSAqIHNvbWUgYml0cyBtYXkgaGF2 ZSBiZWVuIGNoYW5nZWQgKi8KLQkJCVJFR19VUERBVEUoZ3Bpby5NQVNLX3JlZywgQVVYX1BBRDFf TU9ERSwgMSk7CisJCQlSRUdfVVBEQVRFKGdwaW8uTUFTS19yZWcsCisJCQkJCUFVWF9QQUQxX01P REUsIDApOwogCQl9CiAKIAkJcmV0dXJuIEdQSU9fUkVTVUxUX09LOwogCWNhc2UgR1BJT19ERENf Q09ORklHX1RZUEVfTU9ERV9BVVg6CiAJCS8qIHNldCB0aGUgQVVYIHBhZCBtb2RlICovCiAJCWlm ICghYXV4X3BhZF9tb2RlKSB7Ci0JCQlSRUdfVVBEQVRFKGdwaW8uTUFTS19yZWcsIEFVWF9QQUQx X01PREUsIDEpOworCQkJUkVHX1NFVChncGlvLk1BU0tfcmVnLCByZWd2YWwsCisJCQkJCUFVWF9Q QUQxX01PREUsIDEpOwogCQl9CiAKIAkJcmV0dXJuIEdQSU9fUkVTVUxUX09LOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kYWwvZGMvaW5jL3JlZ19oZWxwZXIuaCBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGFsL2RjL2luYy9yZWdfaGVscGVyLmgKaW5kZXggMWUzMzA4ZGZiNjRhLi5l ZjY1MmFiY2QyNzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGFsL2RjL2luYy9y ZWdfaGVscGVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kYWwvZGMvaW5jL3JlZ19oZWxw ZXIuaApAQCAtMTEzLDYgKzExMywxMiBAQAogCQkJCUZOKHJlZ19uYW1lLCBmMSksIHYxLCBcCiAJ CQkJRk4ocmVnX25hbWUsIGYyKSwgdjIpCiAKKyNkZWZpbmUgUkVHX0dFVF8zKHJlZ19uYW1lLCBm MSwgdjEsIGYyLCB2MiwgZjMsIHYzKQlcCisJCWdlbmVyaWNfcmVnX2dldDMoQ1RYLCBSRUcocmVn X25hbWUpLCBcCisJCQkJRk4ocmVnX25hbWUsIGYxKSwgdjEsIFwKKwkJCQlGTihyZWdfbmFtZSwg ZjIpLCB2MiwgXAorCQkJCUZOKHJlZ19uYW1lLCBmMyksIHYzKQorCiAvKiBtYWNybyB0byBwb2xs IGFuZCB3YWl0IGZvciBhIHJlZ2lzdGVyIGZpZWxkIHRvIHJlYWQgYmFjayBnaXZlbiB2YWx1ZSAq LwogCiAjZGVmaW5lIFJFR19XQUlUKHJlZ19uYW1lLCBmaWVsZCwgdmFsLCBkZWxheSwgbWF4X3Ry eSkJXApAQCAtMjI0LDQgKzIzMCw5IEBAIHVpbnQzMl90IGdlbmVyaWNfcmVnX2dldDIoY29uc3Qg c3RydWN0IGRjX2NvbnRleHQgKmN0eCwgdWludDMyX3QgYWRkciwKIAkJdWludDhfdCBzaGlmdDEs IHVpbnQzMl90IG1hc2sxLCB1aW50MzJfdCAqZmllbGRfdmFsdWUxLAogCQl1aW50OF90IHNoaWZ0 MiwgdWludDMyX3QgbWFzazIsIHVpbnQzMl90ICpmaWVsZF92YWx1ZTIpOwogCit1aW50MzJfdCBn ZW5lcmljX3JlZ19nZXQzKGNvbnN0IHN0cnVjdCBkY19jb250ZXh0ICpjdHgsIHVpbnQzMl90IGFk ZHIsCisJCXVpbnQ4X3Qgc2hpZnQxLCB1aW50MzJfdCBtYXNrMSwgdWludDMyX3QgKmZpZWxkX3Zh bHVlMSwKKwkJdWludDhfdCBzaGlmdDIsIHVpbnQzMl90IG1hc2syLCB1aW50MzJfdCAqZmllbGRf dmFsdWUyLAorCQl1aW50OF90IHNoaWZ0MywgdWludDMyX3QgbWFzazMsIHVpbnQzMl90ICpmaWVs ZF92YWx1ZTMpOworCiAjZW5kaWYgLyogRFJJVkVSU19HUFVfRFJNX0FNRF9EQUxfREVWX0RDX0lO Q19SRUdfSEVMUEVSX0hfICovCi0tIAoyLjEwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vYW1kLWdmeAo=