From: Daniel Vetter Subject: [PATCH 6/7] drm/i915: Remove intel_flip_work infrastructure Date: Thu, 20 Jul 2017 19:57:53 +0200 Message-ID: <20170720175754.30751-7-daniel.vetter@ffwll.ch> References: <20170720175754.30751-1-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 70CA46E703 for ; Thu, 20 Jul 2017 17:58:10 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id m4so4418877wmi.4 for ; Thu, 20 Jul 2017 10:58:10 -0700 (PDT) In-Reply-To: <20170720175754.30751-1-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel Graphics Development Cc: Daniel Vetter , Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org VGhpcyBnZXRzIHJpZCBvZiBhbGwgdGhlIGludGVyYWN0aW9ucyBiZXR3ZWVuIHRoZSBsZWdhY3kg ZmxpcCBjb2RlIGFuZAp0aGUgbW9kZXNldCBjb2RlLiBZYXkhCgpUaGlzIGhpZ2hsaWdodHMgYW4g b21taXNzaW9uIGluIHRoZSBhdG9taWMgcGF0aHMsIHdoZXJlIHdlIGZhaWwgdG8KYXBwbHkgYSBi b29zdCB0byB0aGUgcGVuZGluZyByZW5kZXJpbmcgd2hlbiB3ZSBtaXNzIHRoZSB0YXJnZXQgdmJs YW5rLgpCdXQgdGhlIGV4aXN0aW5nIGNvZGUgaXMgc3RpbGwgZGVhZCBhbmQgY2FuIGJlIHJlbW92 ZWQuCgp2MjogTm90ZSB0aGF0IHRoZSBib29zdGluZyBkb2Vzbid0IHdvcmsgaW4gYXRvbWljIChD aHJpcykuCgpDYzogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4Lmlu dGVsLmNvbT4KQ2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5j b20+ClJldmlld2VkLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGlu dXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVy QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyAgfCAg NzAgLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5j ICAgICAgfCAgIDEgLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgIHwgICA0 IC0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgfCAgIDIgLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTE3ICstLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAg MjEgKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgIHwgICA4ICst LQogNyBmaWxlcyBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDIyMCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IDJlZjc1YzFhNjExOS4uYzI1ZjQyYzYw ZDYxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtNTQzLDc1ICs1NDMsNiBA QCBzdGF0aWMgaW50IGk5MTVfZ2VtX2d0dF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAq ZGF0YSkKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCBpOTE1X2dlbV9wYWdlZmxpcF9pbmZv KHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKLXsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSBub2RlX3RvX2k5MTUobS0+cHJpdmF0ZSk7Ci0Jc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9ICZkZXZfcHJpdi0+ZHJtOwotCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjOwot CWludCByZXQ7Ci0KLQlyZXQgPSBtdXRleF9sb2NrX2ludGVycnVwdGlibGUoJmRldi0+c3RydWN0 X211dGV4KTsKLQlpZiAocmV0KQotCQlyZXR1cm4gcmV0OwotCi0JZm9yX2VhY2hfaW50ZWxfY3J0 YyhkZXYsIGNydGMpIHsKLQkJY29uc3QgY2hhciBwaXBlID0gcGlwZV9uYW1lKGNydGMtPnBpcGUp OwotCQljb25zdCBjaGFyIHBsYW5lID0gcGxhbmVfbmFtZShjcnRjLT5wbGFuZSk7Ci0JCXN0cnVj dCBpbnRlbF9mbGlwX3dvcmsgKndvcms7Ci0KLQkJc3Bpbl9sb2NrX2lycSgmZGV2LT5ldmVudF9s b2NrKTsKLQkJd29yayA9IGNydGMtPmZsaXBfd29yazsKLQkJaWYgKHdvcmsgPT0gTlVMTCkgewot CQkJc2VxX3ByaW50ZihtLCAiTm8gZmxpcCBkdWUgb24gcGlwZSAlYyAocGxhbmUgJWMpXG4iLAot CQkJCSAgIHBpcGUsIHBsYW5lKTsKLQkJfSBlbHNlIHsKLQkJCXUzMiBwZW5kaW5nOwotCQkJdTMy IGFkZHI7Ci0KLQkJCXBlbmRpbmcgPSBhdG9taWNfcmVhZCgmd29yay0+cGVuZGluZyk7Ci0JCQlp ZiAocGVuZGluZykgewotCQkJCXNlcV9wcmludGYobSwgIkZsaXAgaW9jdGwgcHJlcGFyaW5nIG9u IHBpcGUgJWMgKHBsYW5lICVjKVxuIiwKLQkJCQkJICAgcGlwZSwgcGxhbmUpOwotCQkJfSBlbHNl IHsKLQkJCQlzZXFfcHJpbnRmKG0sICJGbGlwIHBlbmRpbmcgKHdhaXRpbmcgZm9yIHZzeW5jKSBv biBwaXBlICVjIChwbGFuZSAlYylcbiIsCi0JCQkJCSAgIHBpcGUsIHBsYW5lKTsKLQkJCX0KLQkJ CWlmICh3b3JrLT5mbGlwX3F1ZXVlZF9yZXEpIHsKLQkJCQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmUgPSB3b3JrLT5mbGlwX3F1ZXVlZF9yZXEtPmVuZ2luZTsKLQotCQkJCXNlcV9wcmlu dGYobSwgIkZsaXAgcXVldWVkIG9uICVzIGF0IHNlcW5vICV4LCBsYXN0IHN1Ym1pdHRlZCBzZXFu byAleCBbY3VycmVudCBicmVhZGNydW1iICV4XSwgY29tcGxldGVkPyAlZFxuIiwKLQkJCQkJICAg ZW5naW5lLT5uYW1lLAotCQkJCQkgICB3b3JrLT5mbGlwX3F1ZXVlZF9yZXEtPmdsb2JhbF9zZXFu bywKLQkJCQkJICAgaW50ZWxfZW5naW5lX2xhc3Rfc3VibWl0KGVuZ2luZSksCi0JCQkJCSAgIGlu dGVsX2VuZ2luZV9nZXRfc2Vxbm8oZW5naW5lKSwKLQkJCQkJICAgaTkxNV9nZW1fcmVxdWVzdF9j b21wbGV0ZWQod29yay0+ZmxpcF9xdWV1ZWRfcmVxKSk7Ci0JCQl9IGVsc2UKLQkJCQlzZXFfcHJp bnRmKG0sICJGbGlwIG5vdCBhc3NvY2lhdGVkIHdpdGggYW55IHJpbmdcbiIpOwotCQkJc2VxX3By aW50ZihtLCAiRmxpcCBxdWV1ZWQgb24gZnJhbWUgJWQsICh3YXMgcmVhZHkgb24gZnJhbWUgJWQp LCBub3cgJWRcbiIsCi0JCQkJICAgd29yay0+ZmxpcF9xdWV1ZWRfdmJsYW5rLAotCQkJCSAgIHdv cmstPmZsaXBfcmVhZHlfdmJsYW5rLAotCQkJCSAgIGludGVsX2NydGNfZ2V0X3ZibGFua19jb3Vu dGVyKGNydGMpKTsKLQkJCXNlcV9wcmludGYobSwgIiVkIHByZXBhcmVzXG4iLCBhdG9taWNfcmVh ZCgmd29yay0+cGVuZGluZykpOwotCi0JCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA0KQot CQkJCWFkZHIgPSBJOTE1X0hJX0RJU1BCQVNFKEk5MTVfUkVBRChEU1BTVVJGKGNydGMtPnBsYW5l KSkpOwotCQkJZWxzZQotCQkJCWFkZHIgPSBJOTE1X1JFQUQoRFNQQUREUihjcnRjLT5wbGFuZSkp OwotCQkJc2VxX3ByaW50ZihtLCAiQ3VycmVudCBzY2Fub3V0IGFkZHJlc3MgMHglMDh4XG4iLCBh ZGRyKTsKLQotCQkJaWYgKHdvcmstPnBlbmRpbmdfZmxpcF9vYmopIHsKLQkJCQlzZXFfcHJpbnRm KG0sICJOZXcgZnJhbWVidWZmZXIgYWRkcmVzcyAweCUwOGx4XG4iLCAobG9uZyl3b3JrLT5ndHRf b2Zmc2V0KTsKLQkJCQlzZXFfcHJpbnRmKG0sICJNTUlPIHVwZGF0ZSBjb21wbGV0ZWQ/ICVkXG4i LCAgYWRkciA9PSB3b3JrLT5ndHRfb2Zmc2V0KTsKLQkJCX0KLQkJfQotCQlzcGluX3VubG9ja19p cnEoJmRldi0+ZXZlbnRfbG9jayk7Ci0JfQotCi0JbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9t dXRleCk7Ci0KLQlyZXR1cm4gMDsKLX0KLQogc3RhdGljIGludCBpOTE1X2dlbV9iYXRjaF9wb29s X2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQogewogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IG5vZGVfdG9faTkxNShtLT5wcml2YXRlKTsKQEAgLTQ4NTQs NyArNDc4NSw2IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2luZm9fbGlzdCBpOTE1X2RlYnVn ZnNfbGlzdFtdID0gewogCXsiaTkxNV9nZW1fZ3R0IiwgaTkxNV9nZW1fZ3R0X2luZm8sIDB9LAog CXsiaTkxNV9nZW1fcGluX2Rpc3BsYXkiLCBpOTE1X2dlbV9ndHRfaW5mbywgMCwgKHZvaWQgKikx fSwKIAl7Imk5MTVfZ2VtX3N0b2xlbiIsIGk5MTVfZ2VtX3N0b2xlbl9saXN0X2luZm8gfSwKLQl7 Imk5MTVfZ2VtX3BhZ2VmbGlwIiwgaTkxNV9nZW1fcGFnZWZsaXBfaW5mbywgMH0sCiAJeyJpOTE1 X2dlbV9yZXF1ZXN0IiwgaTkxNV9nZW1fcmVxdWVzdF9pbmZvLCAwfSwKIAl7Imk5MTVfZ2VtX3Nl cW5vIiwgaTkxNV9nZW1fc2Vxbm9faW5mbywgMH0sCiAJeyJpOTE1X2dlbV9mZW5jZV9yZWdzIiwg aTkxNV9nZW1fZmVuY2VfcmVnc19pbmZvLCAwfSwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4 IGQzNmZmY2RiYjg5YS4uNmI1ODNkYzJlYjFmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAg LTg3Niw3ICs4NzYsNiBAQCBzdGF0aWMgaW50IGk5MTVfZHJpdmVyX2luaXRfZWFybHkoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCXNwaW5fbG9ja19pbml0KCZkZXZfcHJpdi0+ dW5jb3JlLmxvY2spOwogCiAJc3Bpbl9sb2NrX2luaXQoJmRldl9wcml2LT5tbS5vYmplY3Rfc3Rh dF9sb2NrKTsKLQlzcGluX2xvY2tfaW5pdCgmZGV2X3ByaXYtPm1taW9fZmxpcF9sb2NrKTsKIAlt dXRleF9pbml0KCZkZXZfcHJpdi0+c2JfbG9jayk7CiAJbXV0ZXhfaW5pdCgmZGV2X3ByaXYtPm1v ZGVzZXRfcmVzdG9yZV9sb2NrKTsKIAltdXRleF9pbml0KCZkZXZfcHJpdi0+YXZfbXV0ZXgpOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggOWIwNTVkZWNhMzZkLi5hYWE4ZWQ1OTM1YWUgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjE0Niw5ICsyMTQ2LDYgQEAgc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgewogCS8qIHByb3RlY3RzIHRoZSBpcnEgbWFza3MgKi8KIAlzcGlubG9ja190 IGlycV9sb2NrOwogCi0JLyogcHJvdGVjdHMgdGhlIG1taW8gZmxpcCBkYXRhICovCi0Jc3Bpbmxv Y2tfdCBtbWlvX2ZsaXBfbG9jazsKLQogCWJvb2wgZGlzcGxheV9pcnFzX2VuYWJsZWQ7CiAKIAkv KiBUbyBjb250cm9sIHdha2V1cCBsYXRlbmN5LCBlLmcuIGZvciBpcnEtZHJpdmVuIGRwIGF1eCB0 cmFuc2ZlcnMuICovCkBAIC0yMjUzLDcgKzIyNTAsNiBAQCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSB7CiAKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqcGxhbmVfdG9fY3J0Y19tYXBwaW5nW0k5MTVfTUFY X1BJUEVTXTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqcGlwZV90b19jcnRjX21hcHBpbmdbSTkxNV9N QVhfUElQRVNdOwotCXdhaXRfcXVldWVfaGVhZF90IHBlbmRpbmdfZmxpcF9xdWV1ZTsKIAogI2lm ZGVmIENPTkZJR19ERUJVR19GUwogCXN0cnVjdCBpbnRlbF9waXBlX2NyYyBwaXBlX2NyY1tJOTE1 X01BWF9QSVBFU107CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBkNmY5YjRjYjZlOWIuLjFh ODg0MmYxNDNmYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC00OTM2LDggKzQ5MzYsNiBA QCBpOTE1X2dlbV9sb2FkX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CWluaXRfd2FpdHF1ZXVlX2hlYWQoJmRldl9wcml2LT5ncHVfZXJyb3Iud2FpdF9xdWV1ZSk7CiAJ aW5pdF93YWl0cXVldWVfaGVhZCgmZGV2X3ByaXYtPmdwdV9lcnJvci5yZXNldF9xdWV1ZSk7CiAK LQlpbml0X3dhaXRxdWV1ZV9oZWFkKCZkZXZfcHJpdi0+cGVuZGluZ19mbGlwX3F1ZXVlKTsKLQog CWF0b21pY19zZXQoJmRldl9wcml2LT5tbS5ic2RfZW5naW5lX2Rpc3BhdGNoX2luZGV4LCAwKTsK IAogCXNwaW5fbG9ja19pbml0KCZkZXZfcHJpdi0+ZmJfdHJhY2tpbmcubG9jayk7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggYmQwNDg4YTcyNTAzLi5jMTA5NjZlYmY2ZmMg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTQ5LDExICs0OSw2IEBACiAj aW5jbHVkZSA8bGludXgvZG1hX3JlbWFwcGluZy5oPgogI2luY2x1ZGUgPGxpbnV4L3Jlc2VydmF0 aW9uLmg+CiAKLXN0YXRpYyBib29sIGlzX21taW9fd29yayhzdHJ1Y3QgaW50ZWxfZmxpcF93b3Jr ICp3b3JrKQotewotCXJldHVybiB3b3JrLT5tbWlvX3dvcmsuZnVuYzsKLX0KLQogLyogUHJpbWFy eSBwbGFuZSBmb3JtYXRzIGZvciBnZW4gPD0gMyAqLwogc3RhdGljIGNvbnN0IHVpbnQzMl90IGk4 eHhfcHJpbWFyeV9mb3JtYXRzW10gPSB7CiAJRFJNX0ZPUk1BVF9DOCwKQEAgLTM1NjYsMzUgKzM1 NjEsNiBAQCB2b2lkIGludGVsX2ZpbmlzaF9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiAJY2xlYXJfYml0KEk5MTVfUkVTRVRfTU9ERVNFVCwgJmRldl9wcml2LT5ncHVf ZXJyb3IuZmxhZ3MpOwogfQogCi1zdGF0aWMgYm9vbCBhYm9ydF9mbGlwX29uX3Jlc2V0KHN0cnVj dCBpbnRlbF9jcnRjICpjcnRjKQotewotCXN0cnVjdCBpOTE1X2dwdV9lcnJvciAqZXJyb3IgPSAm dG9faTkxNShjcnRjLT5iYXNlLmRldiktPmdwdV9lcnJvcjsKLQotCWlmIChpOTE1X3Jlc2V0X2Jh Y2tvZmYoZXJyb3IpKQotCQlyZXR1cm4gdHJ1ZTsKLQotCWlmIChjcnRjLT5yZXNldF9jb3VudCAh PSBpOTE1X3Jlc2V0X2NvdW50KGVycm9yKSkKLQkJcmV0dXJuIHRydWU7Ci0KLQlyZXR1cm4gZmFs c2U7Ci19Ci0KLXN0YXRpYyBib29sIGludGVsX2NydGNfaGFzX3BlbmRpbmdfZmxpcChzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMpCi17Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsK LQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Ci0J Ym9vbCBwZW5kaW5nOwotCi0JaWYgKGFib3J0X2ZsaXBfb25fcmVzZXQoaW50ZWxfY3J0YykpCi0J CXJldHVybiBmYWxzZTsKLQotCXNwaW5fbG9ja19pcnEoJmRldi0+ZXZlbnRfbG9jayk7Ci0JcGVu ZGluZyA9IHRvX2ludGVsX2NydGMoY3J0YyktPmZsaXBfd29yayAhPSBOVUxMOwotCXNwaW5fdW5s b2NrX2lycSgmZGV2LT5ldmVudF9sb2NrKTsKLQotCXJldHVybiBwZW5kaW5nOwotfQotCiBzdGF0 aWMgdm9pZCBpbnRlbF91cGRhdGVfcGlwZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMs CiAJCQkJICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCiB7CkBA IC00MTcyLDU3ICs0MTM4LDYgQEAgYm9vbCBpbnRlbF9oYXNfcGVuZGluZ19mYl91bnBpbihzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJcmV0dXJuIGZhbHNlOwogfQogCi1zdGF0 aWMgdm9pZCBwYWdlX2ZsaXBfY29tcGxldGVkKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRj KQotewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoaW50ZWxf Y3J0Yy0+YmFzZS5kZXYpOwotCXN0cnVjdCBpbnRlbF9mbGlwX3dvcmsgKndvcmsgPSBpbnRlbF9j cnRjLT5mbGlwX3dvcms7Ci0KLQlpbnRlbF9jcnRjLT5mbGlwX3dvcmsgPSBOVUxMOwotCi0JaWYg KHdvcmstPmV2ZW50KQotCQlkcm1fY3J0Y19zZW5kX3ZibGFua19ldmVudCgmaW50ZWxfY3J0Yy0+ YmFzZSwgd29yay0+ZXZlbnQpOwotCi0JZHJtX2NydGNfdmJsYW5rX3B1dCgmaW50ZWxfY3J0Yy0+ YmFzZSk7Ci0KLQl3YWtlX3VwX2FsbCgmZGV2X3ByaXYtPnBlbmRpbmdfZmxpcF9xdWV1ZSk7Ci0J dHJhY2VfaTkxNV9mbGlwX2NvbXBsZXRlKGludGVsX2NydGMtPnBsYW5lLAotCQkJCSB3b3JrLT5w ZW5kaW5nX2ZsaXBfb2JqKTsKLQotCXF1ZXVlX3dvcmsoZGV2X3ByaXYtPndxLCAmd29yay0+dW5w aW5fd29yayk7Ci19Ci0KLXN0YXRpYyBpbnQgaW50ZWxfY3J0Y193YWl0X2Zvcl9wZW5kaW5nX2Zs aXBzKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKLXsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0g Y3J0Yy0+ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo ZGV2KTsKLQlsb25nIHJldDsKLQotCVdBUk5fT04od2FpdHF1ZXVlX2FjdGl2ZSgmZGV2X3ByaXYt PnBlbmRpbmdfZmxpcF9xdWV1ZSkpOwotCi0JcmV0ID0gd2FpdF9ldmVudF9pbnRlcnJ1cHRpYmxl X3RpbWVvdXQoCi0JCQkJCWRldl9wcml2LT5wZW5kaW5nX2ZsaXBfcXVldWUsCi0JCQkJCSFpbnRl bF9jcnRjX2hhc19wZW5kaW5nX2ZsaXAoY3J0YyksCi0JCQkJCTYwKkhaKTsKLQotCWlmIChyZXQg PCAwKQotCQlyZXR1cm4gcmV0OwotCi0JaWYgKHJldCA9PSAwKSB7Ci0JCXN0cnVjdCBpbnRlbF9j cnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKLQkJc3RydWN0IGludGVsX2Zs aXBfd29yayAqd29yazsKLQotCQlzcGluX2xvY2tfaXJxKCZkZXYtPmV2ZW50X2xvY2spOwotCQl3 b3JrID0gaW50ZWxfY3J0Yy0+ZmxpcF93b3JrOwotCQlpZiAod29yayAmJiAhaXNfbW1pb193b3Jr KHdvcmspKSB7Ci0JCQlXQVJOX09OQ0UoMSwgIlJlbW92aW5nIHN0dWNrIHBhZ2UgZmxpcFxuIik7 Ci0JCQlwYWdlX2ZsaXBfY29tcGxldGVkKGludGVsX2NydGMpOwotCQl9Ci0JCXNwaW5fdW5sb2Nr X2lycSgmZGV2LT5ldmVudF9sb2NrKTsKLQl9Ci0KLQlyZXR1cm4gMDsKLX0KLQogdm9pZCBscHRf ZGlzYWJsZV9pY2xraXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXUz MiB0ZW1wOwpAQCAtNTgyOSw4ICs1NzQ0LDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19kaXNh YmxlX25vYXRvbWljKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJcmV0dXJuOwogCiAJaWYgKGNy dGMtPnByaW1hcnktPnN0YXRlLT52aXNpYmxlKSB7Ci0JCVdBUk5fT04oaW50ZWxfY3J0Yy0+Zmxp cF93b3JrKTsKLQogCQlpbnRlbF9wcmVfZGlzYWJsZV9wcmltYXJ5X25vYXRvbWljKGNydGMpOwog CiAJCWludGVsX2NydGNfZGlzYWJsZV9wbGFuZXMoY3J0YywgMSA8PCBkcm1fcGxhbmVfaW5kZXgo Y3J0Yy0+cHJpbWFyeSkpOwpAQCAtMTAxMDMsMzUgKzEwMDE2LDExIEBAIHN0cnVjdCBkcm1fZGlz cGxheV9tb2RlICppbnRlbF9jcnRjX21vZGVfZ2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiBz dGF0aWMgdm9pZCBpbnRlbF9jcnRjX2Rlc3Ryb3koc3RydWN0IGRybV9jcnRjICpjcnRjKQogewog CXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKLQlz dHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwotCXN0cnVjdCBpbnRlbF9mbGlwX3dv cmsgKndvcms7Ci0KLQlzcGluX2xvY2tfaXJxKCZkZXYtPmV2ZW50X2xvY2spOwotCXdvcmsgPSBp bnRlbF9jcnRjLT5mbGlwX3dvcms7Ci0JaW50ZWxfY3J0Yy0+ZmxpcF93b3JrID0gTlVMTDsKLQlz cGluX3VubG9ja19pcnEoJmRldi0+ZXZlbnRfbG9jayk7Ci0KLQlpZiAod29yaykgewotCQljYW5j ZWxfd29ya19zeW5jKCZ3b3JrLT5tbWlvX3dvcmspOwotCQljYW5jZWxfd29ya19zeW5jKCZ3b3Jr LT51bnBpbl93b3JrKTsKLQkJa2ZyZWUod29yayk7Ci0JfQogCiAJZHJtX2NydGNfY2xlYW51cChj cnRjKTsKLQogCWtmcmVlKGludGVsX2NydGMpOwogfQogCi1zdGF0aWMgaW5saW5lIHZvaWQgaW50 ZWxfbWFya19wYWdlX2ZsaXBfYWN0aXZlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAotCQkJCQkg ICAgICAgc3RydWN0IGludGVsX2ZsaXBfd29yayAqd29yaykKLXsKLQl3b3JrLT5mbGlwX3F1ZXVl ZF92YmxhbmsgPSBpbnRlbF9jcnRjX2dldF92YmxhbmtfY291bnRlcihjcnRjKTsKLQotCS8qIEVu c3VyZSB0aGF0IHRoZSB3b3JrIGl0ZW0gaXMgY29uc2lzdGVudCB3aGVuIGFjdGl2YXRpbmcgaXQg Li4uICovCi0Jc21wX21iX19iZWZvcmVfYXRvbWljKCk7Ci0JYXRvbWljX3NldCgmd29yay0+cGVu ZGluZywgMSk7Ci19Ci0KIC8qKgogICogaW50ZWxfd21fbmVlZF91cGRhdGUgLSBDaGVjayB3aGV0 aGVyIHdhdGVybWFya3MgbmVlZCB1cGRhdGluZwogICogQHBsYW5lOiBkcm0gcGxhbmUKQEAgLTEx OTUwLDEwICsxMTgzOSw2IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX3ByZXBhcmVfY29tbWl0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWlmIChzdGF0ZS0+bGVnYWN5X2N1cnNvcl91cGRh dGUpCiAJCQljb250aW51ZTsKIAotCQlyZXQgPSBpbnRlbF9jcnRjX3dhaXRfZm9yX3BlbmRpbmdf ZmxpcHMoY3J0Yyk7Ci0JCWlmIChyZXQpCi0JCQlyZXR1cm4gcmV0OwotCiAJCWlmIChhdG9taWNf cmVhZCgmdG9faW50ZWxfY3J0YyhjcnRjKS0+dW5waW5fd29ya19jb3VudCkgPj0gMikKIAkJCWZs dXNoX3dvcmtxdWV1ZShkZXZfcHJpdi0+d3EpOwogCX0KQEAgLTEyNzU3LDcgKzEyNjQyLDcgQEAg c3RhdGljIHZvaWQgaW50ZWxfZmluaXNoX2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0 YywKIHsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0 Yyk7CiAKLQlpbnRlbF9waXBlX3VwZGF0ZV9lbmQoaW50ZWxfY3J0YywgTlVMTCk7CisJaW50ZWxf cGlwZV91cGRhdGVfZW5kKGludGVsX2NydGMpOwogfQogCiAvKioKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmgKaW5kZXggMDRmODBiMDEzZGI5Li45Y2I3ZTc4MWU4NjMgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oCkBAIC03OTcsNyArNzk3LDYgQEAgc3RydWN0IGludGVsX2NydGMgewogCXU4IHBs YW5lX2lkc19tYXNrOwogCXVuc2lnbmVkIGxvbmcgbG9uZyBlbmFibGVkX3Bvd2VyX2RvbWFpbnM7 CiAJc3RydWN0IGludGVsX292ZXJsYXkgKm92ZXJsYXk7Ci0Jc3RydWN0IGludGVsX2ZsaXBfd29y ayAqZmxpcF93b3JrOwogCiAJYXRvbWljX3QgdW5waW5fd29ya19jb3VudDsKIApAQCAtMTEzMiwy NCArMTEzMSw2IEBAIGludGVsX2dldF9jcnRjX2Zvcl9wbGFuZShzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsIGVudW0gcGxhbmUgcGxhbmUpCiAJcmV0dXJuIGRldl9wcml2LT5wbGFu ZV90b19jcnRjX21hcHBpbmdbcGxhbmVdOwogfQogCi1zdHJ1Y3QgaW50ZWxfZmxpcF93b3JrIHsK LQlzdHJ1Y3Qgd29ya19zdHJ1Y3QgdW5waW5fd29yazsKLQlzdHJ1Y3Qgd29ya19zdHJ1Y3QgbW1p b193b3JrOwotCi0Jc3RydWN0IGRybV9jcnRjICpjcnRjOwotCXN0cnVjdCBpOTE1X3ZtYSAqb2xk X3ZtYTsKLQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpvbGRfZmI7Ci0Jc3RydWN0IGRybV9pOTE1 X2dlbV9vYmplY3QgKnBlbmRpbmdfZmxpcF9vYmo7Ci0Jc3RydWN0IGRybV9wZW5kaW5nX3ZibGFu a19ldmVudCAqZXZlbnQ7Ci0JYXRvbWljX3QgcGVuZGluZzsKLQl1MzIgZmxpcF9jb3VudDsKLQl1 MzIgZ3R0X29mZnNldDsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKmZsaXBfcXVldWVk X3JlcTsKLQl1MzIgZmxpcF9xdWV1ZWRfdmJsYW5rOwotCXUzMiBmbGlwX3JlYWR5X3ZibGFuazsK LQl1bnNpZ25lZCBpbnQgcm90YXRpb247Ci19OwotCiBzdHJ1Y3QgaW50ZWxfbG9hZF9kZXRlY3Rf cGlwZSB7CiAJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnJlc3RvcmVfc3RhdGU7CiB9OwpAQCAt MTkwMyw3ICsxODg0LDcgQEAgc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9zcHJpdGVfcGxhbmVf Y3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIGludCBpbnRlbF9zcHJp dGVfc2V0X2NvbG9ya2V5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJCQkg ICAgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdik7CiB2b2lkIGludGVsX3BpcGVfdXBkYXRl X3N0YXJ0KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKTsKLXZvaWQgaW50ZWxfcGlwZV91cGRhdGVf ZW5kKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLCBzdHJ1Y3QgaW50ZWxfZmxpcF93b3JrICp3b3Jr KTsKK3ZvaWQgaW50ZWxfcGlwZV91cGRhdGVfZW5kKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKTsK IAogLyogaW50ZWxfdHYuYyAqLwogdm9pZCBpbnRlbF90dl9pbml0KHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IDk0 ZjlhMTMzMmRiZi4uOGUyNTY5NGExNTA4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUu YwpAQCAtMTc2LDcgKzE3Niw3IEBAIHZvaWQgaW50ZWxfcGlwZV91cGRhdGVfc3RhcnQoc3RydWN0 IGludGVsX2NydGMgKmNydGMpCiAgKiByZS1lbmFibGVzIGludGVycnVwdHMgYW5kIHZlcmlmaWVz IHRoZSB1cGRhdGUgd2FzIGFjdHVhbGx5IGNvbXBsZXRlZAogICogYmVmb3JlIGEgdmJsYW5rIHVz aW5nIHRoZSB2YWx1ZSBvZiBAc3RhcnRfdmJsX2NvdW50LgogICovCi12b2lkIGludGVsX3BpcGVf dXBkYXRlX2VuZChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0Yywgc3RydWN0IGludGVsX2ZsaXBfd29y ayAqd29yaykKK3ZvaWQgaW50ZWxfcGlwZV91cGRhdGVfZW5kKHN0cnVjdCBpbnRlbF9jcnRjICpj cnRjKQogewogCWVudW0gcGlwZSBwaXBlID0gY3J0Yy0+cGlwZTsKIAlpbnQgc2NhbmxpbmVfZW5k ID0gaW50ZWxfZ2V0X2NydGNfc2NhbmxpbmUoY3J0Yyk7CkBAIC0xODQsMTIgKzE4NCw2IEBAIHZv aWQgaW50ZWxfcGlwZV91cGRhdGVfZW5kKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLCBzdHJ1Y3Qg aW50ZWxfZmxpcF93b3JrICp3b3JrCiAJa3RpbWVfdCBlbmRfdmJsX3RpbWUgPSBrdGltZV9nZXQo KTsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmJh c2UuZGV2KTsKIAotCWlmICh3b3JrKSB7Ci0JCXdvcmstPmZsaXBfcXVldWVkX3ZibGFuayA9IGVu ZF92YmxfY291bnQ7Ci0JCXNtcF9tYl9fYmVmb3JlX2F0b21pYygpOwotCQlhdG9taWNfc2V0KCZ3 b3JrLT5wZW5kaW5nLCAxKTsKLQl9Ci0KIAl0cmFjZV9pOTE1X3BpcGVfdXBkYXRlX2VuZChjcnRj LCBlbmRfdmJsX2NvdW50LCBzY2FubGluZV9lbmQpOwogCiAJLyogV2UncmUgc3RpbGwgaW4gdGhl IHZibGFuay1ldmFkZSBjcml0aWNhbCBzZWN0aW9uLCB0aGlzIGNhbid0IHJhY2UuCi0tIAoyLjEz LjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=