From: Harry Wentland Subject: [PATCH 01/54] Revert "drm/amd/display: Don't return ddc result and read_bytes in same return value" Date: Mon, 9 Jul 2018 20:36:39 -0400 Message-ID: <20180710003732.16836-2-harry.wentland@amd.com> References: <20180710003732.16836-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: <20180710003732.16836-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: Harry Wentland VGhpcyByZXZlcnRzIGNvbW1pdCA4YTYxYmMwODVmZmFiMzA3MWM1OWVmY2JlZmY0MDQ0YzAzNGU3 NDkwLgoKU2lnbmVkLW9mZi1ieTogSGFycnkgV2VudGxhbmQgPGhhcnJ5LndlbnRsYW5kQGFtZC5j b20+Ci0tLQogLi4uL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV9tc3RfdHlwZXMuYyAgIHwg MjAgKysrKysrKystLS0tLS0tLS0tLQogLi4uL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9k Y19saW5rX2RkYy5jIHwgMTAgKysrLS0tLS0tLQogLi4uL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMv aW5jL2RjX2xpbmtfZGRjLmggIHwgIDUgKystLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTMgaW5zZXJ0 aW9ucygrKSwgMjIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fbXN0X3R5cGVzLmMgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV9tc3RfdHlwZXMuYwppbmRleCA4ZjQy ZTU2MTYzOTAuLmQ0M2E2NWM2Y2VkOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9k aXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fbXN0X3R5cGVzLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fbXN0X3R5cGVzLmMKQEAgLTgzLDIy ICs4MywyMSBAQCBzdGF0aWMgc3NpemVfdCBkbV9kcF9hdXhfdHJhbnNmZXIoc3RydWN0IGRybV9k cF9hdXggKmF1eCwKIAllbnVtIGkyY19tb3RfbW9kZSBtb3QgPSAobXNnLT5yZXF1ZXN0ICYgRFBf QVVYX0kyQ19NT1QpID8KIAkJSTJDX01PVF9UUlVFIDogSTJDX01PVF9GQUxTRTsKIAllbnVtIGRk Y19yZXN1bHQgcmVzOwotCXVpbnQzMl90IHJlYWRfYnl0ZXMgPSBtc2ctPnNpemU7CisJc3NpemVf dCByZWFkX2J5dGVzOwogCiAJaWYgKFdBUk5fT04obXNnLT5zaXplID4gMTYpKQogCQlyZXR1cm4g LUUyQklHOwogCiAJc3dpdGNoIChtc2ctPnJlcXVlc3QgJiB+RFBfQVVYX0kyQ19NT1QpIHsKIAlj YXNlIERQX0FVWF9OQVRJVkVfUkVBRDoKLQkJcmVzID0gZGFsX2RkY19zZXJ2aWNlX3JlYWRfZHBj ZF9kYXRhKAorCQlyZWFkX2J5dGVzID0gZGFsX2RkY19zZXJ2aWNlX3JlYWRfZHBjZF9kYXRhKAog CQkJCVRPX0RNX0FVWChhdXgpLT5kZGNfc2VydmljZSwKIAkJCQlmYWxzZSwKIAkJCQlJMkNfTU9U X1VOREVGLAogCQkJCW1zZy0+YWRkcmVzcywKIAkJCQltc2ctPmJ1ZmZlciwKLQkJCQltc2ctPnNp emUsCi0JCQkJJnJlYWRfYnl0ZXMpOwotCQlicmVhazsKKwkJCQltc2ctPnNpemUpOworCQlyZXR1 cm4gcmVhZF9ieXRlczsKIAljYXNlIERQX0FVWF9OQVRJVkVfV1JJVEU6CiAJCXJlcyA9IGRhbF9k ZGNfc2VydmljZV93cml0ZV9kcGNkX2RhdGEoCiAJCQkJVE9fRE1fQVVYKGF1eCktPmRkY19zZXJ2 aWNlLApAQCAtMTA5LDE1ICsxMDgsMTQgQEAgc3RhdGljIHNzaXplX3QgZG1fZHBfYXV4X3RyYW5z ZmVyKHN0cnVjdCBkcm1fZHBfYXV4ICphdXgsCiAJCQkJbXNnLT5zaXplKTsKIAkJYnJlYWs7CiAJ Y2FzZSBEUF9BVVhfSTJDX1JFQUQ6Ci0JCXJlcyA9IGRhbF9kZGNfc2VydmljZV9yZWFkX2RwY2Rf ZGF0YSgKKwkJcmVhZF9ieXRlcyA9IGRhbF9kZGNfc2VydmljZV9yZWFkX2RwY2RfZGF0YSgKIAkJ CQlUT19ETV9BVVgoYXV4KS0+ZGRjX3NlcnZpY2UsCiAJCQkJdHJ1ZSwKIAkJCQltb3QsCiAJCQkJ bXNnLT5hZGRyZXNzLAogCQkJCW1zZy0+YnVmZmVyLAotCQkJCW1zZy0+c2l6ZSwKLQkJCQkmcmVh ZF9ieXRlcyk7Ci0JCWJyZWFrOworCQkJCW1zZy0+c2l6ZSk7CisJCXJldHVybiByZWFkX2J5dGVz OwogCWNhc2UgRFBfQVVYX0kyQ19XUklURToKIAkJcmVzID0gZGFsX2RkY19zZXJ2aWNlX3dyaXRl X2RwY2RfZGF0YSgKIAkJCQlUT19ETV9BVVgoYXV4KS0+ZGRjX3NlcnZpY2UsCkBAIC0xMzksOSAr MTM3LDcgQEAgc3RhdGljIHNzaXplX3QgZG1fZHBfYXV4X3RyYW5zZmVyKHN0cnVjdCBkcm1fZHBf YXV4ICphdXgsCiAJCSByID09IEREQ19SRVNVTFRfU1VDRVNTRlVMTCk7CiAjZW5kaWYKIAotCWlm IChyZXMgIT0gRERDX1JFU1VMVF9TVUNFU1NGVUxMKQotCQlyZXR1cm4gLUVJTzsKLQlyZXR1cm4g cmVhZF9ieXRlczsKKwlyZXR1cm4gbXNnLT5zaXplOwogfQogCiBzdGF0aWMgZW51bSBkcm1fY29u bmVjdG9yX3N0YXR1cwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Rj L2NvcmUvZGNfbGlua19kZGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3Jl L2RjX2xpbmtfZGRjLmMKaW5kZXggYWU0OGQ2MDNlYmQ2Li40OWMyZmFjZTFlN2EgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX2xpbmtfZGRjLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfbGlua19kZGMuYwpAQCAt NjI5LDE0ICs2MjksMTMgQEAgYm9vbCBkYWxfZGRjX3NlcnZpY2VfcXVlcnlfZGRjX2RhdGEoCiAJ cmV0dXJuIHJldDsKIH0KIAotZW51bSBkZGNfcmVzdWx0IGRhbF9kZGNfc2VydmljZV9yZWFkX2Rw Y2RfZGF0YSgKK3NzaXplX3QgZGFsX2RkY19zZXJ2aWNlX3JlYWRfZHBjZF9kYXRhKAogCXN0cnVj dCBkZGNfc2VydmljZSAqZGRjLAogCWJvb2wgaTJjLAogCWVudW0gaTJjX21vdF9tb2RlIG1vdCwK IAl1aW50MzJfdCBhZGRyZXNzLAogCXVpbnQ4X3QgKmRhdGEsCi0JdWludDMyX3QgbGVuLAotCXVp bnQzMl90ICpyZWFkKQorCXVpbnQzMl90IGxlbikKIHsKIAlzdHJ1Y3QgYXV4X3BheWxvYWQgcmVh ZF9wYXlsb2FkID0gewogCQkuaTJjX292ZXJfYXV4ID0gaTJjLApAQCAtNjUzLDggKzY1Miw2IEBA IGVudW0gZGRjX3Jlc3VsdCBkYWxfZGRjX3NlcnZpY2VfcmVhZF9kcGNkX2RhdGEoCiAJCS5tb3Qg PSBtb3QKIAl9OwogCi0JKnJlYWQgPSAwOwotCiAJaWYgKGxlbiA+IERFRkFVTFRfQVVYX01BWF9E QVRBX1NJWkUpIHsKIAkJQlJFQUtfVE9fREVCVUdHRVIoKTsKIAkJcmV0dXJuIEREQ19SRVNVTFRf RkFJTEVEX0lOVkFMSURfT1BFUkFUSU9OOwpAQCAtNjY0LDggKzY2MSw3IEBAIGVudW0gZGRjX3Jl c3VsdCBkYWxfZGRjX3NlcnZpY2VfcmVhZF9kcGNkX2RhdGEoCiAJCWRkYy0+Y3R4LT5pMmNhdXgs CiAJCWRkYy0+ZGRjX3BpbiwKIAkJJmNvbW1hbmQpKSB7Ci0JCSpyZWFkID0gY29tbWFuZC5wYXls b2Fkcy0+bGVuZ3RoOwotCQlyZXR1cm4gRERDX1JFU1VMVF9TVUNFU1NGVUxMOworCQlyZXR1cm4g KHNzaXplX3QpY29tbWFuZC5wYXlsb2Fkcy0+bGVuZ3RoOwogCX0KIAogCXJldHVybiBERENfUkVT VUxUX0ZBSUxFRF9PUEVSQVRJT047CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rp c3BsYXkvZGMvaW5jL2RjX2xpbmtfZGRjLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkv ZGMvaW5jL2RjX2xpbmtfZGRjLmgKaW5kZXggMzBiM2EwOGI5MWJlLi4wOTBiN2E4ZGQ2N2IgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9pbmMvZGNfbGlua19kZGMu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2RjX2xpbmtfZGRjLmgK QEAgLTEwMiwxNCArMTAyLDEzIEBAIGJvb2wgZGFsX2RkY19zZXJ2aWNlX3F1ZXJ5X2RkY19kYXRh KAogCQl1aW50OF90ICpyZWFkX2J1ZiwKIAkJdWludDMyX3QgcmVhZF9zaXplKTsKIAotZW51bSBk ZGNfcmVzdWx0IGRhbF9kZGNfc2VydmljZV9yZWFkX2RwY2RfZGF0YSgKK3NzaXplX3QgZGFsX2Rk Y19zZXJ2aWNlX3JlYWRfZHBjZF9kYXRhKAogCQlzdHJ1Y3QgZGRjX3NlcnZpY2UgKmRkYywKIAkJ Ym9vbCBpMmMsCiAJCWVudW0gaTJjX21vdF9tb2RlIG1vdCwKIAkJdWludDMyX3QgYWRkcmVzcywK IAkJdWludDhfdCAqZGF0YSwKLQkJdWludDMyX3QgbGVuLAotCQl1aW50MzJfdCAqcmVhZCk7CisJ CXVpbnQzMl90IGxlbik7CiAKIGVudW0gZGRjX3Jlc3VsdCBkYWxfZGRjX3NlcnZpY2Vfd3JpdGVf ZHBjZF9kYXRhKAogCQlzdHJ1Y3QgZGRjX3NlcnZpY2UgKmRkYywKLS0gCjIuMTcuMQoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5n IGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==