drm: Branch 'master' - 2 commits
[email protected] (GitLab Mirror) Wed, 10 Oct 2018 19:49:23 +0000 (UTC)
| Newsgroups | gmane.comp.video.dri.patches |
|---|---|
| Message-ID | <[email protected]> |
IHRlc3RzL2FtZGdwdS9hbWRncHVfdGVzdC5oICAgIHwgICA1NSArKysrKystLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiB0ZXN0cy9hbWRncHUvYmFzaWNfdGVzdHMuYyAgICB8ICAgNjEg KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiB0ZXN0cy9hbWRncHUv ZGVhZGxvY2tfdGVzdHMuYyB8ICAgMTMgKysrKystLS0KIDMgZmlsZXMgY2hhbmdlZCwgNzggaW5z ZXJ0aW9ucygrKSwgNTEgZGVsZXRpb25zKC0pCgpOZXcgY29tbWl0czoKY29tbWl0IDIxZjExNzY0 NTg5YWI3MzMxYjBhYzY5YzQ5ZmFkZjIyZGU0YzBhZmYKQXV0aG9yOiBBbmRyZXkgR3JvZHpvdnNr eSA8YW5kcmV5Lmdyb2R6b3Zza3lAYW1kLmNvbT4KRGF0ZTogICBUaHUgU2VwIDI3IDEzOjEyOjU3 IDIwMTggLTA0MDAKCiAgICBhbWRncHUvdGVzdDogRml4IGRlYWRsb2NrIHRlc3RzIGZvciBBSSBh bmQgUlYgdjIKICAgIAogICAgU2VlbXMgbGlrZSBBSSBhbmQgUlYgcmVxdWlyZXMgdW5jYXNoZWQg bWVtb3J5IG1hcHBpbmcgdG8gYmUgYWJsZQogICAgdG8gcGlja3VwIHZhbHVlIHdyaXR0ZW4gdG8g bWVtb3J5IGJ5IENQVSBhZnRlciB0aGUgV0FJVF9SRUdfTUVNCiAgICBjb21tYW5kIHdhcyBhbHJl YWR5IGxhdW5jaGVkLgogICAgLgogICAgRW5hYmxlIHRoZSB0ZXN0IGZvciBBSSBhbmQgUlYuCiAg ICAKICAgIHYyOgogICAgVXBkYXRlIGNvbW1pdCBkZXNjcmlwdGlvbi4KICAgIAogICAgU2lnbmVk LW9mZi1ieTogQW5kcmV5IEdyb2R6b3Zza3kgPGFuZHJleS5ncm9kem92c2t5QGFtZC5jb20+CiAg ICBSZXZpZXdlZC1ieTogTWFyZWsgT2zFocOhayA8bWFyZWsub2xzYWtAYW1kLmNvbT4KICAgIFJl dmlld2VkLWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+Cgpk aWZmIC0tZ2l0IGEvdGVzdHMvYW1kZ3B1L2RlYWRsb2NrX3Rlc3RzLmMgYi90ZXN0cy9hbWRncHUv ZGVhZGxvY2tfdGVzdHMuYwppbmRleCAzMDQ0ODJkNy4uMjkyZWM0ZWIgMTAwNjQ0Ci0tLSBhL3Rl c3RzL2FtZGdwdS9kZWFkbG9ja190ZXN0cy5jCisrKyBiL3Rlc3RzL2FtZGdwdS9kZWFkbG9ja190 ZXN0cy5jCkBAIC04MCw2ICs4MCw4IEBAIHN0YXRpYyAgdWludDMyX3QgIG1pbm9yX3ZlcnNpb247 CiBzdGF0aWMgcHRocmVhZF90IHN0cmVzc190aHJlYWQ7CiBzdGF0aWMgdWludDMyX3QgKnB0cjsK IAoraW50IHVzZV91Y19tdHlwZSA9IDA7CisKIHN0YXRpYyB2b2lkIGFtZGdwdV9kZWFkbG9ja19o ZWxwZXIodW5zaWduZWQgaXBfdHlwZSk7CiBzdGF0aWMgdm9pZCBhbWRncHVfZGVhZGxvY2tfZ2Z4 KHZvaWQpOwogc3RhdGljIHZvaWQgYW1kZ3B1X2RlYWRsb2NrX2NvbXB1dGUodm9pZCk7CkBAIC05 MiwxMyArOTQsMTQgQEAgQ1VfQk9PTCBzdWl0ZV9kZWFkbG9ja190ZXN0c19lbmFibGUodm9pZCkK IAkJCQkJICAgICAmbWlub3JfdmVyc2lvbiwgJmRldmljZV9oYW5kbGUpKQogCQlyZXR1cm4gQ1Vf RkFMU0U7CiAKLQlpZiAoZGV2aWNlX2hhbmRsZS0+aW5mby5mYW1pbHlfaWQgPT0gQU1ER1BVX0ZB TUlMWV9BSSB8fAotCSAgICBkZXZpY2VfaGFuZGxlLT5pbmZvLmZhbWlseV9pZCA9PSBBTURHUFVf RkFNSUxZX1NJIHx8Ci0JICAgIGRldmljZV9oYW5kbGUtPmluZm8uZmFtaWx5X2lkID09IEFNREdQ VV9GQU1JTFlfUlYpIHsKKwlpZiAoZGV2aWNlX2hhbmRsZS0+aW5mby5mYW1pbHlfaWQgPT0gQU1E R1BVX0ZBTUlMWV9TSSkgewogCQlwcmludGYoIlxuXG5DdXJyZW50bHkgaGFuZ3MgdGhlIENQIG9u IHRoaXMgQVNJQywgZGVhZGxvY2sgc3VpdGUgZGlzYWJsZWRcbiIpOwogCQllbmFibGUgPSBDVV9G QUxTRTsKIAl9CiAKKwlpZiAoZGV2aWNlX2hhbmRsZS0+aW5mby5mYW1pbHlfaWQgPj0gQU1ER1BV X0ZBTUlMWV9BSSkKKwkJdXNlX3VjX210eXBlID0gMTsKKwogCWlmIChhbWRncHVfZGV2aWNlX2Rl aW5pdGlhbGl6ZShkZXZpY2VfaGFuZGxlKSkKIAkJcmV0dXJuIENVX0ZBTFNFOwogCkBAIC0xODMs OCArMTg2LDggQEAgc3RhdGljIHZvaWQgYW1kZ3B1X2RlYWRsb2NrX2hlbHBlcih1bnNpZ25lZCBp cF90eXBlKQogCXIgPSBhbWRncHVfY3NfY3R4X2NyZWF0ZShkZXZpY2VfaGFuZGxlLCAmY29udGV4 dF9oYW5kbGUpOwogCUNVX0FTU0VSVF9FUVVBTChyLCAwKTsKIAotCXIgPSBhbWRncHVfYm9fYWxs b2NfYW5kX21hcChkZXZpY2VfaGFuZGxlLCA0MDk2LCA0MDk2LAotCQkJQU1ER1BVX0dFTV9ET01B SU5fR1RULCAwLAorCXIgPSBhbWRncHVfYm9fYWxsb2NfYW5kX21hcF9yYXcoZGV2aWNlX2hhbmRs ZSwgNDA5NiwgNDA5NiwKKwkJCUFNREdQVV9HRU1fRE9NQUlOX0dUVCwgMCwgdXNlX3VjX210eXBl ID8gQU1ER1BVX1ZNX01UWVBFX1VDIDogMCwKIAkJCQkJCSAgICAmaWJfcmVzdWx0X2hhbmRsZSwg JmliX3Jlc3VsdF9jcHUsCiAJCQkJCQkgICAgJmliX3Jlc3VsdF9tY19hZGRyZXNzLCAmdmFfaGFu ZGxlKTsKIAlDVV9BU1NFUlRfRVFVQUwociwgMCk7CmNvbW1pdCBlYWJjNGNiMzVjMGQzYTYwZGJm Zjc5ZjFhNzhlZWJiOTI4YjBmMTBkCkF1dGhvcjogQW5kcmV5IEdyb2R6b3Zza3kgPGFuZHJleS5n cm9kem92c2t5QGFtZC5jb20+CkRhdGU6ICAgVGh1IFNlcCAyNyAxMzoxMDo1NSAyMDE4IC0wNDAw CgogICAgYW1kZ3B1L3Rlc3Q6IEFsbG93IEJPIG1hcHBpbmcgZmxhZ3MgdG8gYmUgcGFzc2VkIGlu IHRlc3RzCiAgICAKICAgIHYyOgogICAgQ2FsbCBhbWRncHVfYm9fdmFfb3BfcmF3IGRpcmVjdGx5 IGluIGFtZGdwdV9ib19hbGxvY19hbmRfbWFwX3JhdwogICAgTW92ZSBhbWRncHVfYm9fYWxsb2Nf YW5kX21hcF9yYXcgaW50byBDIGZpbGUgdG8gYXZvaWQgaW5jbHVkaW5nCiAgICB1bmlzdGQuaCBp biBhbWRncHVfdGVzdC5oCiAgICAKICAgIFNpZ25lZC1vZmYtYnk6IEFuZHJleSBHcm9kem92c2t5 IDxhbmRyZXkuZ3JvZHpvdnNreUBhbWQuY29tPgogICAgUmV2aWV3ZWQtYnk6IE1hcmVrIE9sxaHD oWsgPG1hcmVrLm9sc2FrQGFtZC5jb20+CiAgICBSZXZpZXdlZC1ieTogQ2hyaXN0aWFuIEvDtm5p ZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKZGlmZiAtLWdpdCBhL3Rlc3RzL2FtZGdwdS9h bWRncHVfdGVzdC5oIGIvdGVzdHMvYW1kZ3B1L2FtZGdwdV90ZXN0LmgKaW5kZXggMDYwOWE3NGIu LmFmODFlZWE4IDEwMDY0NAotLS0gYS90ZXN0cy9hbWRncHUvYW1kZ3B1X3Rlc3QuaAorKysgYi90 ZXN0cy9hbWRncHUvYW1kZ3B1X3Rlc3QuaApAQCAtMzAxLDU3ICszMDEsMjAgQEAgYW1kZ3B1X2Jv X2FsbG9jX3dyYXAoYW1kZ3B1X2RldmljZV9oYW5kbGUgZGV2LCB1bnNpZ25lZCBzaXplLAogCXJl dHVybiAwOwogfQogCitpbnQgYW1kZ3B1X2JvX2FsbG9jX2FuZF9tYXBfcmF3KGFtZGdwdV9kZXZp Y2VfaGFuZGxlIGRldiwgdW5zaWduZWQgc2l6ZSwKKwkJCXVuc2lnbmVkIGFsaWdubWVudCwgdW5z aWduZWQgaGVhcCwgdWludDY0X3QgYWxsb2NfZmxhZ3MsCisJCQl1aW50NjRfdCBtYXBwaW5nX2Zs YWdzLCBhbWRncHVfYm9faGFuZGxlICpibywgdm9pZCAqKmNwdSwKKwkJCXVpbnQ2NF90ICptY19h ZGRyZXNzLAorCQkJYW1kZ3B1X3ZhX2hhbmRsZSAqdmFfaGFuZGxlKTsKKwogc3RhdGljIGlubGlu ZSBpbnQKIGFtZGdwdV9ib19hbGxvY19hbmRfbWFwKGFtZGdwdV9kZXZpY2VfaGFuZGxlIGRldiwg dW5zaWduZWQgc2l6ZSwKLQkJCXVuc2lnbmVkIGFsaWdubWVudCwgdW5zaWduZWQgaGVhcCwgdWlu dDY0X3QgZmxhZ3MsCisJCQl1bnNpZ25lZCBhbGlnbm1lbnQsIHVuc2lnbmVkIGhlYXAsIHVpbnQ2 NF90IGFsbG9jX2ZsYWdzLAogCQkJYW1kZ3B1X2JvX2hhbmRsZSAqYm8sIHZvaWQgKipjcHUsIHVp bnQ2NF90ICptY19hZGRyZXNzLAogCQkJYW1kZ3B1X3ZhX2hhbmRsZSAqdmFfaGFuZGxlKQogewot CXN0cnVjdCBhbWRncHVfYm9fYWxsb2NfcmVxdWVzdCByZXF1ZXN0ID0ge307Ci0JYW1kZ3B1X2Jv X2hhbmRsZSBidWZfaGFuZGxlOwotCWFtZGdwdV92YV9oYW5kbGUgaGFuZGxlOwotCXVpbnQ2NF90 IHZtY19hZGRyOwotCWludCByOwotCi0JcmVxdWVzdC5hbGxvY19zaXplID0gc2l6ZTsKLQlyZXF1 ZXN0LnBoeXNfYWxpZ25tZW50ID0gYWxpZ25tZW50OwotCXJlcXVlc3QucHJlZmVycmVkX2hlYXAg PSBoZWFwOwotCXJlcXVlc3QuZmxhZ3MgPSBmbGFnczsKLQotCXIgPSBhbWRncHVfYm9fYWxsb2Mo ZGV2LCAmcmVxdWVzdCwgJmJ1Zl9oYW5kbGUpOwotCWlmIChyKQotCQlyZXR1cm4gcjsKLQotCXIg PSBhbWRncHVfdmFfcmFuZ2VfYWxsb2MoZGV2LAotCQkJCSAgYW1kZ3B1X2dwdV92YV9yYW5nZV9n ZW5lcmFsLAotCQkJCSAgc2l6ZSwgYWxpZ25tZW50LCAwLCAmdm1jX2FkZHIsCi0JCQkJICAmaGFu ZGxlLCAwKTsKLQlpZiAocikKLQkJZ290byBlcnJvcl92YV9hbGxvYzsKLQotCXIgPSBhbWRncHVf Ym9fdmFfb3AoYnVmX2hhbmRsZSwgMCwgc2l6ZSwgdm1jX2FkZHIsIDAsIEFNREdQVV9WQV9PUF9N QVApOwotCWlmIChyKQotCQlnb3RvIGVycm9yX3ZhX21hcDsKLQotCXIgPSBhbWRncHVfYm9fY3B1 X21hcChidWZfaGFuZGxlLCBjcHUpOwotCWlmIChyKQotCQlnb3RvIGVycm9yX2NwdV9tYXA7Ci0K LQkqYm8gPSBidWZfaGFuZGxlOwotCSptY19hZGRyZXNzID0gdm1jX2FkZHI7Ci0JKnZhX2hhbmRs ZSA9IGhhbmRsZTsKLQotCXJldHVybiAwOwotCi1lcnJvcl9jcHVfbWFwOgotCWFtZGdwdV9ib19j cHVfdW5tYXAoYnVmX2hhbmRsZSk7Ci0KLWVycm9yX3ZhX21hcDoKLQlhbWRncHVfYm9fdmFfb3Ao YnVmX2hhbmRsZSwgMCwgc2l6ZSwgdm1jX2FkZHIsIDAsIEFNREdQVV9WQV9PUF9VTk1BUCk7Ci0K LWVycm9yX3ZhX2FsbG9jOgotCWFtZGdwdV9ib19mcmVlKGJ1Zl9oYW5kbGUpOwotCXJldHVybiBy OworCXJldHVybiBhbWRncHVfYm9fYWxsb2NfYW5kX21hcF9yYXcoZGV2LCBzaXplLCBhbGlnbm1l bnQsIGhlYXAsCisJCQkJCWFsbG9jX2ZsYWdzLCAwLCBibywgY3B1LCBtY19hZGRyZXNzLCB2YV9o YW5kbGUpOwogfQogCiBzdGF0aWMgaW5saW5lIGludApkaWZmIC0tZ2l0IGEvdGVzdHMvYW1kZ3B1 L2Jhc2ljX3Rlc3RzLmMgYi90ZXN0cy9hbWRncHUvYmFzaWNfdGVzdHMuYwppbmRleCAxYWRiZGRk OS4uZGJhZTRkNTMgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2FtZGdwdS9iYXNpY190ZXN0cy5jCisrKyBi L3Rlc3RzL2FtZGdwdS9iYXNpY190ZXN0cy5jCkBAIC0zMyw2ICszMyw3IEBACiAKICNpbmNsdWRl ICJhbWRncHVfdGVzdC5oIgogI2luY2x1ZGUgImFtZGdwdV9kcm0uaCIKKyNpbmNsdWRlICJ1dGls X21hdGguaCIKIAogc3RhdGljICBhbWRncHVfZGV2aWNlX2hhbmRsZSBkZXZpY2VfaGFuZGxlOwog c3RhdGljICB1aW50MzJfdCAgbWFqb3JfdmVyc2lvbjsKQEAgLTI4Niw2ICsyODcsNjYgQEAgc3Rh dGljICB1aW50MzJfdCBzaGFkZXJfYmluW10gPSB7CiAjZGVmaW5lIERBVEFfT0ZGU0VUIDEwMjQK IAogCitpbnQgYW1kZ3B1X2JvX2FsbG9jX2FuZF9tYXBfcmF3KGFtZGdwdV9kZXZpY2VfaGFuZGxl IGRldiwgdW5zaWduZWQgc2l6ZSwKKwkJCXVuc2lnbmVkIGFsaWdubWVudCwgdW5zaWduZWQgaGVh cCwgdWludDY0X3QgYWxsb2NfZmxhZ3MsCisJCQl1aW50NjRfdCBtYXBwaW5nX2ZsYWdzLCBhbWRn cHVfYm9faGFuZGxlICpibywgdm9pZCAqKmNwdSwKKwkJCXVpbnQ2NF90ICptY19hZGRyZXNzLAor CQkJYW1kZ3B1X3ZhX2hhbmRsZSAqdmFfaGFuZGxlKQoreworCXN0cnVjdCBhbWRncHVfYm9fYWxs b2NfcmVxdWVzdCByZXF1ZXN0ID0ge307CisJYW1kZ3B1X2JvX2hhbmRsZSBidWZfaGFuZGxlOwor CWFtZGdwdV92YV9oYW5kbGUgaGFuZGxlOworCXVpbnQ2NF90IHZtY19hZGRyOworCWludCByOwor CisJcmVxdWVzdC5hbGxvY19zaXplID0gc2l6ZTsKKwlyZXF1ZXN0LnBoeXNfYWxpZ25tZW50ID0g YWxpZ25tZW50OworCXJlcXVlc3QucHJlZmVycmVkX2hlYXAgPSBoZWFwOworCXJlcXVlc3QuZmxh Z3MgPSBhbGxvY19mbGFnczsKKworCXIgPSBhbWRncHVfYm9fYWxsb2MoZGV2LCAmcmVxdWVzdCwg JmJ1Zl9oYW5kbGUpOworCWlmIChyKQorCQlyZXR1cm4gcjsKKworCXIgPSBhbWRncHVfdmFfcmFu Z2VfYWxsb2MoZGV2LAorCQkJCSAgYW1kZ3B1X2dwdV92YV9yYW5nZV9nZW5lcmFsLAorCQkJCSAg c2l6ZSwgYWxpZ25tZW50LCAwLCAmdm1jX2FkZHIsCisJCQkJICAmaGFuZGxlLCAwKTsKKwlpZiAo cikKKwkJZ290byBlcnJvcl92YV9hbGxvYzsKKworCXIgPSBhbWRncHVfYm9fdmFfb3BfcmF3KGRl diwgYnVmX2hhbmRsZSwgMCwgIEFMSUdOKHNpemUsIGdldHBhZ2VzaXplKCkpLCB2bWNfYWRkciwK KwkJCQkgICBBTURHUFVfVk1fUEFHRV9SRUFEQUJMRSB8CisJCQkJICAgQU1ER1BVX1ZNX1BBR0Vf V1JJVEVBQkxFIHwKKwkJCQkgICBBTURHUFVfVk1fUEFHRV9FWEVDVVRBQkxFIHwKKwkJCQkgICBt YXBwaW5nX2ZsYWdzLAorCQkJCSAgIEFNREdQVV9WQV9PUF9NQVApOworCWlmIChyKQorCQlnb3Rv IGVycm9yX3ZhX21hcDsKKworCXIgPSBhbWRncHVfYm9fY3B1X21hcChidWZfaGFuZGxlLCBjcHUp OworCWlmIChyKQorCQlnb3RvIGVycm9yX2NwdV9tYXA7CisKKwkqYm8gPSBidWZfaGFuZGxlOwor CSptY19hZGRyZXNzID0gdm1jX2FkZHI7CisJKnZhX2hhbmRsZSA9IGhhbmRsZTsKKworCXJldHVy biAwOworCisgZXJyb3JfY3B1X21hcDoKKwlhbWRncHVfYm9fY3B1X3VubWFwKGJ1Zl9oYW5kbGUp OworCisgZXJyb3JfdmFfbWFwOgorCWFtZGdwdV9ib192YV9vcChidWZfaGFuZGxlLCAwLCBzaXpl LCB2bWNfYWRkciwgMCwgQU1ER1BVX1ZBX09QX1VOTUFQKTsKKworIGVycm9yX3ZhX2FsbG9jOgor CWFtZGdwdV9ib19mcmVlKGJ1Zl9oYW5kbGUpOworCXJldHVybiByOworfQorCisKKwogaW50IHN1 aXRlX2Jhc2ljX3Rlc3RzX2luaXQodm9pZCkKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2dwdV9pbmZvIGdw dV9pbmZvID0gezB9OwoKCi0tCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkRyaS1wYXRjaGVzIG1haWxpbmcgbGlzdApEcmktcGF0Y2hlc0BsaXN0cy5zb3Vy Y2Vmb3JnZS5uZXQKaHR0cHM6Ly9saXN0cy5zb3VyY2Vmb3JnZS5uZXQvbGlzdHMvbGlzdGluZm8v ZHJpLXBhdGNoZXMK