drm: Branch 'master' - 2 commits

[email protected] (GitLab Mirror) Sat, 26 Oct 2019 03:30:47 +0000 (UTC)
Newsgroups gmane.comp.video.dri.patches
Message-ID <[email protected]>
IGFtZGdwdS9hbWRncHUtc3ltYm9sLWNoZWNrIHwgICAgMSArCiBhbWRncHUvYW1kZ3B1LmggICAg
ICAgICAgICB8ICAgMTggKysrKysrKysrKysrKysrKysrCiBhbWRncHUvYW1kZ3B1X2NzLmMgICAg
ICAgICB8ICAgMTAgKysrKysrKysrKwogaW5jbHVkZS9kcm0vZHJtLmggICAgICAgICAgfCAgICAz
ICsrLQogeGY4NmRybS5jICAgICAgICAgICAgICAgICAgfCAgIDE1ICsrKysrKysrKysrKysrKwog
eGY4NmRybS5oICAgICAgICAgICAgICAgICAgfCAgICAyICsrCiA2IGZpbGVzIGNoYW5nZWQsIDQ4
IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCk5ldyBjb21taXRzOgpjb21taXQgMGE3YWQ3
ZGYxNDcyYTMwMDJjYzFiYWE4ZTk4NzkzNTBiYzU5YWNmYQpBdXRob3I6IENodW5taW5nIFpob3Ug
PGRhdmlkMS56aG91QGFtZC5jb20+CkRhdGU6ICAgV2VkIEp1bCAyNCAxNTo1NToyMCAyMDE5ICsw
ODAwCgogICAgbGliZHJtOiB3cmFwIG5ldyBmbGV4aWJsZSBzeW5jb2JqIHF1ZXJ5IGludGVyZmFj
ZSB2MgogICAgCiAgICB2Mjogbml0LXBpY2tzIGZpeAogICAgCiAgICBTaWduZWQtb2ZmLWJ5OiBD
aHVubWluZyBaaG91IDxkYXZpZDEuemhvdUBhbWQuY29tPgogICAgQ2M6IExpb25lbCBMYW5kd2Vy
bGluIDxsaW9uZWwuZy5sYW5kd2VybGluQGludGVsLmNvbT4KICAgIENjOiBDaHJpc3RpYW4gS8O2
bmlnIDxDaHJpc3RpYW4uS29lbmlnQGFtZC5jb20+CiAgICBSZXZpZXdlZC1ieTogQ2hyaXN0aWFu
IEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgogICAgRm9yIHRoZSB4Zjg2ZHJtLltj
aF0gcGFydCA6IFJldmlld2VkLWJ5OiBMaW9uZWwgTGFuZHdlcmxpbiA8bGlvbmVsLmcubGFuZHdl
cmxpbkBpbnRlbC5jb20+CgpkaWZmIC0tZ2l0IGEvYW1kZ3B1L2FtZGdwdS1zeW1ib2wtY2hlY2sg
Yi9hbWRncHUvYW1kZ3B1LXN5bWJvbC1jaGVjawppbmRleCA3ZDc0OGVlZC4uYzUwODU3MzEgMTAw
NzU1Ci0tLSBhL2FtZGdwdS9hbWRncHUtc3ltYm9sLWNoZWNrCisrKyBiL2FtZGdwdS9hbWRncHUt
c3ltYm9sLWNoZWNrCkBAIC01Nyw2ICs1Nyw3IEBAIGFtZGdwdV9jc19zeW5jb2JqX2V4cG9ydF9z
eW5jX2ZpbGUyCiBhbWRncHVfY3Nfc3luY29ial9pbXBvcnRfc3luY19maWxlCiBhbWRncHVfY3Nf
c3luY29ial9pbXBvcnRfc3luY19maWxlMgogYW1kZ3B1X2NzX3N5bmNvYmpfcXVlcnkKK2FtZGdw
dV9jc19zeW5jb2JqX3F1ZXJ5MgogYW1kZ3B1X2NzX3N5bmNvYmpfcmVzZXQKIGFtZGdwdV9jc19z
eW5jb2JqX3NpZ25hbAogYW1kZ3B1X2NzX3N5bmNvYmpfdGltZWxpbmVfc2lnbmFsCmRpZmYgLS1n
aXQgYS9hbWRncHUvYW1kZ3B1LmggYi9hbWRncHUvYW1kZ3B1LmgKaW5kZXggYmNhYzRjYjcuLjE4
ODE3OWM5IDEwMDY0NAotLS0gYS9hbWRncHUvYW1kZ3B1LmgKKysrIGIvYW1kZ3B1L2FtZGdwdS5o
CkBAIC0xNjA2LDYgKzE2MDYsMjQgQEAgaW50IGFtZGdwdV9jc19zeW5jb2JqX3RpbWVsaW5lX3dh
aXQoYW1kZ3B1X2RldmljZV9oYW5kbGUgZGV2LAogaW50IGFtZGdwdV9jc19zeW5jb2JqX3F1ZXJ5
KGFtZGdwdV9kZXZpY2VfaGFuZGxlIGRldiwKIAkJCSAgICB1aW50MzJfdCAqaGFuZGxlcywgdWlu
dDY0X3QgKnBvaW50cywKIAkJCSAgICB1bnNpZ25lZCBudW1faGFuZGxlcyk7CisvKioKKyAqICBR
dWVyeSBzeW5jIG9iamVjdHMgbGFzdCBzaWduYWxlZCBvciBzdWJtaXR0ZWQgcG9pbnQuCisgKgor
ICogXHBhcmFtICAgZGV2CSAgICAtIFxjIFtpbl0gc2VsZi1leHBsYW5hdG9yeQorICogXHBhcmFt
ICAgaGFuZGxlcyAtIFxjIFtpbl0gYXJyYXkgb2Ygc3luYyBvYmplY3QgaGFuZGxlcworICogXHBh
cmFtICAgcG9pbnRzIC0gXGMgW291dF0gYXJyYXkgb2Ygc3luYyBwb2ludHMgcmV0dXJuZWQsIHdo
aWNoIHByZXNlbnRzCisgKiBzeW5jb2JqIHBheWxvYWQuCisgKiBccGFyYW0gICBudW1faGFuZGxl
cyAtIFxjIFtpbl0gc2VsZi1leHBsYW5hdG9yeQorICogXHBhcmFtICAgZmxhZ3MgICAtIFxjIFtp
bl0gYSBiaXRtYXNrIG9mIERSTV9TWU5DT0JKX1FVRVJZX0ZMQUdTXyoKKyAqCisgKiBccmV0dXJu
ICAgMCBvbiBzdWNjZXNzXG4KKyAqICAgICAgICAgIC1FVElNRSAtIFRpbWVvdXQKKyAqICAgICAg
ICAgIDwwIC0gTmVnYXRpdmUgUE9TSVggRXJyb3IgY29kZQorICoKKyAqLworaW50IGFtZGdwdV9j
c19zeW5jb2JqX3F1ZXJ5MihhbWRncHVfZGV2aWNlX2hhbmRsZSBkZXYsCisJCQkgICAgIHVpbnQz
Ml90ICpoYW5kbGVzLCB1aW50NjRfdCAqcG9pbnRzLAorCQkJICAgICB1bnNpZ25lZCBudW1faGFu
ZGxlcywgdWludDMyX3QgZmxhZ3MpOwogCiAvKioKICAqICBFeHBvcnQga2VybmVsIHN5bmMgb2Jq
ZWN0IHRvIHNoYXJlYWJsZSBmZC4KZGlmZiAtLWdpdCBhL2FtZGdwdS9hbWRncHVfY3MuYyBiL2Ft
ZGdwdS9hbWRncHVfY3MuYwppbmRleCA1NjUwMjk1MC4uYjRiN2RjZjMgMTAwNjQ0Ci0tLSBhL2Ft
ZGdwdS9hbWRncHVfY3MuYworKysgYi9hbWRncHUvYW1kZ3B1X2NzLmMKQEAgLTc0MCw2ICs3NDAs
MTYgQEAgZHJtX3B1YmxpYyBpbnQgYW1kZ3B1X2NzX3N5bmNvYmpfcXVlcnkoYW1kZ3B1X2Rldmlj
ZV9oYW5kbGUgZGV2LAogCXJldHVybiBkcm1TeW5jb2JqUXVlcnkoZGV2LT5mZCwgaGFuZGxlcywg
cG9pbnRzLCBudW1faGFuZGxlcyk7CiB9CiAKK2RybV9wdWJsaWMgaW50IGFtZGdwdV9jc19zeW5j
b2JqX3F1ZXJ5MihhbWRncHVfZGV2aWNlX2hhbmRsZSBkZXYsCisJCQkJCXVpbnQzMl90ICpoYW5k
bGVzLCB1aW50NjRfdCAqcG9pbnRzLAorCQkJCQl1bnNpZ25lZCBudW1faGFuZGxlcywgdWludDMy
X3QgZmxhZ3MpCit7CisJaWYgKCFkZXYpCisJCXJldHVybiAtRUlOVkFMOworCisJcmV0dXJuIGRy
bVN5bmNvYmpRdWVyeTIoZGV2LT5mZCwgaGFuZGxlcywgcG9pbnRzLCBudW1faGFuZGxlcywgZmxh
Z3MpOworfQorCiBkcm1fcHVibGljIGludCBhbWRncHVfY3NfZXhwb3J0X3N5bmNvYmooYW1kZ3B1
X2RldmljZV9oYW5kbGUgZGV2LAogCQkJCQl1aW50MzJfdCBoYW5kbGUsCiAJCQkJCWludCAqc2hh
cmVkX2ZkKQpkaWZmIC0tZ2l0IGEveGY4NmRybS5jIGIveGY4NmRybS5jCmluZGV4IGI3ZDU4NjU5
Li43YWU0MWMzNyAxMDA2NDQKLS0tIGEveGY4NmRybS5jCisrKyBiL3hmODZkcm0uYwpAQCAtNDI1
Miw2ICs0MjUyLDIxIEBAIGRybV9wdWJsaWMgaW50IGRybVN5bmNvYmpRdWVyeShpbnQgZmQsIHVp
bnQzMl90ICpoYW5kbGVzLCB1aW50NjRfdCAqcG9pbnRzLAogICAgIHJldHVybiAwOwogfQogCitk
cm1fcHVibGljIGludCBkcm1TeW5jb2JqUXVlcnkyKGludCBmZCwgdWludDMyX3QgKmhhbmRsZXMs
IHVpbnQ2NF90ICpwb2ludHMsCisJCQkJdWludDMyX3QgaGFuZGxlX2NvdW50LCB1aW50MzJfdCBm
bGFncykKK3sKKyAgICBzdHJ1Y3QgZHJtX3N5bmNvYmpfdGltZWxpbmVfYXJyYXkgYXJnczsKKwor
ICAgIG1lbWNsZWFyKGFyZ3MpOworICAgIGFyZ3MuaGFuZGxlcyA9ICh1aW50cHRyX3QpaGFuZGxl
czsKKyAgICBhcmdzLnBvaW50cyA9ICh1aW50cHRyX3QpcG9pbnRzOworICAgIGFyZ3MuY291bnRf
aGFuZGxlcyA9IGhhbmRsZV9jb3VudDsKKyAgICBhcmdzLmZsYWdzID0gZmxhZ3M7CisKKyAgICBy
ZXR1cm4gZHJtSW9jdGwoZmQsIERSTV9JT0NUTF9TWU5DT0JKX1FVRVJZLCAmYXJncyk7Cit9CisK
KwogZHJtX3B1YmxpYyBpbnQgZHJtU3luY29ialRyYW5zZmVyKGludCBmZCwKIAkJCQkgIHVpbnQz
Ml90IGRzdF9oYW5kbGUsIHVpbnQ2NF90IGRzdF9wb2ludCwKIAkJCQkgIHVpbnQzMl90IHNyY19o
YW5kbGUsIHVpbnQ2NF90IHNyY19wb2ludCwKZGlmZiAtLWdpdCBhL3hmODZkcm0uaCBiL3hmODZk
cm0uaAppbmRleCAzZjUyY2Q4Yy4uMzgwNTEzOWYgMTAwNjQ0Ci0tLSBhL3hmODZkcm0uaAorKysg
Yi94Zjg2ZHJtLmgKQEAgLTg5Niw2ICs4OTYsOCBAQCBleHRlcm4gaW50IGRybVN5bmNvYmpUaW1l
bGluZVdhaXQoaW50IGZkLCB1aW50MzJfdCAqaGFuZGxlcywgdWludDY0X3QgKnBvaW50cywKIAkJ
CQkgIHVpbnQzMl90ICpmaXJzdF9zaWduYWxlZCk7CiBleHRlcm4gaW50IGRybVN5bmNvYmpRdWVy
eShpbnQgZmQsIHVpbnQzMl90ICpoYW5kbGVzLCB1aW50NjRfdCAqcG9pbnRzLAogCQkJICAgdWlu
dDMyX3QgaGFuZGxlX2NvdW50KTsKK2V4dGVybiBpbnQgZHJtU3luY29ialF1ZXJ5MihpbnQgZmQs
IHVpbnQzMl90ICpoYW5kbGVzLCB1aW50NjRfdCAqcG9pbnRzLAorCQkJICAgIHVpbnQzMl90IGhh
bmRsZV9jb3VudCwgdWludDMyX3QgZmxhZ3MpOwogZXh0ZXJuIGludCBkcm1TeW5jb2JqVHJhbnNm
ZXIoaW50IGZkLAogCQkJICAgICAgdWludDMyX3QgZHN0X2hhbmRsZSwgdWludDY0X3QgZHN0X3Bv
aW50LAogCQkJICAgICAgdWludDMyX3Qgc3JjX2hhbmRsZSwgdWludDY0X3Qgc3JjX3BvaW50LApj
b21taXQgMDdmNjcxNzU5NTA3Y2NjZWMwMDRlMjNjNjM0NGI5M2Y5NDdhMzhlMwpBdXRob3I6IENo
dW5taW5nIFpob3UgPGRhdmlkMS56aG91QGFtZC5jb20+CkRhdGU6ICAgVGh1IE9jdCAyNCAxNDo0
MjoxMyAyMDE5ICswODAwCgogICAgc3luYyB1cCBkcm0uaAogICAgCiAgICAgICAgYSkgZGVsdGE6
IGRybTogdXNlIHBhZCBhcyBmbGFncyBpbiBkcm1fc3luY29ial90aW1lbGluZV9hcnJheS4KICAg
ICAgICBiKSBHZW5lcmF0ZWQgdXNpbmcgbWFrZSBoZWFkZXJzX2luc3RhbGwuCiAgICAgICAgYykg
R2VuZXJhdGVkIGZyb20gb3JpZ2luL2RybS1taXNjLW5leHQgY29tbWl0IDk0OTU2MWViODViY2Vl
MTAyNDhlN2RhNTFkNDRhMDMyNWQ1ZTBkMWIiCiAgICAKICAgIFNpZ25lZC1vZmYtYnk6IENodW5t
aW5nIFpob3UgPGRhdmlkMS56aG91QGFtZC5jb20+CgpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0v
ZHJtLmggYi9pbmNsdWRlL2RybS9kcm0uaAppbmRleCA0MzhhYmRlMy4uYWI5NDAzMzkgMTAwNjQ0
Ci0tLSBhL2luY2x1ZGUvZHJtL2RybS5oCisrKyBiL2luY2x1ZGUvZHJtL2RybS5oCkBAIC03NzIs
MTEgKzc3MiwxMiBAQCBzdHJ1Y3QgZHJtX3N5bmNvYmpfYXJyYXkgewogCV9fdTMyIHBhZDsKIH07
CiAKKyNkZWZpbmUgRFJNX1NZTkNPQkpfUVVFUllfRkxBR1NfTEFTVF9TVUJNSVRURUQgKDEgPDwg
MCkgLyogbGFzdCBhdmFpbGFibGUgcG9pbnQgb24gdGltZWxpbmUgc3luY29iaiAqLwogc3RydWN0
IGRybV9zeW5jb2JqX3RpbWVsaW5lX2FycmF5IHsKIAlfX3U2NCBoYW5kbGVzOwogCV9fdTY0IHBv
aW50czsKIAlfX3UzMiBjb3VudF9oYW5kbGVzOwotCV9fdTMyIHBhZDsKKwlfX3UzMiBmbGFnczsK
IH07CiAKIAoKCi0tCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fCkRyaS1wYXRjaGVzIG1haWxpbmcgbGlzdApEcmktcGF0Y2hlc0BsaXN0cy5zb3VyY2Vmb3Jn
ZS5uZXQKaHR0cHM6Ly9saXN0cy5zb3VyY2Vmb3JnZS5uZXQvbGlzdHMvbGlzdGluZm8vZHJpLXBh
dGNoZXMK