From: Harry Wentland Subject: [PATCH v2] Revert "drm/amd/display: make dm_dp_aux_transfer return payload bytes instead of size" Date: Tue, 10 Jul 2018 10:20:44 -0400 Message-ID: <20180710142044.7205-1-harry.wentland@amd.com> References: <20180710003732.16836-3-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-3-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 VGhpcyByZXZlcnRzIGNvbW1pdCBjYzE5NTE0MTEzM2FjM2U3NjdkOTMwYmVkZDgyOTRjZWViZjFm MTBiLgoKVGhpcyBjb21taXQgd2FzIHByb2JsZW1hdGljIG9uIG90aGVyIE9TZXMuIFRoZSByZWFs IHNvbHV0aW9uIGlzIHRvCmxlYXZlIGFsbCB0aGUgZXJyb3IgY2hlY2tpbmcgdG8gRFJNIGFuZCBk b24ndCBkbyBpdCBpbiBEQywgd2hpY2ggaXMKYWRkcmVzc2VkIGJ5ICJSZXR1cm4gYXV4IHJlcGxp ZXMgZGlyZWN0bHkgdG8gRFJNIiBsYXRlciBpbiB0aGlzIHBhdGNoc2V0LgoKdjI6IEFkZCByZWFz b24gZm9yIHJldmVydC4KClNpZ25lZC1vZmYtYnk6IEhhcnJ5IFdlbnRsYW5kIDxoYXJyeS53ZW50 bGFuZEBhbWQuY29tPgotLS0KIC4uLi9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX21z dF90eXBlcy5jICAgfCAgOSArKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9k Yy9jb3JlL2RjX2xpbmtfZGRjLmMgfCAgNyArKystLS0tCiAuLi4vZ3B1L2RybS9hbWQvZGlzcGxh eS9kYy9pMmNhdXgvYXV4X2VuZ2luZS5jICAgIHwgMTUgKysrKysrKysrKysrKy0tCiBkcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvaTJjYXV4L2kyY2F1eC5jICAgIHwgIDEgLQogZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2luYy9kY19saW5rX2RkYy5oICB8ICAyICstCiA1IGZp bGVzIGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX21zdF90 eXBlcy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1f bXN0X3R5cGVzLmMKaW5kZXggZDQzYTY1YzZjZWQ4Li5kYjY2OWM0MjdkYWIgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX21zdF90eXBl cy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2Rt X21zdF90eXBlcy5jCkBAIC04MywyMSArODMsMjAgQEAgc3RhdGljIHNzaXplX3QgZG1fZHBfYXV4 X3RyYW5zZmVyKHN0cnVjdCBkcm1fZHBfYXV4ICphdXgsCiAJZW51bSBpMmNfbW90X21vZGUgbW90 ID0gKG1zZy0+cmVxdWVzdCAmIERQX0FVWF9JMkNfTU9UKSA/CiAJCUkyQ19NT1RfVFJVRSA6IEky Q19NT1RfRkFMU0U7CiAJZW51bSBkZGNfcmVzdWx0IHJlczsKLQlzc2l6ZV90IHJlYWRfYnl0ZXM7 CiAKIAlpZiAoV0FSTl9PTihtc2ctPnNpemUgPiAxNikpCiAJCXJldHVybiAtRTJCSUc7CiAKIAlz d2l0Y2ggKG1zZy0+cmVxdWVzdCAmIH5EUF9BVVhfSTJDX01PVCkgewogCWNhc2UgRFBfQVVYX05B VElWRV9SRUFEOgotCQlyZWFkX2J5dGVzID0gZGFsX2RkY19zZXJ2aWNlX3JlYWRfZHBjZF9kYXRh KAorCQlyZXMgPSBkYWxfZGRjX3NlcnZpY2VfcmVhZF9kcGNkX2RhdGEoCiAJCQkJVE9fRE1fQVVY KGF1eCktPmRkY19zZXJ2aWNlLAogCQkJCWZhbHNlLAogCQkJCUkyQ19NT1RfVU5ERUYsCiAJCQkJ bXNnLT5hZGRyZXNzLAogCQkJCW1zZy0+YnVmZmVyLAogCQkJCW1zZy0+c2l6ZSk7Ci0JCXJldHVy biByZWFkX2J5dGVzOworCQlicmVhazsKIAljYXNlIERQX0FVWF9OQVRJVkVfV1JJVEU6CiAJCXJl cyA9IGRhbF9kZGNfc2VydmljZV93cml0ZV9kcGNkX2RhdGEoCiAJCQkJVE9fRE1fQVVYKGF1eCkt PmRkY19zZXJ2aWNlLApAQCAtMTA4LDE0ICsxMDcsMTQgQEAgc3RhdGljIHNzaXplX3QgZG1fZHBf YXV4X3RyYW5zZmVyKHN0cnVjdCBkcm1fZHBfYXV4ICphdXgsCiAJCQkJbXNnLT5zaXplKTsKIAkJ YnJlYWs7CiAJY2FzZSBEUF9BVVhfSTJDX1JFQUQ6Ci0JCXJlYWRfYnl0ZXMgPSBkYWxfZGRjX3Nl cnZpY2VfcmVhZF9kcGNkX2RhdGEoCisJCXJlcyA9IGRhbF9kZGNfc2VydmljZV9yZWFkX2RwY2Rf ZGF0YSgKIAkJCQlUT19ETV9BVVgoYXV4KS0+ZGRjX3NlcnZpY2UsCiAJCQkJdHJ1ZSwKIAkJCQlt b3QsCiAJCQkJbXNnLT5hZGRyZXNzLAogCQkJCW1zZy0+YnVmZmVyLAogCQkJCW1zZy0+c2l6ZSk7 Ci0JCXJldHVybiByZWFkX2J5dGVzOworCQlicmVhazsKIAljYXNlIERQX0FVWF9JMkNfV1JJVEU6 CiAJCXJlcyA9IGRhbF9kZGNfc2VydmljZV93cml0ZV9kcGNkX2RhdGEoCiAJCQkJVE9fRE1fQVVY KGF1eCktPmRkY19zZXJ2aWNlLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNw bGF5L2RjL2NvcmUvZGNfbGlua19kZGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9k Yy9jb3JlL2RjX2xpbmtfZGRjLmMKaW5kZXggNDljMmZhY2UxZTdhLi5kNTI5NDc5OGIwYTUgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX2xpbmtfZGRj LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfbGlua19kZGMu YwpAQCAtNjI5LDcgKzYyOSw3IEBAIGJvb2wgZGFsX2RkY19zZXJ2aWNlX3F1ZXJ5X2RkY19kYXRh KAogCXJldHVybiByZXQ7CiB9CiAKLXNzaXplX3QgZGFsX2RkY19zZXJ2aWNlX3JlYWRfZHBjZF9k YXRhKAorZW51bSBkZGNfcmVzdWx0IGRhbF9kZGNfc2VydmljZV9yZWFkX2RwY2RfZGF0YSgKIAlz dHJ1Y3QgZGRjX3NlcnZpY2UgKmRkYywKIAlib29sIGkyYywKIAllbnVtIGkyY19tb3RfbW9kZSBt b3QsCkBAIC02NjAsOSArNjYwLDggQEAgc3NpemVfdCBkYWxfZGRjX3NlcnZpY2VfcmVhZF9kcGNk X2RhdGEoCiAJaWYgKGRhbF9pMmNhdXhfc3VibWl0X2F1eF9jb21tYW5kKAogCQlkZGMtPmN0eC0+ aTJjYXV4LAogCQlkZGMtPmRkY19waW4sCi0JCSZjb21tYW5kKSkgewotCQlyZXR1cm4gKHNzaXpl X3QpY29tbWFuZC5wYXlsb2Fkcy0+bGVuZ3RoOwotCX0KKwkJJmNvbW1hbmQpKQorCQlyZXR1cm4g RERDX1JFU1VMVF9TVUNFU1NGVUxMOwogCiAJcmV0dXJuIEREQ19SRVNVTFRfRkFJTEVEX09QRVJB VElPTjsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9pMmNh dXgvYXV4X2VuZ2luZS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2kyY2F1eC9h dXhfZW5naW5lLmMKaW5kZXggMWQ3MzA5NjExOTc4Li4wYWZkMmZhNTdiYmUgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9pMmNhdXgvYXV4X2VuZ2luZS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9pMmNhdXgvYXV4X2VuZ2luZS5jCkBAIC0x MjgsOCArMTI4LDIwIEBAIHN0YXRpYyB2b2lkIHByb2Nlc3NfcmVhZF9yZXBseSgKIAkJCWN0eC0+ c3RhdHVzID0KIAkJCQlJMkNBVVhfVFJBTlNBQ1RJT05fU1RBVFVTX0ZBSUxFRF9QUk9UT0NPTF9F UlJPUjsKIAkJCWN0eC0+b3BlcmF0aW9uX3N1Y2NlZWRlZCA9IGZhbHNlOworCQl9IGVsc2UgaWYg KGN0eC0+cmV0dXJuZWRfYnl0ZSA8IGN0eC0+Y3VycmVudF9yZWFkX2xlbmd0aCkgeworCQkJY3R4 LT5jdXJyZW50X3JlYWRfbGVuZ3RoIC09IGN0eC0+cmV0dXJuZWRfYnl0ZTsKKworCQkJY3R4LT5v ZmZzZXQgKz0gY3R4LT5yZXR1cm5lZF9ieXRlOworCisJCQkrK2N0eC0+aW52YWxpZF9yZXBseV9y ZXRyeV9hdXhfb25fYWNrOworCisJCQlpZiAoY3R4LT5pbnZhbGlkX3JlcGx5X3JldHJ5X2F1eF9v bl9hY2sgPgorCQkJCUFVWF9JTlZBTElEX1JFUExZX1JFVFJZX0NPVU5URVIpIHsKKwkJCQljdHgt PnN0YXR1cyA9CisJCQkJSTJDQVVYX1RSQU5TQUNUSU9OX1NUQVRVU19GQUlMRURfUFJPVE9DT0xf RVJST1I7CisJCQkJY3R4LT5vcGVyYXRpb25fc3VjY2VlZGVkID0gZmFsc2U7CisJCQl9CiAJCX0g ZWxzZSB7Ci0JCQljdHgtPmN1cnJlbnRfcmVhZF9sZW5ndGggPSBjdHgtPnJldHVybmVkX2J5dGU7 CiAJCQljdHgtPnN0YXR1cyA9IEkyQ0FVWF9UUkFOU0FDVElPTl9TVEFUVVNfU1VDQ0VFREVEOwog CQkJY3R4LT50cmFuc2FjdGlvbl9jb21wbGV0ZSA9IHRydWU7CiAJCQljdHgtPm9wZXJhdGlvbl9z dWNjZWVkZWQgPSB0cnVlOwpAQCAtMjkwLDcgKzMwMiw2IEBAIHN0YXRpYyBib29sIHJlYWRfY29t bWFuZCgKIAkJCQljdHgub3BlcmF0aW9uX3N1Y2NlZWRlZCk7CiAJfQogCi0JcmVxdWVzdC0+cGF5 bG9hZC5sZW5ndGggPSBjdHgucmVwbHkubGVuZ3RoOwogCXJldHVybiBjdHgub3BlcmF0aW9uX3N1 Y2NlZWRlZDsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Rj L2kyY2F1eC9pMmNhdXguYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9pMmNhdXgv aTJjYXV4LmMKaW5kZXggMTRkYzhjOTRkODYyLi45YjBiY2M2Yjc2OWIgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9pMmNhdXgvaTJjYXV4LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2kyY2F1eC9pMmNhdXguYwpAQCAtMjU0LDcgKzI1NCw2 IEBAIGJvb2wgZGFsX2kyY2F1eF9zdWJtaXRfYXV4X2NvbW1hbmQoCiAJCQlicmVhazsKIAkJfQog Ci0JCWNtZC0+cGF5bG9hZHMtPmxlbmd0aCA9IHJlcXVlc3QucGF5bG9hZC5sZW5ndGg7CiAJCSsr aW5kZXhfb2ZfcGF5bG9hZDsKIAl9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv ZGlzcGxheS9kYy9pbmMvZGNfbGlua19kZGMuaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxh eS9kYy9pbmMvZGNfbGlua19kZGMuaAppbmRleCAwOTBiN2E4ZGQ2N2IuLjBiZjczYjc0MmYxZiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2luYy9kY19saW5rX2Rk Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9pbmMvZGNfbGlua19kZGMu aApAQCAtMTAyLDcgKzEwMiw3IEBAIGJvb2wgZGFsX2RkY19zZXJ2aWNlX3F1ZXJ5X2RkY19kYXRh KAogCQl1aW50OF90ICpyZWFkX2J1ZiwKIAkJdWludDMyX3QgcmVhZF9zaXplKTsKIAotc3NpemVf dCBkYWxfZGRjX3NlcnZpY2VfcmVhZF9kcGNkX2RhdGEoCitlbnVtIGRkY19yZXN1bHQgZGFsX2Rk Y19zZXJ2aWNlX3JlYWRfZHBjZF9kYXRhKAogCQlzdHJ1Y3QgZGRjX3NlcnZpY2UgKmRkYywKIAkJ Ym9vbCBpMmMsCiAJCWVudW0gaTJjX21vdF9tb2RlIG1vdCwKLS0gCjIuMTcuMQoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxp c3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==