From: Harry Wentland Subject: [PATCH 040/120] drm/amd/display: Use stream validation hook. Date: Wed, 9 Aug 2017 11:01:26 -0400 Message-ID: <20170809150246.8835-41-harry.wentland@amd.com> References: <20170809150246.8835-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: <20170809150246.8835-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: Andrey Grodzovsky RnJvbTogQW5kcmV5IEdyb2R6b3Zza3kgPEFuZHJleS5Hcm9kem92c2t5QGFtZC5jb20+CgpVc2Ug ZGNfdmFsaWRhdGVfc3RyZWFtIGZyb20gY3J0YyBhdG9taWNfY2hlY2sgZm9yIHNpbmdsZSBzdHJl YW0KdmFsaWRhdGlvbi4KCkNoYW5nZS1JZDogSWViYWY1MGI2ZWY4YmY0N2YwMWEzZTEwZDI0YTBi MTFjZDA4NzRiOGMKU2lnbmVkLW9mZi1ieTogQW5kcmV5IEdyb2R6b3Zza3kgPEFuZHJleS5Hcm9k em92c2t5QGFtZC5jb20+ClJldmlld2VkLWJ5OiBUb255IENoZW5nIDxUb255LkNoZW5nQGFtZC5j b20+CkFja2VkLWJ5OiBIYXJyeSBXZW50bGFuZCA8SGFycnkuV2VudGxhbmRAYW1kLmNvbT4KLS0t CiAuLi4vZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fdHlwZXMuYyAgICB8IDg2 ICsrKysrKysrKysrKy0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0OCBpbnNlcnRpb25zKCsp LCAzOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3Bs YXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV90eXBlcy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNw bGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fdHlwZXMuYwppbmRleCBiN2MwMWYzNTNkMzMuLmMwZmRj MWQwM2EyMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9k bS9hbWRncHVfZG1fdHlwZXMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1k Z3B1X2RtL2FtZGdwdV9kbV90eXBlcy5jCkBAIC02Myw2ICs2MywyNCBAQCBzdHJ1Y3QgZG1fY29u bmVjdG9yX3N0YXRlIHsKICNkZWZpbmUgdG9fZG1fY29ubmVjdG9yX3N0YXRlKHgpXAogCWNvbnRh aW5lcl9vZigoeCksIHN0cnVjdCBkbV9jb25uZWN0b3Jfc3RhdGUsIGJhc2UpCiAKK3N0YXRpYyBi b29sIG1vZGVzZXRfcmVxdWlyZWQoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQor eworCWlmICghZHJtX2F0b21pY19jcnRjX25lZWRzX21vZGVzZXQoY3J0Y19zdGF0ZSkpCisJCXJl dHVybiBmYWxzZTsKKworCWlmICghY3J0Y19zdGF0ZS0+ZW5hYmxlKQorCQlyZXR1cm4gZmFsc2U7 CisKKwlyZXR1cm4gY3J0Y19zdGF0ZS0+YWN0aXZlOworfQorCitzdGF0aWMgYm9vbCBtb2RlcmVz ZXRfcmVxdWlyZWQoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQoreworCWlmICgh ZHJtX2F0b21pY19jcnRjX25lZWRzX21vZGVzZXQoY3J0Y19zdGF0ZSkpCisJCXJldHVybiBmYWxz ZTsKKworCXJldHVybiAhY3J0Y19zdGF0ZS0+ZW5hYmxlIHx8ICFjcnRjX3N0YXRlLT5hY3RpdmU7 Cit9CiAKIHZvaWQgYW1kZ3B1X2RtX2VuY29kZXJfZGVzdHJveShzdHJ1Y3QgZHJtX2VuY29kZXIg KmVuY29kZXIpCiB7CkBAIC0xNDExLDExICsxNDI5LDkgQEAgaW50IGFtZGdwdV9kbV9jb25uZWN0 b3JfbW9kZV92YWxpZCgKIAlpbnQgcmVzdWx0ID0gTU9ERV9FUlJPUjsKIAlzdHJ1Y3QgZGNfc2lu ayAqZGNfc2luazsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IGNvbm5lY3Rvci0+ZGV2 LT5kZXZfcHJpdmF0ZTsKLQlzdHJ1Y3QgZGNfdmFsaWRhdGlvbl9zZXQgdmFsX3NldCA9IHsgMCB9 OwogCS8qIFRPRE86IFVuaGFyZGNvZGUgc3RyZWFtIGNvdW50ICovCiAJc3RydWN0IGRjX3N0cmVh bSAqc3RyZWFtOwogCXN0cnVjdCBhbWRncHVfY29ubmVjdG9yICphY29ubmVjdG9yID0gdG9fYW1k Z3B1X2Nvbm5lY3Rvcihjb25uZWN0b3IpOwotCXN0cnVjdCB2YWxpZGF0ZV9jb250ZXh0ICpjb250 ZXh0OwogCiAJaWYgKChtb2RlLT5mbGFncyAmIERSTV9NT0RFX0ZMQUdfSU5URVJMQUNFKSB8fAog CQkJKG1vZGUtPmZsYWdzICYgRFJNX01PREVfRkxBR19EQkxTQ0FOKSkKQEAgLTE0MzIsMzUgKzE0 NDgsMjggQEAgaW50IGFtZGdwdV9kbV9jb25uZWN0b3JfbW9kZV92YWxpZCgKIAogCWlmIChOVUxM ID09IGRjX3NpbmspIHsKIAkJRFJNX0VSUk9SKCJkY19zaW5rIGlzIE5VTEwhXG4iKTsKLQkJZ290 byBudWxsX3Npbms7CisJCWdvdG8gZmFpbDsKIAl9CiAKIAlzdHJlYW0gPSBkY19jcmVhdGVfc3Ry ZWFtX2Zvcl9zaW5rKGRjX3NpbmspOwogCWlmIChOVUxMID09IHN0cmVhbSkgewogCQlEUk1fRVJS T1IoIkZhaWxlZCB0byBjcmVhdGUgc3RyZWFtIGZvciBzaW5rIVxuIik7Ci0JCWdvdG8gc3RyZWFt X2NyZWF0ZV9mYWlsOworCQlnb3RvIGZhaWw7CiAJfQogCiAJZHJtX21vZGVfc2V0X2NydGNpbmZv KG1vZGUsIDApOwogCWZpbGxfc3RyZWFtX3Byb3BlcnRpZXNfZnJvbV9kcm1fZGlzcGxheV9tb2Rl KHN0cmVhbSwgbW9kZSwgY29ubmVjdG9yKTsKIAotCXZhbF9zZXQuc3RyZWFtID0gc3RyZWFtOwot CXZhbF9zZXQuc3VyZmFjZV9jb3VudCA9IDA7CiAJc3RyZWFtLT5zcmMud2lkdGggPSBtb2RlLT5o ZGlzcGxheTsKIAlzdHJlYW0tPnNyYy5oZWlnaHQgPSBtb2RlLT52ZGlzcGxheTsKIAlzdHJlYW0t PmRzdCA9IHN0cmVhbS0+c3JjOwogCi0JY29udGV4dCA9IGRjX2dldF92YWxpZGF0ZV9jb250ZXh0 KGFkZXYtPmRtLmRjLCAmdmFsX3NldCwgMSk7Ci0KLQlpZiAoY29udGV4dCkgeworCWlmIChkY192 YWxpZGF0ZV9zdHJlYW0oYWRldi0+ZG0uZGMsIHN0cmVhbSkpCiAJCXJlc3VsdCA9IE1PREVfT0s7 Ci0JCWRjX3JlbGVhc2VfdmFsaWRhdGVfY29udGV4dChjb250ZXh0KTsKLQl9CiAKIAlkY19zdHJl YW1fcmVsZWFzZShzdHJlYW0pOwogCi1zdHJlYW1fY3JlYXRlX2ZhaWw6Ci1udWxsX3Npbms6Citm YWlsOgogCS8qIFRPRE86IGVycm9yIGhhbmRsaW5nKi8KIAlyZXR1cm4gcmVzdWx0OwogfQpAQCAt MTQ4Niw3ICsxNDk1LDI0IEBAIHN0YXRpYyBpbnQgZG1fY3J0Y19oZWxwZXJfYXRvbWljX2NoZWNr KAogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKnN0YXRl KQogewotCXJldHVybiAwOworCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gY3J0Yy0+ZGV2 LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgZGMgKmRjID0gYWRldi0+ZG0uZGM7CisJc3RydWN0IGRt X2NydGNfc3RhdGUgKmRtX2NydGNfc3RhdGUgPSB0b19kbV9jcnRjX3N0YXRlKHN0YXRlKTsKKwlp bnQgcmV0ID0gLUVJTlZBTDsKKworCWlmICh1bmxpa2VseSghZG1fY3J0Y19zdGF0ZS0+c3RyZWFt ICYmIG1vZGVzZXRfcmVxdWlyZWQoc3RhdGUpKSkgeworCQlXQVJOX09OKDEpOworCQlyZXR1cm4g cmV0OworCX0KKworCS8qIEluIHNvbWUgdXNlIGNhc2VzLCBsaWtlIHJlc2V0LCBubyBzdHJlYW0g IGlzIGF0dGFjaGVkICovCisJaWYgKCFkbV9jcnRjX3N0YXRlLT5zdHJlYW0pCisJCXJldHVybiAw OworCisJaWYgKGRjX3ZhbGlkYXRlX3N0cmVhbShkYywgZG1fY3J0Y19zdGF0ZS0+c3RyZWFtKSkK KwkJcmV0dXJuIDA7CisKKwlyZXR1cm4gcmV0OwogfQogCiBzdGF0aWMgYm9vbCBkbV9jcnRjX2hl bHBlcl9tb2RlX2ZpeHVwKApAQCAtMjI3MSwyNSArMjI5Nyw2IEBAIGludCBhbWRncHVfZG1fZW5j b2Rlcl9pbml0KAogCXJldHVybiByZXM7CiB9CiAKLXN0YXRpYyBib29sIG1vZGVzZXRfcmVxdWly ZWQoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQotewotCWlmICghZHJtX2F0b21p Y19jcnRjX25lZWRzX21vZGVzZXQoY3J0Y19zdGF0ZSkpCi0JCXJldHVybiBmYWxzZTsKLQotCWlm ICghY3J0Y19zdGF0ZS0+ZW5hYmxlKQotCQlyZXR1cm4gZmFsc2U7Ci0KLQlyZXR1cm4gY3J0Y19z dGF0ZS0+YWN0aXZlOwotfQotCi1zdGF0aWMgYm9vbCBtb2RlcmVzZXRfcmVxdWlyZWQoc3RydWN0 IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQotewotCWlmICghZHJtX2F0b21pY19jcnRjX25l ZWRzX21vZGVzZXQoY3J0Y19zdGF0ZSkpCi0JCXJldHVybiBmYWxzZTsKLQotCXJldHVybiAhY3J0 Y19zdGF0ZS0+ZW5hYmxlIHx8ICFjcnRjX3N0YXRlLT5hY3RpdmU7Ci19Ci0KIHN0YXRpYyB2b2lk IG1hbmFnZV9kbV9pbnRlcnJ1cHRzKAogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCXN0 cnVjdCBhbWRncHVfY3J0YyAqYWNydGMsCkBAIC0zMDg4LDcgKzMwOTUsNyBAQCBpbnQgYW1kZ3B1 X2RtX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCSAqLwogCWJvb2wgbG9j a19hbmRfdmFsaWRhdGlvbl9uZWVkZWQgPSBmYWxzZTsKIAotCXJldCA9IGRybV9hdG9taWNfaGVs cGVyX2NoZWNrKGRldiwgc3RhdGUpOworCXJldCA9IGRybV9hdG9taWNfaGVscGVyX2NoZWNrX21v ZGVzZXQoZGV2LCBzdGF0ZSk7CiAKIAlpZiAocmV0KSB7CiAJCURSTV9FUlJPUigiQXRvbWljIHN0 YXRlIHZhbGlkYXRpb24gZmFpbGVkIHdpdGggZXJyb3IgOiVkICFcbiIsIHJldCk7CkBAIC0zMTEw LDYgKzMxMTcsNyBAQCBpbnQgYW1kZ3B1X2RtX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAogCQl9CiAJfQogCisJLypUT0RPIE1vdmUgdGhpcyBjb2RlIGludG8gZG1fY3J0Y19h dG9taWNfY2hlY2sgb25jZSB3ZSBnZXQgcmlkIG9mIGRjX3ZhbGlkYXRpb25fc2V0ICovCiAJLyog dXBkYXRlIGNoYW5nZWQgaXRlbXMgKi8KIAlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBj cnRjLCBjcnRjX3N0YXRlLCBpKSB7CiAJCXN0cnVjdCBhbWRncHVfY3J0YyAqYWNydGMgPSBOVUxM OwpAQCAtMzI0MiwxMCArMzI1MCw3IEBAIGludCBhbWRncHVfZG1fYXRvbWljX2NoZWNrKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiAJCQlpZiAocGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVf Q1VSU09SKQogCQkJCWNvbnRpbnVlOwogCi0JCQlpZiAoIWZiIHx8ICFwbGFuZV9jcnRjIHx8IGNy dGMgIT0gcGxhbmVfY3J0YyB8fAotCQkJCSghY3J0Y19zdGF0ZS0+cGxhbmVzX2NoYW5nZWQgJiYK LQkJCQkJCSFjcnRjX3N0YXRlLT5jb2xvcl9tZ210X2NoYW5nZWQpIHx8Ci0JCQkJIWNydGNfc3Rh dGUtPmFjdGl2ZSkKKwkJCWlmICghZmIgfHwgIXBsYW5lX2NydGMgfHwgY3J0YyAhPSBwbGFuZV9j cnRjIHx8ICFjcnRjX3N0YXRlLT5hY3RpdmUpCiAJCQkJY29udGludWU7CiAKIAkJCVdBUk5fT04o IW5ld19hY3J0Y19zdGF0ZS0+c3RyZWFtKTsKQEAgLTMyODEsNiArMzI4NiwxMSBAQCBpbnQgYW1k Z3B1X2RtX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQl9CiAJfQogCisJ LyogUnVuIHRoaXMgaGVyZSBzaW5jZSB3ZSB3YW50IHRvIHZhbGlkYXRlIHRoZSBzdHJlYW1zIHdl IGNyZWF0ZWQgKi8KKwlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9jaGVja19wbGFuZXMoZGV2LCBz dGF0ZSk7CisJaWYgKHJldCkKKwkJZ290byBmYWlsOworCiAJLyoKIAkgKiBGb3IgZnVsbCB1cGRh dGVzIGNhc2Ugd2hlbgogCSAqIHJlbW92aW5nL2FkZGluZy91cGRhdGluZyAgc3RyZWFtcyBvbiBv bmNlIENSVEMgd2hpbGUgZmxpcHBpbmcKLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9hbWQtZ2Z4Cg==