drm: Branch 'master' - 2 commits

[email protected] (GitLab Mirror) Fri, 14 Dec 2018 01:59:56 +0000 (UTC)
Newsgroups gmane.comp.video.dri.patches
Message-ID <[email protected]>
IHhmODZkcm0uYyB8ICAgIDggKysrKy0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMo
KyksIDQgZGVsZXRpb25zKC0pCgpOZXcgY29tbWl0czoKY29tbWl0IDhmMmUwOTI1MWVjZWEzYzk1
ZWIyMWFlNzNhMjgyNDQ3YWQ3MDA3NzYKQXV0aG9yOiBGcmFuw6dvaXMgVGlnZW90IDxmdGlnZW90
QHdvbGZwb25kLm9yZz4KRGF0ZTogICBXZWQgRGVjIDEyIDIwOjQ4OjM2IDIwMTggKzAxMDAKCiAg
ICBsaWJkcm06IFVzZSBEUk1fSU9DVExfR0VUX1BDSUlORk8gb24gRHJhZ29uRmx5CiAgICAKICAg
IEl0IGlzIGEgY2xlYW5lciBhbmQgbGVzcyBmcmFnaWxlIHdheSB0byBnZXQgUENJIElEcyB0aGFu
IHRoZSBvbmUKICAgIGN1cnJlbnRseSB1c2VkIGJ5IGxvY2FsIERQb3J0cyBwYXRjaGVzLgogICAg
CiAgICBTaWduZWQtb2ZmLWJ5OiBGcmFuw6dvaXMgVGlnZW90IDxmdGlnZW90QHdvbGZwb25kLm9y
Zz4KCmRpZmYgLS1naXQgYS94Zjg2ZHJtLmMgYi94Zjg2ZHJtLmMKaW5kZXggMTAxNmEyYjUuLmM0
YTJiNDI0IDEwMDY0NAotLS0gYS94Zjg2ZHJtLmMKKysrIGIveGY4NmRybS5jCkBAIC0xMDEsNyAr
MTAxLDcgQEAKICNkZWZpbmUgRFJNX01BSk9SIDIyNiAvKiBMaW51eCAqLwogI2VuZGlmCiAKLSNp
ZmRlZiBfX09wZW5CU0RfXworI2lmIGRlZmluZWQoX19PcGVuQlNEX18pIHx8IGRlZmluZWQoX19E
cmFnb25GbHlfXykKIHN0cnVjdCBkcm1fcGNpaW5mbyB7CiAJdWludDE2X3QJZG9tYWluOwogCXVp
bnQ4X3QJCWJ1czsKQEAgLTMwNjMsNyArMzA2Myw3IEBAIHN0YXRpYyBpbnQgZHJtUGFyc2VQY2lC
dXNJbmZvKGludCBtYWosIGludCBtaW4sIGRybVBjaUJ1c0luZm9QdHIgaW5mbykKICAgICBpbmZv
LT5mdW5jID0gZnVuYzsKIAogICAgIHJldHVybiAwOwotI2VsaWYgZGVmaW5lZChfX09wZW5CU0Rf
XykKKyNlbGlmIGRlZmluZWQoX19PcGVuQlNEX18pIHx8IGRlZmluZWQoX19EcmFnb25GbHlfXykK
ICAgICBzdHJ1Y3QgZHJtX3BjaWluZm8gcGluZm87CiAgICAgaW50IGZkLCB0eXBlOwogCkBAIC0z
MjI5LDcgKzMyMjksNyBAQCBzdGF0aWMgaW50IGRybVBhcnNlUGNpRGV2aWNlSW5mbyhpbnQgbWFq
LCBpbnQgbWluLAogICAgICAgICByZXR1cm4gcGFyc2VfY29uZmlnX3N5c2ZzX2ZpbGUobWFqLCBt
aW4sIGRldmljZSk7CiAKICAgICByZXR1cm4gMDsKLSNlbGlmIGRlZmluZWQoX19PcGVuQlNEX18p
CisjZWxpZiBkZWZpbmVkKF9fT3BlbkJTRF9fKSB8fCBkZWZpbmVkKF9fRHJhZ29uRmx5X18pCiAg
ICAgc3RydWN0IGRybV9wY2lpbmZvIHBpbmZvOwogICAgIGludCBmZCwgdHlwZTsKIApjb21taXQg
MjAwZTllOThhMmZiZDg3NmVlNWYwYWZkOTQzNzMxYTYzYjdhZjNkYwpBdXRob3I6IEZyYW7Dp29p
cyBUaWdlb3QgPGZ0aWdlb3RAd29sZnBvbmQub3JnPgpEYXRlOiAgIFdlZCBEZWMgMTIgMjA6NDg6
MzUgMjAxOCArMDEwMAoKICAgIHhmODZkcm06IGltcGxlbWVudCBkcm1QYXJzZVN1YnN5c3RlbVR5
cGUgZm9yIERyYWdvbkZseQogICAgCiAgICBMaWtlIG9uIE9wZW5CU0QsIHRoZSBEcmFnb25GbHkg
QlNEIGtlcm5lbCBvbmx5IGNvbnRhaW5zCiAgICBwY2kgZHJtIGRyaXZlcnMuCiAgICAKICAgIFNp
Z25lZC1vZmYtYnk6IEZyYW7Dp29pcyBUaWdlb3QgPGZ0aWdlb3RAd29sZnBvbmQub3JnPgoKZGlm
ZiAtLWdpdCBhL3hmODZkcm0uYyBiL3hmODZkcm0uYwppbmRleCA3MWFkNTRiYS4uMTAxNmEyYjUg
MTAwNjQ0Ci0tLSBhL3hmODZkcm0uYworKysgYi94Zjg2ZHJtLmMKQEAgLTMwMTQsNyArMzAxNCw3
IEBAIHN0YXRpYyBpbnQgZHJtUGFyc2VTdWJzeXN0ZW1UeXBlKGludCBtYWosIGludCBtaW4pCiAg
ICAgfQogCiAgICAgcmV0dXJuIC1FSU5WQUw7Ci0jZWxpZiBkZWZpbmVkKF9fT3BlbkJTRF9fKQor
I2VsaWYgZGVmaW5lZChfX09wZW5CU0RfXykgfHwgZGVmaW5lZChfX0RyYWdvbkZseV9fKQogICAg
IHJldHVybiBEUk1fQlVTX1BDSTsKICNlbHNlCiAjd2FybmluZyAiTWlzc2luZyBpbXBsZW1lbnRh
dGlvbiBvZiBkcm1QYXJzZVN1YnN5c3RlbVR5cGUiCgoKLS0KX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX18KRHJpLXBhdGNoZXMgbWFpbGluZyBsaXN0CkRyaS1w
YXRjaGVzQGxpc3RzLnNvdXJjZWZvcmdlLm5ldApodHRwczovL2xpc3RzLnNvdXJjZWZvcmdlLm5l
dC9saXN0cy9saXN0aW5mby9kcmktcGF0Y2hlcwo=