From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 12/18] drm/i915: Unify request submission Date: Wed, 20 Jul 2016 14:12:04 +0100 Message-ID: <1469020330-1071-13-git-send-email-chris@chris-wilson.co.uk> References: <1469020330-1071-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id BD4306E807 for ; Wed, 20 Jul 2016 13:12:38 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id q128so7025669wma.1 for ; Wed, 20 Jul 2016 06:12:38 -0700 (PDT) In-Reply-To: <1469020330-1071-1-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org TW92ZSByZXF1ZXN0IHN1Ym1pc3Npb24gZnJvbSBlbWl0X3JlcXVlc3QgaW50byBpdHMgb3duIGNv bW1vbiB2ZnVuYwpmcm9tIGk5MTVfYWRkX3JlcXVlc3QoKS4KClNpZ25lZC1vZmYtYnk6IENocmlz IFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX3JlcXVlc3QuYyAgICB8ICA3ICsrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyB8ICA5ICsrKysrKy0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZ3VjLmggICAgICAgICAgIHwgIDEgLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfbHJjLmMgICAgICAgICAgIHwgMTAgKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcmluZ2J1ZmZlci5jICAgIHwgMjYgKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCAgICB8IDIzICsrKysrKysr KysrLS0tLS0tLS0tLS0tCiA2IGZpbGVzIGNoYW5nZWQsIDMzIGluc2VydGlvbnMoKyksIDQzIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3Jl cXVlc3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYwppbmRleCA0 MDhmMzkwYTRjOTguLjNlNjMzYjQ3MjEzYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fcmVxdWVzdC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X3JlcXVlc3QuYwpAQCAtNDY5LDEyICs0NjksMTAgQEAgdm9pZCBfX2k5MTVfYWRkX3JlcXVlc3Qo c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0LAogCSAqLwogCXJlcXVlc3QtPnBv c3RmaXggPSBpbnRlbF9yaW5nX2dldF90YWlsKHJpbmcpOwogCi0JaWYgKGk5MTUuZW5hYmxlX2V4 ZWNsaXN0cykKLQkJcmV0ID0gZW5naW5lLT5lbWl0X3JlcXVlc3QocmVxdWVzdCk7Ci0JZWxzZQot CQlyZXQgPSBlbmdpbmUtPmFkZF9yZXF1ZXN0KHJlcXVlc3QpOwogCS8qIE5vdCBhbGxvd2VkIHRv IGZhaWwhICovCisJcmV0ID0gZW5naW5lLT5lbWl0X3JlcXVlc3QocmVxdWVzdCk7CiAJV0FSTihy ZXQsICJlbWl0fGFkZF9yZXF1ZXN0IGZhaWxlZDogJWQhXG4iLCByZXQpOworCiAJLyogU2FuaXR5 IGNoZWNrIHRoYXQgdGhlIHJlc2VydmVkIHNpemUgd2FzIGxhcmdlIGVub3VnaC4gKi8KIAlyZXQg PSBpbnRlbF9yaW5nX2dldF90YWlsKHJpbmcpIC0gcmVxdWVzdF9zdGFydDsKIAlpZiAocmV0IDwg MCkKQEAgLTQ4NSw2ICs0ODMsNyBAQCB2b2lkIF9faTkxNV9hZGRfcmVxdWVzdChzdHJ1Y3QgZHJt X2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QsCiAJCSAgcmVzZXJ2ZWRfdGFpbCwgcmV0KTsKIAog CWk5MTVfZ2VtX21hcmtfYnVzeShlbmdpbmUpOworCWVuZ2luZS0+c3VibWl0X3JlcXVlc3QocmVx dWVzdCk7CiB9CiAKIHN0YXRpYyB1bnNpZ25lZCBsb25nIGxvY2FsX2Nsb2NrX3VzKHVuc2lnbmVk IGludCAqY3B1KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3Vi bWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmlu ZGV4IGVjY2QzNDgzMmZlNi4uMzJkMGUxODkwOTUwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9ndWNfc3VibWlzc2lvbi5jCkBAIC01ODUsNyArNTg1LDcgQEAgc3RhdGljIGludCBndWNf cmluZ19kb29yYmVsbChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYykKICAqIFRoZSBvbmx5IGVy cm9yIGhlcmUgYXJpc2VzIGlmIHRoZSBkb29yYmVsbCBoYXJkd2FyZSBpc24ndCBmdW5jdGlvbmlu ZwogICogYXMgZXhwZWN0ZWQsIHdoaWNoIHJlYWxseSBzaG91bG4ndCBoYXBwZW4uCiAgKi8KLWlu dCBpOTE1X2d1Y19zdWJtaXQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSkKK3N0YXRp YyB2b2lkIGk5MTVfZ3VjX3N1Ym1pdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxKQog ewogCXVuc2lnbmVkIGludCBlbmdpbmVfaWQgPSBycS0+ZW5naW5lLT5pZDsKIAlzdHJ1Y3QgaW50 ZWxfZ3VjICpndWMgPSAmcnEtPmk5MTUtPmd1YzsKQEAgLTYwMiw4ICs2MDIsNiBAQCBpbnQgaTkx NV9ndWNfc3VibWl0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEpCiAKIAlndWMtPnN1 Ym1pc3Npb25zW2VuZ2luZV9pZF0gKz0gMTsKIAlndWMtPmxhc3Rfc2Vxbm9bZW5naW5lX2lkXSA9 IHJxLT5mZW5jZS5zZXFubzsKLQotCXJldHVybiBiX3JldDsKIH0KIAogLyoKQEAgLTk5Miw2ICs5 OTAsNyBAQCBpbnQgaTkxNV9ndWNfc3VibWlzc2lvbl9lbmFibGUoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogewogCXN0cnVjdCBpbnRlbF9ndWMgKmd1YyA9ICZkZXZfcHJpdi0+ Z3VjOwogCXN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudDsKKwlzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICplbmdpbmU7CiAKIAkvKiBjbGllbnQgZm9yIGV4ZWNidWYgc3VibWlzc2lvbiAqLwog CWNsaWVudCA9IGd1Y19jbGllbnRfYWxsb2MoZGV2X3ByaXYsCkBAIC0xMDA2LDYgKzEwMDUsMTAg QEAgaW50IGk5MTVfZ3VjX3N1Ym1pc3Npb25fZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIAlob3N0Mmd1Y19zYW1wbGVfZm9yY2V3YWtlKGd1YywgY2xpZW50KTsKIAln dWNfaW5pdF9kb29yYmVsbF9odyhndWMpOwogCisJLyogVGFrZSBvdmVyIGZyb20gbWFudWFsIGNv bnRyb2wgb2YgRUxTUCAoZXhlY2xpc3RzKSAqLworCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRl dl9wcml2KQorCQllbmdpbmUtPnN1Ym1pdF9yZXF1ZXN0ID0gaTkxNV9ndWNfc3VibWl0OworCiAJ cmV0dXJuIDA7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Yy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKaW5kZXggM2UzZTc0Mzc0MGMw Li42MjNjZjI2Y2Q3ODQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCkBAIC0xNjAsNyArMTYw LDYgQEAgZXh0ZXJuIGludCBpbnRlbF9ndWNfcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp OwogaW50IGk5MTVfZ3VjX3N1Ym1pc3Npb25faW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpOwogaW50IGk5MTVfZ3VjX3N1Ym1pc3Npb25fZW5hYmxlKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdik7CiBpbnQgaTkxNV9ndWNfd3FfY2hlY2tfc3BhY2Uoc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSk7Ci1pbnQgaTkxNV9ndWNfc3VibWl0KHN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCAqcnEpOwogdm9pZCBpOTE1X2d1Y19zdWJtaXNzaW9uX2Rpc2Fi bGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaTkxNV9ndWNfc3Vi bWlzc2lvbl9maW5pKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiAKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggZDE3YTE5M2U4ZWFmLi41MmVkYmNjOWJjYTAgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC03NzMsMTIgKzc3Myw2IEBAIGludGVsX2xvZ2ljYWxf cmluZ19hZHZhbmNlX2FuZF9zdWJtaXQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1 ZXN0KQogCSAqLwogCXJlcXVlc3QtPnByZXZpb3VzX2NvbnRleHQgPSBlbmdpbmUtPmxhc3RfY29u dGV4dDsKIAllbmdpbmUtPmxhc3RfY29udGV4dCA9IHJlcXVlc3QtPmN0eDsKLQotCWlmIChpOTE1 LmVuYWJsZV9ndWNfc3VibWlzc2lvbikKLQkJaTkxNV9ndWNfc3VibWl0KHJlcXVlc3QpOwotCWVs c2UKLQkJZXhlY2xpc3RzX2NvbnRleHRfcXVldWUocmVxdWVzdCk7Ci0KIAlyZXR1cm4gMDsKIH0K IApAQCAtMTkwNCw4ICsxODk4LDEwIEBAIGxvZ2ljYWxfcmluZ19kZWZhdWx0X3ZmdW5jcyhzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CiAJLyogRGVmYXVsdCB2ZnVuY3Mgd2hpY2gg Y2FuIGJlIG92ZXJyaWRlbiBieSBlYWNoIGVuZ2luZS4gKi8KIAllbmdpbmUtPmluaXRfaHcgPSBn ZW44X2luaXRfY29tbW9uX3Jpbmc7Ci0JZW5naW5lLT5lbWl0X3JlcXVlc3QgPSBnZW44X2VtaXRf cmVxdWVzdDsKIAllbmdpbmUtPmVtaXRfZmx1c2ggPSBnZW44X2VtaXRfZmx1c2g7CisJZW5naW5l LT5lbWl0X3JlcXVlc3QgPSBnZW44X2VtaXRfcmVxdWVzdDsKKwllbmdpbmUtPnN1Ym1pdF9yZXF1 ZXN0ID0gZXhlY2xpc3RzX2NvbnRleHRfcXVldWU7CisKIAllbmdpbmUtPmlycV9lbmFibGUgPSBn ZW44X2xvZ2ljYWxfcmluZ19lbmFibGVfaXJxOwogCWVuZ2luZS0+aXJxX2Rpc2FibGUgPSBnZW44 X2xvZ2ljYWxfcmluZ19kaXNhYmxlX2lycTsKIAllbmdpbmUtPmVtaXRfYmJfc3RhcnQgPSBnZW44 X2VtaXRfYmJfc3RhcnQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5k ZXggNDNkZmE0YmUxY2ZkLi45MDdkOTMzZDYyYWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmMKQEAgLTE0MjcsMTUgKzE0MjcsMTQgQEAgc3RhdGljIGludCBnZW42X3Np Z25hbChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnNpZ25hbGxlcl9yZXEsCiB9CiAKIC8q KgotICogZ2VuNl9hZGRfcmVxdWVzdCAtIFVwZGF0ZSB0aGUgc2VtYXBob3JlIG1haWxib3ggcmVn aXN0ZXJzCisgKiBnZW42X2VtaXRfcmVxdWVzdCAtIFVwZGF0ZSB0aGUgc2VtYXBob3JlIG1haWxi b3ggcmVnaXN0ZXJzCiAgKgogICogQHJlcXVlc3QgLSByZXF1ZXN0IHRvIHdyaXRlIHRvIHRoZSBy aW5nCiAgKgogICogVXBkYXRlIHRoZSBtYWlsYm94IHJlZ2lzdGVycyBpbiB0aGUgKm90aGVyKiBy aW5ncyB3aXRoIHRoZSBjdXJyZW50IHNlcW5vLgogICogVGhpcyBhY3RzIGxpa2UgYSBzaWduYWwg aW4gdGhlIGNhbm9uaWNhbCBzZW1hcGhvcmUuCiAgKi8KLXN0YXRpYyBpbnQKLWdlbjZfYWRkX3Jl cXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCitzdGF0aWMgaW50IGdlbjZf ZW1pdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogewogCXN0cnVj dCBpbnRlbF9yaW5nICpyaW5nID0gcmVxLT5yaW5nOwogCWludCByZXQ7CkBAIC0xNDU2LDEzICsx NDU1LDEwIEBAIGdlbjZfYWRkX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpy ZXEpCiAKIAlyZXEtPnRhaWwgPSBpbnRlbF9yaW5nX2dldF90YWlsKHJpbmcpOwogCi0JcmVxLT5l bmdpbmUtPnN1Ym1pdF9yZXF1ZXN0KHJlcSk7Ci0KIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGlu dAotZ2VuOF9yZW5kZXJfYWRkX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpy ZXEpCitzdGF0aWMgaW50IGdlbjhfcmVuZGVyX2VtaXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcSkKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUgPSBy ZXEtPmVuZ2luZTsKIAlzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZyA9IHJlcS0+cmluZzsKQEAgLTE0 ODYsOCArMTQ4Miw5IEBAIGdlbjhfcmVuZGVyX2FkZF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxKQogCWludGVsX3JpbmdfZW1pdChyaW5nLCAwKTsKIAlpbnRlbF9yaW5n X2VtaXQocmluZywgTUlfVVNFUl9JTlRFUlJVUFQpOwogCWludGVsX3JpbmdfZW1pdChyaW5nLCBN SV9OT09QKTsKKwlpbnRlbF9yaW5nX2FkdmFuY2UocmluZyk7CiAKLQlyZXEtPmVuZ2luZS0+c3Vi bWl0X3JlcXVlc3QocmVxKTsKKwlyZXEtPnRhaWwgPSBpbnRlbF9yaW5nX2dldF90YWlsKHJpbmcp OwogCiAJcmV0dXJuIDA7CiB9CkBAIC0xNjkyLDggKzE2ODksNyBAQCBic2RfcmluZ19mbHVzaChz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGlj IGludAotaTl4eF9hZGRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkK K3N0YXRpYyBpbnQgaTl4eF9lbWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpyZXEpCiB7CiAJc3RydWN0IGludGVsX3JpbmcgKnJpbmcgPSByZXEtPnJpbmc7CiAJaW50IHJl dDsKQEAgLTE3MTAsOCArMTcwNiw2IEBAIGk5eHhfYWRkX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXEpCiAKIAlyZXEtPnRhaWwgPSBpbnRlbF9yaW5nX2dldF90YWlsKHJp bmcpOwogCi0JcmVxLT5lbmdpbmUtPnN1Ym1pdF9yZXF1ZXN0KHJlcSk7Ci0KIAlyZXR1cm4gMDsK IH0KIApAQCAtMjgxMywxMSArMjgwNywxMSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9yaW5nX2RlZmF1 bHRfdmZ1bmNzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkgICAgICBz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CiAJZW5naW5lLT5pbml0X2h3ID0gaW5p dF9yaW5nX2NvbW1vbjsKLQllbmdpbmUtPnN1Ym1pdF9yZXF1ZXN0ID0gaTl4eF9zdWJtaXRfcmVx dWVzdDsKIAotCWVuZ2luZS0+YWRkX3JlcXVlc3QgPSBpOXh4X2FkZF9yZXF1ZXN0OworCWVuZ2lu ZS0+ZW1pdF9yZXF1ZXN0ID0gaTl4eF9lbWl0X3JlcXVlc3Q7CiAJaWYgKElOVEVMX0dFTihkZXZf cHJpdikgPj0gNikKLQkJZW5naW5lLT5hZGRfcmVxdWVzdCA9IGdlbjZfYWRkX3JlcXVlc3Q7CisJ CWVuZ2luZS0+ZW1pdF9yZXF1ZXN0ID0gZ2VuNl9lbWl0X3JlcXVlc3Q7CisJZW5naW5lLT5zdWJt aXRfcmVxdWVzdCA9IGk5eHhfc3VibWl0X3JlcXVlc3Q7CiAKIAlpZiAoSU5URUxfR0VOKGRldl9w cml2KSA+PSA4KQogCQllbmdpbmUtPmVtaXRfYmJfc3RhcnQgPSBnZW44X2VtaXRfYmJfc3RhcnQ7 CkBAIC0yODQ2LDcgKzI4NDAsNyBAQCBpbnQgaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIo c3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCiAJaWYgKElOVEVMX0dFTihkZXZfcHJp dikgPj0gOCkgewogCQllbmdpbmUtPmluaXRfY29udGV4dCA9IGludGVsX3Jjc19jdHhfaW5pdDsK LQkJZW5naW5lLT5hZGRfcmVxdWVzdCA9IGdlbjhfcmVuZGVyX2FkZF9yZXF1ZXN0OworCQllbmdp bmUtPmVtaXRfcmVxdWVzdCA9IGdlbjhfcmVuZGVyX2VtaXRfcmVxdWVzdDsKIAkJZW5naW5lLT5l bWl0X2ZsdXNoID0gZ2VuOF9yZW5kZXJfcmluZ19mbHVzaDsKIAkJaWYgKGk5MTUuc2VtYXBob3Jl cykKIAkJCWVuZ2luZS0+c2VtYXBob3JlLnNpZ25hbCA9IGdlbjhfcmNzX3NpZ25hbDsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCAxYTM4YzM4MzMyN2UuLjg1NmI3 MzJkZGJiZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtMjA0 LDcgKzIwNCwxNyBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsKIAogCWludAkJKCppbml0X2Nv bnRleHQpKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKTsKIAotCWludAkJKCphZGRf cmVxdWVzdCkoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpOworCWludAkJKCplbWl0 X2ZsdXNoKShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QsCisJCQkJICAgICAg dTMyIGludmFsaWRhdGVfZG9tYWlucywKKwkJCQkgICAgICB1MzIgZmx1c2hfZG9tYWlucyk7CisJ aW50CQkoKmVtaXRfYmJfc3RhcnQpKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAor CQkJCQkgdTY0IG9mZnNldCwgdTMyIGxlbmd0aCwKKwkJCQkJIHVuc2lnbmVkIGludCBkaXNwYXRj aF9mbGFncyk7CisjZGVmaW5lIEk5MTVfRElTUEFUQ0hfU0VDVVJFIDB4MQorI2RlZmluZSBJOTE1 X0RJU1BBVENIX1BJTk5FRCAweDIKKyNkZWZpbmUgSTkxNV9ESVNQQVRDSF9SUyAgICAgMHg0CisJ aW50CQkoKmVtaXRfcmVxdWVzdCkoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwor CXZvaWQJCSgqc3VibWl0X3JlcXVlc3QpKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx KTsKIAkvKiBTb21lIGNoaXBzZXRzIGFyZSBub3QgcXVpdGUgYXMgY29oZXJlbnQgYXMgYWR2ZXJ0 aXNlZCBhbmQgbmVlZAogCSAqIGFuIGV4cGVuc2l2ZSBraWNrIHRvIGZvcmNlIGEgdHJ1ZSByZWFk IG9mIHRoZSB1cC10by1kYXRlIHNlcW5vLgogCSAqIEhvd2V2ZXIsIHRoZSB1cC10by1kYXRlIHNl cW5vIGlzIG5vdCBhbHdheXMgcmVxdWlyZWQgYW5kIHRoZSBsYXN0CkBAIC0yODIsMTcgKzI5Miw2 IEBAIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgewogCXVuc2lnbmVkIGludCBpZGxlX2xpdGVfcmVz dG9yZV93YTsKIAlib29sIGRpc2FibGVfbGl0ZV9yZXN0b3JlX3dhOwogCXUzMiBjdHhfZGVzY190 ZW1wbGF0ZTsKLQlpbnQJCSgqZW1pdF9yZXF1ZXN0KShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVl c3QgKnJlcXVlc3QpOwotCWludAkJKCplbWl0X2ZsdXNoKShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcXVlc3QsCi0JCQkJICAgICAgdTMyIGludmFsaWRhdGVfZG9tYWlucywKLQkJCQkg ICAgICB1MzIgZmx1c2hfZG9tYWlucyk7Ci0JaW50CQkoKmVtaXRfYmJfc3RhcnQpKHN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAotCQkJCQkgdTY0IG9mZnNldCwgdTMyIGxlbmd0aCwK LQkJCQkJIHVuc2lnbmVkIGludCBkaXNwYXRjaF9mbGFncyk7Ci0jZGVmaW5lIEk5MTVfRElTUEFU Q0hfU0VDVVJFIDB4MQotI2RlZmluZSBJOTE1X0RJU1BBVENIX1BJTk5FRCAweDIKLSNkZWZpbmUg STkxNV9ESVNQQVRDSF9SUyAgICAgMHg0Ci0Jdm9pZAkJKCpzdWJtaXRfcmVxdWVzdCkoc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwogCiAJLyoqCiAJICogTGlzdCBvZiBvYmplY3Rz IGN1cnJlbnRseSBpbnZvbHZlZCBpbiByZW5kZXJpbmcgZnJvbSB0aGUKLS0gCjIuOC4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK