From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2.2 03/11] drm/i915: Remove intel_prepare_page_flip, v2. Date: Mon, 18 Apr 2016 12:10:54 +0200 Message-ID: <5714B2AE.1000702@linux.intel.com> References: <1460539104-15661-1-git-send-email-maarten.lankhorst@linux.intel.com> <1460539104-15661-4-git-send-email-maarten.lankhorst@linux.intel.com> <1460722905.6600.34.camel@gmail.com> <5714B252.4070507@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <5714B252.4070507@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Ander Conselvan De Oliveira , intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org SW5zdGVhZCBvZiBjYWxsaW5nIHByZXBhcmVfZmxpcCByaWdodCBiZWZvcmUgY2FsbGluZyBmaW5p c2hfcGFnZV9mbGlwCmRvIGV2ZXJ5dGhpbmcgZnJvbSBwcmVwYXJlX3BhZ2VfZmxpcCBpbiBmaW5p c2hfcGFnZV9mbGlwLgoKUHV0dGluZyBwcmVwYXJlIGFuZCBmaW5pc2ggcGFnZV9mbGlwIGluIGEg c2luZ2xlIHN0ZXAgcmVtb3ZlcyB0aGUgbmVlZApmb3IgSU5URUxfRkxJUF9DT01QTEVURSwgc28g aXQgY2FuIGJlIHJlbW92ZWQuIFRoaXMgc2ltcGxpZmllcyB0aGUgY29kZQpzbGlnaHRseS4KCkNo YW5nZXMgc2luY2UgdjE6Ci0gSW52ZXJ0IGlmIGNhc2UgdG8gc2ltcGxpZnkgY29kZS4KLSBBZGQg bWlzc2luZyBiYXJyaWVyLgotIFJld29yZCBjb21taXQgbWVzc2FnZS4KClNpZ25lZC1vZmYtYnk6 IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0t LQpVaCBvaCwgZm9yZ290IHRvIHJlZnJlc2gsIHRoaXMgdmVyc2lvbiBoYXMgdGhlIG1pc3Npbmcg bWVtb3J5IGJhcnJpZXIgdGhlIGNvbW1pdCBzYXlzIGl0IGhhcy4KCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZGVidWdmcy5jCmluZGV4IDk5YTQ2MWUzNGY2MC4uNTY2YzVhZmRkMzAwIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtNTg5LDkgKzU4OSw2IEBAIHN0YXRpYyBpbnQgaTkx NV9nZW1fcGFnZWZsaXBfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKmRhdGEpCiAJCQlp ZiAocGVuZGluZyA9PSBJTlRFTF9GTElQX0lOQUNUSVZFKSB7CiAJCQkJc2VxX3ByaW50ZihtLCAi RmxpcCBpb2N0bCBwcmVwYXJpbmcgb24gcGlwZSAlYyAocGxhbmUgJWMpXG4iLAogCQkJCQkgICBw aXBlLCBwbGFuZSk7Ci0JCQl9IGVsc2UgaWYgKHBlbmRpbmcgPj0gSU5URUxfRkxJUF9DT01QTEVU RSkgewotCQkJCXNlcV9wcmludGYobSwgIkZsaXAgcXVldWVkIG9uIHBpcGUgJWMgKHBsYW5lICVj KVxuIiwKLQkJCQkJICAgcGlwZSwgcGxhbmUpOwogCQkJfSBlbHNlIHsKIAkJCQlzZXFfcHJpbnRm KG0sICJGbGlwIHBlbmRpbmcgKHdhaXRpbmcgZm9yIHZzeW5jKSBvbiBwaXBlICVjIChwbGFuZSAl YylcbiIsCiAJCQkJCSAgIHBpcGUsIHBsYW5lKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCmluZGV4 IDI0N2Q5NjJhZmFiYi4uNmUzYjEzYzdiZjMxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAg LTE3MDcsMTAgKzE3MDcsOCBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X3BpcGVzdGF0X2lycV9o YW5kbGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHUzMiBpaXIpCiAJCSAgICBpbnRlbF9waXBl X2hhbmRsZV92YmxhbmsoZGV2LCBwaXBlKSkKIAkJCWludGVsX2NoZWNrX3BhZ2VfZmxpcChkZXYs IHBpcGUpOwogCi0JCWlmIChwaXBlX3N0YXRzW3BpcGVdICYgUExBTkVfRkxJUF9ET05FX0lOVF9T VEFUVVNfVkxWKSB7Ci0JCQlpbnRlbF9wcmVwYXJlX3BhZ2VfZmxpcChkZXYsIHBpcGUpOworCQlp ZiAocGlwZV9zdGF0c1twaXBlXSAmIFBMQU5FX0ZMSVBfRE9ORV9JTlRfU1RBVFVTX1ZMVikKIAkJ CWludGVsX2ZpbmlzaF9wYWdlX2ZsaXAoZGV2LCBwaXBlKTsKLQkJfQogCiAJCWlmIChwaXBlX3N0 YXRzW3BpcGVdICYgUElQRV9DUkNfRE9ORV9JTlRFUlJVUFRfU1RBVFVTKQogCQkJaTl4eF9waXBl X2NyY19pcnFfaGFuZGxlcihkZXYsIHBpcGUpOwpAQCAtMjEwOSwxMCArMjEwNyw4IEBAIHN0YXRp YyB2b2lkIGlsa19kaXNwbGF5X2lycV9oYW5kbGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHUz MiBkZV9paXIpCiAJCQlpOXh4X3BpcGVfY3JjX2lycV9oYW5kbGVyKGRldiwgcGlwZSk7CiAKIAkJ LyogcGxhbmUvcGlwZXMgbWFwIDE6MSBvbiBpbGsrICovCi0JCWlmIChkZV9paXIgJiBERV9QTEFO RV9GTElQX0RPTkUocGlwZSkpIHsKLQkJCWludGVsX3ByZXBhcmVfcGFnZV9mbGlwKGRldiwgcGlw ZSk7CisJCWlmIChkZV9paXIgJiBERV9QTEFORV9GTElQX0RPTkUocGlwZSkpCiAJCQlpbnRlbF9m aW5pc2hfcGFnZV9mbGlwX3BsYW5lKGRldiwgcGlwZSk7Ci0JCX0KIAl9CiAKIAkvKiBjaGVjayBl dmVudCBmcm9tIFBDSCAqLwpAQCAtMjE1NiwxMCArMjE1Miw4IEBAIHN0YXRpYyB2b2lkIGl2Yl9k aXNwbGF5X2lycV9oYW5kbGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHUzMiBkZV9paXIpCiAJ CQlpbnRlbF9jaGVja19wYWdlX2ZsaXAoZGV2LCBwaXBlKTsKIAogCQkvKiBwbGFuZS9waXBlcyBt YXAgMToxIG9uIGlsaysgKi8KLQkJaWYgKGRlX2lpciAmIERFX1BMQU5FX0ZMSVBfRE9ORV9JVkIo cGlwZSkpIHsKLQkJCWludGVsX3ByZXBhcmVfcGFnZV9mbGlwKGRldiwgcGlwZSk7CisJCWlmIChk ZV9paXIgJiBERV9QTEFORV9GTElQX0RPTkVfSVZCKHBpcGUpKQogCQkJaW50ZWxfZmluaXNoX3Bh Z2VfZmxpcF9wbGFuZShkZXYsIHBpcGUpOwotCQl9CiAJfQogCiAJLyogY2hlY2sgZXZlbnQgZnJv bSBQQ0ggKi8KQEAgLTIzNjMsMTAgKzIzNTcsOCBAQCBnZW44X2RlX2lycV9oYW5kbGVyKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTMyIG1hc3Rlcl9jdGwpCiAJCWVsc2UKIAkJ CWZsaXBfZG9uZSAmPSBHRU44X1BJUEVfUFJJTUFSWV9GTElQX0RPTkU7CiAKLQkJaWYgKGZsaXBf ZG9uZSkgewotCQkJaW50ZWxfcHJlcGFyZV9wYWdlX2ZsaXAoZGV2LCBwaXBlKTsKKwkJaWYgKGZs aXBfZG9uZSkKIAkJCWludGVsX2ZpbmlzaF9wYWdlX2ZsaXBfcGxhbmUoZGV2LCBwaXBlKTsKLQkJ fQogCiAJCWlmIChpaXIgJiBHRU44X1BJUEVfQ0RDTEtfQ1JDX0RPTkUpCiAJCQloc3dfcGlwZV9j cmNfaXJxX2hhbmRsZXIoZGV2LCBwaXBlKTsKQEAgLTM5NjIsNyArMzk1NCw2IEBAIHN0YXRpYyBi b29sIGk4eHhfaGFuZGxlX3ZibGFuayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWlmIChJOTE1 X1JFQUQxNihJU1IpICYgZmxpcF9wZW5kaW5nKQogCQlnb3RvIGNoZWNrX3BhZ2VfZmxpcDsKIAot CWludGVsX3ByZXBhcmVfcGFnZV9mbGlwKGRldiwgcGxhbmUpOwogCWludGVsX2ZpbmlzaF9wYWdl X2ZsaXAoZGV2LCBwaXBlKTsKIAlyZXR1cm4gdHJ1ZTsKIApAQCAtNDE1Myw3ICs0MTQ0LDYgQEAg c3RhdGljIGJvb2wgaTkxNV9oYW5kbGVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJ aWYgKEk5MTVfUkVBRChJU1IpICYgZmxpcF9wZW5kaW5nKQogCQlnb3RvIGNoZWNrX3BhZ2VfZmxp cDsKIAotCWludGVsX3ByZXBhcmVfcGFnZV9mbGlwKGRldiwgcGxhbmUpOwogCWludGVsX2Zpbmlz aF9wYWdlX2ZsaXAoZGV2LCBwaXBlKTsKIAlyZXR1cm4gdHJ1ZTsKIApkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCmluZGV4IDgwNjFiMzI5Zjk3NC4uMWU5MjliMDgxMTYzIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0zMTAxLDcgKzMxMDEsNiBAQCBzdGF0aWMg dm9pZCBpbnRlbF9jb21wbGV0ZV9wYWdlX2ZsaXBzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJ CXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAkJ ZW51bSBwbGFuZSBwbGFuZSA9IGludGVsX2NydGMtPnBsYW5lOwogCi0JCWludGVsX3ByZXBhcmVf cGFnZV9mbGlwKGRldiwgcGxhbmUpOwogCQlpbnRlbF9maW5pc2hfcGFnZV9mbGlwX3BsYW5lKGRl diwgcGxhbmUpOwogCX0KIH0KQEAgLTEwOTI4LDUwICsxMDkyNyw2IEBAIHN0YXRpYyB2b2lkIGlu dGVsX3VucGluX3dvcmtfZm4oc3RydWN0IHdvcmtfc3RydWN0ICpfX3dvcmspCiAJa2ZyZWUod29y ayk7CiB9CiAKLXN0YXRpYyB2b2lkIGRvX2ludGVsX2ZpbmlzaF9wYWdlX2ZsaXAoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKLQkJCQkgICAgICBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCi17Ci0Jc3Ry dWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwotCXN0cnVj dCBpbnRlbF91bnBpbl93b3JrICp3b3JrOwotCXVuc2lnbmVkIGxvbmcgZmxhZ3M7Ci0KLQkvKiBJ Z25vcmUgZWFybHkgdmJsYW5rIGlycXMgKi8KLQlpZiAoaW50ZWxfY3J0YyA9PSBOVUxMKQotCQly ZXR1cm47Ci0KLQkvKgotCSAqIFRoaXMgaXMgY2FsbGVkIGJvdGggYnkgaXJxIGhhbmRsZXJzIGFu ZCB0aGUgcmVzZXQgY29kZSAodG8gY29tcGxldGUKLQkgKiBsb3N0IHBhZ2VmbGlwcykgc28gbmVl ZHMgdGhlIGZ1bGwgaXJxc2F2ZSBzcGlubG9ja3MuCi0JICovCi0Jc3Bpbl9sb2NrX2lycXNhdmUo JmRldi0+ZXZlbnRfbG9jaywgZmxhZ3MpOwotCXdvcmsgPSBpbnRlbF9jcnRjLT51bnBpbl93b3Jr OwotCi0JaWYgKHdvcmsgJiYgYXRvbWljX3JlYWQoJndvcmstPnBlbmRpbmcpID49IElOVEVMX0ZM SVBfQ09NUExFVEUpIHsKLQkJLyogZW5zdXJlIHRoYXQgdGhlIHVucGluIHdvcmsgaXMgY29uc2lz dGVudCB3cnQgLT5wZW5kaW5nLiAqLwotCQlzbXBfbWJfX2FmdGVyX2F0b21pYygpOwotCi0JCXBh Z2VfZmxpcF9jb21wbGV0ZWQoaW50ZWxfY3J0Yyk7Ci0JfQotCi0Jc3Bpbl91bmxvY2tfaXJxcmVz dG9yZSgmZGV2LT5ldmVudF9sb2NrLCBmbGFncyk7Ci19Ci0KLXZvaWQgaW50ZWxfZmluaXNoX3Bh Z2VfZmxpcChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgcGlwZSkKLXsKLQlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwotCXN0cnVjdCBkcm1f Y3J0YyAqY3J0YyA9IGRldl9wcml2LT5waXBlX3RvX2NydGNfbWFwcGluZ1twaXBlXTsKLQotCWRv X2ludGVsX2ZpbmlzaF9wYWdlX2ZsaXAoZGV2LCBjcnRjKTsKLX0KLQotdm9pZCBpbnRlbF9maW5p c2hfcGFnZV9mbGlwX3BsYW5lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBwbGFuZSkKLXsK LQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwot CXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IGRldl9wcml2LT5wbGFuZV90b19jcnRjX21hcHBpbmdb cGxhbmVdOwotCi0JZG9faW50ZWxfZmluaXNoX3BhZ2VfZmxpcChkZXYsIGNydGMpOwotfQotCiAv KiBJcyAnYScgYWZ0ZXIgb3IgZXF1YWwgdG8gJ2InPyAqLwogc3RhdGljIGJvb2wgZzR4X2ZsaXBf Y291bnRfYWZ0ZXJfZXEodTMyIGEsIHUzMiBiKQogewpAQCAtMTA5ODMsNiArMTA5MzgsOSBAQCBz dGF0aWMgYm9vbCBwYWdlX2ZsaXBfZmluaXNoZWQoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJ c3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAKKwkvKiBlbnN1cmUgdGhh dCB0aGUgdW5waW4gd29yayBpcyBjb25zaXN0ZW50IHdydCAtPnBlbmRpbmcuICovCisJc21wX21i X19hZnRlcl9hdG9taWMoKTsKKwogCWlmIChpOTE1X3Jlc2V0X2luX3Byb2dyZXNzKCZkZXZfcHJp di0+Z3B1X2Vycm9yKSB8fAogCSAgICBjcnRjLT5yZXNldF9jb3VudGVyICE9IGF0b21pY19yZWFk KCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0X2NvdW50ZXIpKQogCQlyZXR1cm4gdHJ1ZTsKQEAg LTExMDI0LDI4ICsxMDk4Miw0OCBAQCBzdGF0aWMgYm9vbCBwYWdlX2ZsaXBfZmluaXNoZWQoc3Ry dWN0IGludGVsX2NydGMgKmNydGMpCiAJCQkJICAgIGNydGMtPnVucGluX3dvcmstPmZsaXBfY291 bnQpOwogfQogCi12b2lkIGludGVsX3ByZXBhcmVfcGFnZV9mbGlwKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIGludCBwbGFuZSkKK3N0YXRpYyB2b2lkIGRvX2ludGVsX2ZpbmlzaF9wYWdlX2ZsaXAo c3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJCQkgICAgICBzdHJ1Y3QgZHJtX2NydGMgKmNydGMp CiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0 ZTsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9Ci0JCXRvX2ludGVsX2NydGMoZGV2 X3ByaXYtPnBsYW5lX3RvX2NydGNfbWFwcGluZ1twbGFuZV0pOworCXN0cnVjdCBpbnRlbF9jcnRj ICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKKwlzdHJ1Y3QgaW50ZWxfdW5waW5f d29yayAqd29yazsKIAl1bnNpZ25lZCBsb25nIGZsYWdzOwogCisJLyogSWdub3JlIGVhcmx5IHZi bGFuayBpcnFzICovCisJaWYgKGludGVsX2NydGMgPT0gTlVMTCkKKwkJcmV0dXJuOwogCiAJLyoK IAkgKiBUaGlzIGlzIGNhbGxlZCBib3RoIGJ5IGlycSBoYW5kbGVycyBhbmQgdGhlIHJlc2V0IGNv ZGUgKHRvIGNvbXBsZXRlCiAJICogbG9zdCBwYWdlZmxpcHMpIHNvIG5lZWRzIHRoZSBmdWxsIGly cXNhdmUgc3BpbmxvY2tzLgotCSAqCi0JICogTkI6IEFuIE1NSU8gdXBkYXRlIG9mIHRoZSBwbGFu ZSBiYXNlIHBvaW50ZXIgd2lsbCBhbHNvCi0JICogZ2VuZXJhdGUgYSBwYWdlLWZsaXAgY29tcGxl dGlvbiBpcnEsIGkuZS4gZXZlcnkgbW9kZXNldAotCSAqIGlzIGFsc28gYWNjb21wYW5pZWQgYnkg YSBzcHVyaW91cyBpbnRlbF9wcmVwYXJlX3BhZ2VfZmxpcCgpLgogCSAqLwogCXNwaW5fbG9ja19p cnFzYXZlKCZkZXYtPmV2ZW50X2xvY2ssIGZsYWdzKTsKLQlpZiAoaW50ZWxfY3J0Yy0+dW5waW5f d29yayAmJiBwYWdlX2ZsaXBfZmluaXNoZWQoaW50ZWxfY3J0YykpCi0JCWF0b21pY19pbmNfbm90 X3plcm8oJmludGVsX2NydGMtPnVucGluX3dvcmstPnBlbmRpbmcpOworCXdvcmsgPSBpbnRlbF9j cnRjLT51bnBpbl93b3JrOworCisJaWYgKHdvcmsgIT0gTlVMTCAmJgorCSAgICBhdG9taWNfcmVh ZCgmd29yay0+cGVuZGluZykgPT0gSU5URUxfRkxJUF9QRU5ESU5HICYmCisJICAgIHBhZ2VfZmxp cF9maW5pc2hlZChpbnRlbF9jcnRjKSkKKwkJcGFnZV9mbGlwX2NvbXBsZXRlZChpbnRlbF9jcnRj KTsKKwogCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmRldi0+ZXZlbnRfbG9jaywgZmxhZ3MpOwog fQogCit2b2lkIGludGVsX2ZpbmlzaF9wYWdlX2ZsaXAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg aW50IHBpcGUpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5k ZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBkZXZfcHJpdi0+cGlwZV90b19j cnRjX21hcHBpbmdbcGlwZV07CisKKwlkb19pbnRlbF9maW5pc2hfcGFnZV9mbGlwKGRldiwgY3J0 Yyk7Cit9CisKK3ZvaWQgaW50ZWxfZmluaXNoX3BhZ2VfZmxpcF9wbGFuZShzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LCBpbnQgcGxhbmUpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBkZXZfcHJp di0+cGxhbmVfdG9fY3J0Y19tYXBwaW5nW3BsYW5lXTsKKworCWRvX2ludGVsX2ZpbmlzaF9wYWdl X2ZsaXAoZGV2LCBjcnRjKTsKK30KKwogc3RhdGljIGlubGluZSB2b2lkIGludGVsX21hcmtfcGFn ZV9mbGlwX2FjdGl2ZShzdHJ1Y3QgaW50ZWxfdW5waW5fd29yayAqd29yaykKIHsKIAkvKiBFbnN1 cmUgdGhhdCB0aGUgd29yayBpdGVtIGlzIGNvbnNpc3RlbnQgd2hlbiBhY3RpdmF0aW5nIGl0IC4u LiAqLwpAQCAtMTE0OTEsOCArMTE0NjksOCBAQCBzdGF0aWMgYm9vbCBfX2ludGVsX3BhZ2VmbGlw X3N0YWxsX2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJLyogZW5zdXJlIHRoYXQgdGhl IHVucGluIHdvcmsgaXMgY29uc2lzdGVudCB3cnQgLT5wZW5kaW5nLiAqLwogCXNtcF9tYl9fYWZ0 ZXJfYXRvbWljKCk7CiAKLQlpZiAocGVuZGluZyAhPSBJTlRFTF9GTElQX1BFTkRJTkcpCi0JCXJl dHVybiBwZW5kaW5nID09IElOVEVMX0ZMSVBfQ09NUExFVEU7CisJaWYgKHBlbmRpbmcgPT0gSU5U RUxfRkxJUF9JTkFDVElWRSkKKwkJcmV0dXJuIGZhbHNlOwogCiAJaWYgKHdvcmstPmZsaXBfcmVh ZHlfdmJsYW5rID09IDApIHsKIAkJaWYgKHdvcmstPmZsaXBfcXVldWVkX3JlcSAmJgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaAppbmRleCBjZTJhNmQ5ODViYmUuLmE3NGVkZWNmZDE3OSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTk0Niw3ICs5NDYsNiBAQCBzdHJ1Y3QgaW50ZWxfdW5w aW5fd29yayB7CiAJYXRvbWljX3QgcGVuZGluZzsKICNkZWZpbmUgSU5URUxfRkxJUF9JTkFDVElW RQkwCiAjZGVmaW5lIElOVEVMX0ZMSVBfUEVORElORwkxCi0jZGVmaW5lIElOVEVMX0ZMSVBfQ09N UExFVEUJMgogCXUzMiBmbGlwX2NvdW50OwogCXUzMiBndHRfb2Zmc2V0OwogCXN0cnVjdCBkcm1f aTkxNV9nZW1fcmVxdWVzdCAqZmxpcF9xdWV1ZWRfcmVxOwpAQCAtMTE1OSw3ICsxMTU4LDYgQEAg c3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqCiBfX2ludGVsX2ZyYW1lYnVmZmVyX2NyZWF0ZShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJICAgc3RydWN0IGRybV9tb2RlX2ZiX2NtZDIgKm1vZGVf Y21kLAogCQkJICAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaik7Ci12b2lkIGludGVs X3ByZXBhcmVfcGFnZV9mbGlwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBwbGFuZSk7CiB2 b2lkIGludGVsX2ZpbmlzaF9wYWdlX2ZsaXAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHBp cGUpOwogdm9pZCBpbnRlbF9maW5pc2hfcGFnZV9mbGlwX3BsYW5lKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIGludCBwbGFuZSk7CiB2b2lkIGludGVsX2NoZWNrX3BhZ2VfZmxpcChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCBpbnQgcGlwZSk7CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK