From: Harry Wentland Subject: [PATCH v2] Revert "drm/amd/display: Don't return ddc result and read_bytes in same return value" Date: Tue, 10 Jul 2018 10:20:05 -0400 Message-ID: <20180710142005.7121-1-harry.wentland@amd.com> References: <20180710003732.16836-2-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180710003732.16836-2-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, michel-otUistvHUpPR7s880joybQ@public.gmane.org Cc: Harry Wentland VGhpcyByZXZlcnRzIGNvbW1pdCA4YTYxYmMwODVmZmFiMzA3MWM1OWVmY2JlZmY0MDQ0YzAzNGU3 NDkwLgoKTmVlZCB0byByZXZlcnQgIm1ha2UgZG1fZHBfYXV4X3RyYW5zZmVyIHJldHVybiBwYXls b2FkIGJ5dGVzIGluc3RlYWQgb2YKc2l6ZSIsIHdoaWNoIHRoaXMgY29tbWl0IGlzIGJhc2VkIG9u LiBUaGF0IGNvbW1pdCB3YXMgcHJvYmxlbWF0aWMgb24Kb3RoZXIgT1Nlcy4gVGhlIHJlYWwgc29s dXRpb24gaXMgdG8gbGVhdmUgYWxsIHRoZSBlcnJvciBjaGVja2luZyB0byBEUk0KYW5kIGRvbid0 IGRvIGl0IGluIERDLCB3aGljaCBpcyBhZGRyZXNzZWQgYnkgIlJldHVybiBhdXggcmVwbGllcwpk aXJlY3RseSB0byBEUk0iIGxhdGVyIGluIHRoaXMgcGF0Y2hzZXQuCgp2MjogQWRkIHJlYXNvbiBm b3IgcmV2ZXJ0LgoKU2lnbmVkLW9mZi1ieTogSGFycnkgV2VudGxhbmQgPGhhcnJ5LndlbnRsYW5k QGFtZC5jb20+Ci0tLQogLi4uL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV9tc3RfdHlwZXMu YyAgIHwgMjAgKysrKysrKystLS0tLS0tLS0tLQogLi4uL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMv Y29yZS9kY19saW5rX2RkYy5jIHwgMTAgKysrLS0tLS0tLQogLi4uL2dwdS9kcm0vYW1kL2Rpc3Bs YXkvZGMvaW5jL2RjX2xpbmtfZGRjLmggIHwgIDUgKystLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTMg aW5zZXJ0aW9ucygrKSwgMjIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fbXN0X3R5cGVzLmMgYi9kcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV9tc3RfdHlwZXMuYwppbmRl eCA4ZjQyZTU2MTYzOTAuLmQ0M2E2NWM2Y2VkOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fbXN0X3R5cGVzLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fbXN0X3R5cGVzLmMKQEAg LTgzLDIyICs4MywyMSBAQCBzdGF0aWMgc3NpemVfdCBkbV9kcF9hdXhfdHJhbnNmZXIoc3RydWN0 IGRybV9kcF9hdXggKmF1eCwKIAllbnVtIGkyY19tb3RfbW9kZSBtb3QgPSAobXNnLT5yZXF1ZXN0 ICYgRFBfQVVYX0kyQ19NT1QpID8KIAkJSTJDX01PVF9UUlVFIDogSTJDX01PVF9GQUxTRTsKIAll bnVtIGRkY19yZXN1bHQgcmVzOwotCXVpbnQzMl90IHJlYWRfYnl0ZXMgPSBtc2ctPnNpemU7CisJ c3NpemVfdCByZWFkX2J5dGVzOwogCiAJaWYgKFdBUk5fT04obXNnLT5zaXplID4gMTYpKQogCQly ZXR1cm4gLUUyQklHOwogCiAJc3dpdGNoIChtc2ctPnJlcXVlc3QgJiB+RFBfQVVYX0kyQ19NT1Qp IHsKIAljYXNlIERQX0FVWF9OQVRJVkVfUkVBRDoKLQkJcmVzID0gZGFsX2RkY19zZXJ2aWNlX3Jl YWRfZHBjZF9kYXRhKAorCQlyZWFkX2J5dGVzID0gZGFsX2RkY19zZXJ2aWNlX3JlYWRfZHBjZF9k YXRhKAogCQkJCVRPX0RNX0FVWChhdXgpLT5kZGNfc2VydmljZSwKIAkJCQlmYWxzZSwKIAkJCQlJ MkNfTU9UX1VOREVGLAogCQkJCW1zZy0+YWRkcmVzcywKIAkJCQltc2ctPmJ1ZmZlciwKLQkJCQlt c2ctPnNpemUsCi0JCQkJJnJlYWRfYnl0ZXMpOwotCQlicmVhazsKKwkJCQltc2ctPnNpemUpOwor CQlyZXR1cm4gcmVhZF9ieXRlczsKIAljYXNlIERQX0FVWF9OQVRJVkVfV1JJVEU6CiAJCXJlcyA9 IGRhbF9kZGNfc2VydmljZV93cml0ZV9kcGNkX2RhdGEoCiAJCQkJVE9fRE1fQVVYKGF1eCktPmRk Y19zZXJ2aWNlLApAQCAtMTA5LDE1ICsxMDgsMTQgQEAgc3RhdGljIHNzaXplX3QgZG1fZHBfYXV4 X3RyYW5zZmVyKHN0cnVjdCBkcm1fZHBfYXV4ICphdXgsCiAJCQkJbXNnLT5zaXplKTsKIAkJYnJl YWs7CiAJY2FzZSBEUF9BVVhfSTJDX1JFQUQ6Ci0JCXJlcyA9IGRhbF9kZGNfc2VydmljZV9yZWFk X2RwY2RfZGF0YSgKKwkJcmVhZF9ieXRlcyA9IGRhbF9kZGNfc2VydmljZV9yZWFkX2RwY2RfZGF0 YSgKIAkJCQlUT19ETV9BVVgoYXV4KS0+ZGRjX3NlcnZpY2UsCiAJCQkJdHJ1ZSwKIAkJCQltb3Qs CiAJCQkJbXNnLT5hZGRyZXNzLAogCQkJCW1zZy0+YnVmZmVyLAotCQkJCW1zZy0+c2l6ZSwKLQkJ CQkmcmVhZF9ieXRlcyk7Ci0JCWJyZWFrOworCQkJCW1zZy0+c2l6ZSk7CisJCXJldHVybiByZWFk X2J5dGVzOwogCWNhc2UgRFBfQVVYX0kyQ19XUklURToKIAkJcmVzID0gZGFsX2RkY19zZXJ2aWNl X3dyaXRlX2RwY2RfZGF0YSgKIAkJCQlUT19ETV9BVVgoYXV4KS0+ZGRjX3NlcnZpY2UsCkBAIC0x MzksOSArMTM3LDcgQEAgc3RhdGljIHNzaXplX3QgZG1fZHBfYXV4X3RyYW5zZmVyKHN0cnVjdCBk cm1fZHBfYXV4ICphdXgsCiAJCSByID09IEREQ19SRVNVTFRfU1VDRVNTRlVMTCk7CiAjZW5kaWYK IAotCWlmIChyZXMgIT0gRERDX1JFU1VMVF9TVUNFU1NGVUxMKQotCQlyZXR1cm4gLUVJTzsKLQly ZXR1cm4gcmVhZF9ieXRlczsKKwlyZXR1cm4gbXNnLT5zaXplOwogfQogCiBzdGF0aWMgZW51bSBk cm1fY29ubmVjdG9yX3N0YXR1cwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNw bGF5L2RjL2NvcmUvZGNfbGlua19kZGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9k Yy9jb3JlL2RjX2xpbmtfZGRjLmMKaW5kZXggYWU0OGQ2MDNlYmQ2Li40OWMyZmFjZTFlN2EgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX2xpbmtfZGRj LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfbGlua19kZGMu YwpAQCAtNjI5LDE0ICs2MjksMTMgQEAgYm9vbCBkYWxfZGRjX3NlcnZpY2VfcXVlcnlfZGRjX2Rh dGEoCiAJcmV0dXJuIHJldDsKIH0KIAotZW51bSBkZGNfcmVzdWx0IGRhbF9kZGNfc2VydmljZV9y ZWFkX2RwY2RfZGF0YSgKK3NzaXplX3QgZGFsX2RkY19zZXJ2aWNlX3JlYWRfZHBjZF9kYXRhKAog CXN0cnVjdCBkZGNfc2VydmljZSAqZGRjLAogCWJvb2wgaTJjLAogCWVudW0gaTJjX21vdF9tb2Rl IG1vdCwKIAl1aW50MzJfdCBhZGRyZXNzLAogCXVpbnQ4X3QgKmRhdGEsCi0JdWludDMyX3QgbGVu LAotCXVpbnQzMl90ICpyZWFkKQorCXVpbnQzMl90IGxlbikKIHsKIAlzdHJ1Y3QgYXV4X3BheWxv YWQgcmVhZF9wYXlsb2FkID0gewogCQkuaTJjX292ZXJfYXV4ID0gaTJjLApAQCAtNjUzLDggKzY1 Miw2IEBAIGVudW0gZGRjX3Jlc3VsdCBkYWxfZGRjX3NlcnZpY2VfcmVhZF9kcGNkX2RhdGEoCiAJ CS5tb3QgPSBtb3QKIAl9OwogCi0JKnJlYWQgPSAwOwotCiAJaWYgKGxlbiA+IERFRkFVTFRfQVVY X01BWF9EQVRBX1NJWkUpIHsKIAkJQlJFQUtfVE9fREVCVUdHRVIoKTsKIAkJcmV0dXJuIEREQ19S RVNVTFRfRkFJTEVEX0lOVkFMSURfT1BFUkFUSU9OOwpAQCAtNjY0LDggKzY2MSw3IEBAIGVudW0g ZGRjX3Jlc3VsdCBkYWxfZGRjX3NlcnZpY2VfcmVhZF9kcGNkX2RhdGEoCiAJCWRkYy0+Y3R4LT5p MmNhdXgsCiAJCWRkYy0+ZGRjX3BpbiwKIAkJJmNvbW1hbmQpKSB7Ci0JCSpyZWFkID0gY29tbWFu ZC5wYXlsb2Fkcy0+bGVuZ3RoOwotCQlyZXR1cm4gRERDX1JFU1VMVF9TVUNFU1NGVUxMOworCQly ZXR1cm4gKHNzaXplX3QpY29tbWFuZC5wYXlsb2Fkcy0+bGVuZ3RoOwogCX0KIAogCXJldHVybiBE RENfUkVTVUxUX0ZBSUxFRF9PUEVSQVRJT047CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvZGMvaW5jL2RjX2xpbmtfZGRjLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rp c3BsYXkvZGMvaW5jL2RjX2xpbmtfZGRjLmgKaW5kZXggMzBiM2EwOGI5MWJlLi4wOTBiN2E4ZGQ2 N2IgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9pbmMvZGNfbGlu a19kZGMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2RjX2xpbmtf ZGRjLmgKQEAgLTEwMiwxNCArMTAyLDEzIEBAIGJvb2wgZGFsX2RkY19zZXJ2aWNlX3F1ZXJ5X2Rk Y19kYXRhKAogCQl1aW50OF90ICpyZWFkX2J1ZiwKIAkJdWludDMyX3QgcmVhZF9zaXplKTsKIAot ZW51bSBkZGNfcmVzdWx0IGRhbF9kZGNfc2VydmljZV9yZWFkX2RwY2RfZGF0YSgKK3NzaXplX3Qg ZGFsX2RkY19zZXJ2aWNlX3JlYWRfZHBjZF9kYXRhKAogCQlzdHJ1Y3QgZGRjX3NlcnZpY2UgKmRk YywKIAkJYm9vbCBpMmMsCiAJCWVudW0gaTJjX21vdF9tb2RlIG1vdCwKIAkJdWludDMyX3QgYWRk cmVzcywKIAkJdWludDhfdCAqZGF0YSwKLQkJdWludDMyX3QgbGVuLAotCQl1aW50MzJfdCAqcmVh ZCk7CisJCXVpbnQzMl90IGxlbik7CiAKIGVudW0gZGRjX3Jlc3VsdCBkYWxfZGRjX3NlcnZpY2Vf d3JpdGVfZHBjZF9kYXRhKAogCQlzdHJ1Y3QgZGRjX3NlcnZpY2UgKmRkYywKLS0gCjIuMTcuMQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBt YWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==