From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bartlomiej Zolnierkiewicz Subject: [GIT PULL] fbdev fixes for v4.12-rc6 Date: Fri, 16 Jun 2017 16:16:53 +0200 Message-ID: <2048689.NbThvpjilr@amdc3058> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by gabe.freedesktop.org (Postfix) with ESMTPS id E21716E8FC for ; Fri, 16 Jun 2017 14:16:59 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Linus Torvalds Cc: linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org CkhpIExpbnVzLAoKUGxlYXNlIHB1bGwgZmJkZXYgZml4ZXMgZm9yIHY0LjEyLXJjNi4KCkJlc3Qg cmVnYXJkcywKLS0KQmFydGxvbWllaiBab2xuaWVya2lld2ljegpTYW1zdW5nIFImRCBJbnN0aXR1 dGUgUG9sYW5kClNhbXN1bmcgRWxlY3Ryb25pY3MKCgpUaGUgZm9sbG93aW5nIGNoYW5nZXMgc2lu Y2UgY29tbWl0IDMyYzE0MzFlZWE0ODgxYTZiMTdiZDdjNjM5MzE1MDEwYWVlZmE0NTI6CgogIExp bnV4IDQuMTItcmM1ICgyMDE3LTA2LTExIDE2OjQ4OjIwIC0wNzAwKQoKYXJlIGF2YWlsYWJsZSBp biB0aGUgZ2l0IHJlcG9zaXRvcnkgYXQ6CgogIGdpdDovL2dpdGh1Yi5jb20vYnpvbG5pZXIvbGlu dXguZ2l0IHRhZ3MvZmJkZXYtdjQuMTItcmM2Cgpmb3IgeW91IHRvIGZldGNoIGNoYW5nZXMgdXAg dG8gYjQyOWY5NmFhNWNiNDAyM2I5MTVkZTljMmFhNmU3NzIwYTkzOTg1NjoKCiAgdmlkZW86IGZi ZGV2OiB1ZGxmYjogZHJvcCBsb2cgbGV2ZWwgZm9yIGJsYW5raW5nICgyMDE3LTA2LTE0IDEyOjQw OjM2ICswMjAwKQoKLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQpmYmRldiBmaXhlcyBmb3IgdjQuMTItcmM2OgoKLSBmaXggdWRs ZmIgZHJpdmVyIHRvIHN0b3Agc3BhbW1pbmcgbG9ncyAoTWlrZSBHZXJvdykKLSBhZGQgbWlzc2lu ZyBlbmRpYW5uZXNzIGNvbnZlcnNpb25zIGluIHNtc2N1ZnggJiB1ZGxmYiBkcml2ZXJzIChKb2hh biBIb3ZvbGQpCi0gZml4IGZldyBnY2Mgd2FybmluZ3MvZXJyb3JzIChBcm5kIEJlcmdtYW5uKQoK LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLQpBcm5kIEJlcmdtYW5uICgyKToKICAgICAgdmlkZW86IGZiZGV2OiBhdm9pZCBpbnQt aW4tYm9vbC1jb250ZXh0IHdhcm5pbmcKICAgICAgdmlkZW86IGZiZGV2OiB2aWE6IHJlbW92ZSBw b3NzaWJseSB1bnVzZWQgdmFyaWFibGVzCgpKb2hhbiBIb3ZvbGQgKDEpOgogICAgICB2aWRlbzog ZmJkZXY6IGFkZCBtaXNzaW5nIFVTQi1kZXNjcmlwdG9yIGVuZGlhbm5lc3MgY29udmVyc2lvbnMK Ck1pa2UgR2Vyb3cgKDEpOgogICAgICB2aWRlbzogZmJkZXY6IHVkbGZiOiBkcm9wIGxvZyBsZXZl bCBmb3IgYmxhbmtpbmcKCiBkcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJtb24uYyAgIHwgMiAr LQogZHJpdmVycy92aWRlby9mYmRldi9zbXNjdWZ4LmMgICAgICB8IDUgKysrLS0KIGRyaXZlcnMv dmlkZW8vZmJkZXYvdWRsZmIuYyAgICAgICAgfCA5ICsrKysrLS0tLQogZHJpdmVycy92aWRlby9m YmRldi92aWEvdmlhZmJkZXYuYyB8IDggKysrLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgMTIgaW5z ZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy92aWRlby9m YmRldi9jb3JlL2ZibW9uLmMgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJtb24uYwppbmRl eCA2ODdlYmIwLi40MWQ3OTc5IDEwMDY0NAotLS0gYS9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUv ZmJtb24uYworKysgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJtb24uYwpAQCAtMTA0OCw3 ICsxMDQ4LDcgQEAgdm9pZCBmYl9lZGlkX2FkZF9tb25zcGVjcyh1bnNpZ25lZCBjaGFyICplZGlk LCBzdHJ1Y3QgZmJfbW9uc3BlY3MgKnNwZWNzKQogCiAJZm9yIChpID0gMDsgaSA8ICgxMjggLSBl ZGlkWzJdKSAvIERFVEFJTEVEX1RJTUlOR19ERVNDUklQVElPTl9TSVpFOwogCSAgICAgaSsrLCBi bG9jayArPSBERVRBSUxFRF9USU1JTkdfREVTQ1JJUFRJT05fU0laRSkKLQkJaWYgKFBJWEVMX0NM T0NLKQorCQlpZiAoUElYRUxfQ0xPQ0sgIT0gMCkKIAkJCWVkdFtudW0rK10gPSBibG9jayAtIGVk aWQ7CiAKIAkvKiBZaWtlcywgRURJRCBkYXRhIGlzIHRvdGFsbHkgdXNlbGVzcyAqLwpkaWZmIC0t Z2l0IGEvZHJpdmVycy92aWRlby9mYmRldi9zbXNjdWZ4LmMgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2 L3Ntc2N1ZnguYwppbmRleCBlYzJlN2UzLi40NDlmY2VhIDEwMDY0NAotLS0gYS9kcml2ZXJzL3Zp ZGVvL2ZiZGV2L3Ntc2N1ZnguYworKysgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2L3Ntc2N1ZnguYwpA QCAtMTY0Niw4ICsxNjQ2LDkgQEAgc3RhdGljIGludCB1ZnhfdXNiX3Byb2JlKHN0cnVjdCB1c2Jf aW50ZXJmYWNlICppbnRlcmZhY2UsCiAJZGV2X2RiZyhkZXYtPmdkZXYsICIlcyAlcyAtIHNlcmlh bCAjJXNcbiIsCiAJCXVzYmRldi0+bWFudWZhY3R1cmVyLCB1c2JkZXYtPnByb2R1Y3QsIHVzYmRl di0+c2VyaWFsKTsKIAlkZXZfZGJnKGRldi0+Z2RldiwgInZpZF8lMDR4JnBpZF8lMDR4JnJldl8l MDR4IGRyaXZlcidzIHVmeF9kYXRhIHN0cnVjdCBhdCAlcFxuIiwKLQkJdXNiZGV2LT5kZXNjcmlw dG9yLmlkVmVuZG9yLCB1c2JkZXYtPmRlc2NyaXB0b3IuaWRQcm9kdWN0LAotCQl1c2JkZXYtPmRl c2NyaXB0b3IuYmNkRGV2aWNlLCBkZXYpOworCQlsZTE2X3RvX2NwdSh1c2JkZXYtPmRlc2NyaXB0 b3IuaWRWZW5kb3IpLAorCQlsZTE2X3RvX2NwdSh1c2JkZXYtPmRlc2NyaXB0b3IuaWRQcm9kdWN0 KSwKKwkJbGUxNl90b19jcHUodXNiZGV2LT5kZXNjcmlwdG9yLmJjZERldmljZSksIGRldik7CiAJ ZGV2X2RiZyhkZXYtPmdkZXYsICJjb25zb2xlIGVuYWJsZT0lZFxuIiwgY29uc29sZSk7CiAJZGV2 X2RiZyhkZXYtPmdkZXYsICJmYl9kZWZpbyBlbmFibGU9JWRcbiIsIGZiX2RlZmlvKTsKIApkaWZm IC0tZ2l0IGEvZHJpdmVycy92aWRlby9mYmRldi91ZGxmYi5jIGIvZHJpdmVycy92aWRlby9mYmRl di91ZGxmYi5jCmluZGV4IDZhM2MzNTMuLjA1ZWY2NTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdmlk ZW8vZmJkZXYvdWRsZmIuYworKysgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2L3VkbGZiLmMKQEAgLTEx MDUsOCArMTEwNSw4IEBAIHN0YXRpYyBpbnQgZGxmYl9vcHNfYmxhbmsoaW50IGJsYW5rX21vZGUs IHN0cnVjdCBmYl9pbmZvICppbmZvKQogCWNoYXIgKmJ1ZnB0cjsKIAlzdHJ1Y3QgdXJiICp1cmI7 CiAKLQlwcl9pbmZvKCIvZGV2L2ZiJWQgRkJfQkxBTksgbW9kZSAlZCAtLT4gJWRcbiIsCi0JCWlu Zm8tPm5vZGUsIGRldi0+YmxhbmtfbW9kZSwgYmxhbmtfbW9kZSk7CisJcHJfZGVidWcoIi9kZXYv ZmIlZCBGQl9CTEFOSyBtb2RlICVkIC0tPiAlZFxuIiwKKwkJIGluZm8tPm5vZGUsIGRldi0+Ymxh bmtfbW9kZSwgYmxhbmtfbW9kZSk7CiAKIAlpZiAoKGRldi0+YmxhbmtfbW9kZSA9PSBGQl9CTEFO S19QT1dFUkRPV04pICYmCiAJICAgIChibGFua19tb2RlICE9IEZCX0JMQU5LX1BPV0VSRE9XTikp IHsKQEAgLTE2MTMsOCArMTYxMyw5IEBAIHN0YXRpYyBpbnQgZGxmYl91c2JfcHJvYmUoc3RydWN0 IHVzYl9pbnRlcmZhY2UgKmludGVyZmFjZSwKIAlwcl9pbmZvKCIlcyAlcyAtIHNlcmlhbCAjJXNc biIsCiAJCXVzYmRldi0+bWFudWZhY3R1cmVyLCB1c2JkZXYtPnByb2R1Y3QsIHVzYmRldi0+c2Vy aWFsKTsKIAlwcl9pbmZvKCJ2aWRfJTA0eCZwaWRfJTA0eCZyZXZfJTA0eCBkcml2ZXIncyBkbGZi X2RhdGEgc3RydWN0IGF0ICVwXG4iLAotCQl1c2JkZXYtPmRlc2NyaXB0b3IuaWRWZW5kb3IsIHVz YmRldi0+ZGVzY3JpcHRvci5pZFByb2R1Y3QsCi0JCXVzYmRldi0+ZGVzY3JpcHRvci5iY2REZXZp Y2UsIGRldik7CisJCWxlMTZfdG9fY3B1KHVzYmRldi0+ZGVzY3JpcHRvci5pZFZlbmRvciksCisJ CWxlMTZfdG9fY3B1KHVzYmRldi0+ZGVzY3JpcHRvci5pZFByb2R1Y3QpLAorCQlsZTE2X3RvX2Nw dSh1c2JkZXYtPmRlc2NyaXB0b3IuYmNkRGV2aWNlKSwgZGV2KTsKIAlwcl9pbmZvKCJjb25zb2xl IGVuYWJsZT0lZFxuIiwgY29uc29sZSk7CiAJcHJfaW5mbygiZmJfZGVmaW8gZW5hYmxlPSVkXG4i LCBmYl9kZWZpbyk7CiAJcHJfaW5mbygic2hhZG93IGVuYWJsZT0lZFxuIiwgc2hhZG93KTsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvdmlhL3ZpYWZiZGV2LmMgYi9kcml2ZXJzL3Zp ZGVvL2ZiZGV2L3ZpYS92aWFmYmRldi5jCmluZGV4IGY5NzE4ZjAuLmJhZGVlMDQgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvdmlhL3ZpYWZiZGV2LmMKKysrIGIvZHJpdmVycy92aWRl by9mYmRldi92aWEvdmlhZmJkZXYuYwpAQCAtMTYzMCwxNiArMTYzMCwxNCBAQCBzdGF0aWMgdm9p ZCB2aWFmYl9pbml0X3Byb2Moc3RydWN0IHZpYWZiX3NoYXJlZCAqc2hhcmVkKQogfQogc3RhdGlj IHZvaWQgdmlhZmJfcmVtb3ZlX3Byb2Moc3RydWN0IHZpYWZiX3NoYXJlZCAqc2hhcmVkKQogewot CXN0cnVjdCBwcm9jX2Rpcl9lbnRyeSAqdmlhZmJfZW50cnkgPSBzaGFyZWQtPnByb2NfZW50cnks Ci0JCSppZ2ExX2VudHJ5ID0gc2hhcmVkLT5pZ2ExX3Byb2NfZW50cnksCi0JCSppZ2EyX2VudHJ5 ID0gc2hhcmVkLT5pZ2EyX3Byb2NfZW50cnk7CisJc3RydWN0IHByb2NfZGlyX2VudHJ5ICp2aWFm Yl9lbnRyeSA9IHNoYXJlZC0+cHJvY19lbnRyeTsKIAogCWlmICghdmlhZmJfZW50cnkpCiAJCXJl dHVybjsKIAotCXJlbW92ZV9wcm9jX2VudHJ5KCJvdXRwdXRfZGV2aWNlcyIsIGlnYTJfZW50cnkp OworCXJlbW92ZV9wcm9jX2VudHJ5KCJvdXRwdXRfZGV2aWNlcyIsIHNoYXJlZC0+aWdhMl9wcm9j X2VudHJ5KTsKIAlyZW1vdmVfcHJvY19lbnRyeSgiaWdhMiIsIHZpYWZiX2VudHJ5KTsKLQlyZW1v dmVfcHJvY19lbnRyeSgib3V0cHV0X2RldmljZXMiLCBpZ2ExX2VudHJ5KTsKKwlyZW1vdmVfcHJv Y19lbnRyeSgib3V0cHV0X2RldmljZXMiLCBzaGFyZWQtPmlnYTFfcHJvY19lbnRyeSk7CiAJcmVt b3ZlX3Byb2NfZW50cnkoImlnYTEiLCB2aWFmYl9lbnRyeSk7CiAJcmVtb3ZlX3Byb2NfZW50cnko InN1cHBvcnRlZF9vdXRwdXRfZGV2aWNlcyIsIHZpYWZiX2VudHJ5KTsKIAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlz dApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==