From: John.C.Harrison@Intel.com Subject: [PATCH] drm/i915: Reserve space improvements Date: Mon, 29 Jun 2015 17:36:58 +0100 Message-ID: <1435595818-26467-1-git-send-email-John.C.Harrison@Intel.com> References: <1435165408-15470-1-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 210C26E927 for ; Mon, 29 Jun 2015 09:37:01 -0700 (PDT) In-Reply-To: <1435165408-15470-1-git-send-email-John.C.Harrison@Intel.com> 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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCkFuIGVhcmxp ZXIgcGF0Y2ggd2FzIGFkZGVkIHRvIHJlc2VydmUgc3BhY2UgaW4gdGhlIHJpbmcgYnVmZmVyIGZv ciB0aGUKY29tbWFuZHMgaXNzdWVkIGR1cmluZyAnYWRkX3JlcXVlc3QoKScuIFRoZSBpbml0aWFs IHZlcnNpb24gd2FzCnBlc3NpbWlzdGljIGluIHRoZSB3YXkgaXQgaGFuZGxlZCBidWZmZXIgd3Jh cHBpbmcgYW5kIHdvdWxkIGNhdXNlCnByZW1hdHVyZSB3cmFwcyBhbmQgdGh1cyB3YXN0ZSByaW5n IHNwYWNlLgoKVGhpcyBwYXRjaCB1cGRhdGVzIHRoZSBjb2RlIHRvIGJldHRlciBoYW5kbGUgdGhl IHdyYXAgY2FzZS4gSXQgbm8KbG9uZ2VyIGVuZm9yY2VzIHRoYXQgdGhlIHNwYWNlIGJlaW5nIGFz a2VkIGZvciBhbmQgdGhlIHJlc2VydmVkIHNwYWNlCmFyZSBhIHNpbmdsZSBjb250aWd1b3VzIGJs b2NrLiBJbnN0ZWFkLCBpdCBhbGxvd3MgdGhlIHJlc2VydmUgdG8gYmUgb24KdGhlIGZhciBlbmQg b2YgYSB3cmFwIG9wZXJhdGlvbi4gSXQgc3RpbGwgZ3VhcmFudGVlcyB0aGF0IHRoZSBzcGFjZSBp cwphdmFpbGFibGUgc28gd2hlbiB0aGUgd3JhcCBvY2N1cnMsIG5vIHdhaXQgd2lsbCBoYXBwZW4u IFRodXMgdGhlIHdyYXAKY2Fubm90IGZhaWwgd2hpY2ggaXMgdGhlIHdob2xlIHBvaW50IG9mIHRo ZSBleGVyY2lzZS4KCkFsc28gZml4ZWQgYSBtZXJnZSBmYWlsdXJlIHdpdGggc29tZSBjb21tZW50 cyBmcm9tIHRoZSBvcmlnaW5hbCBwYXRjaC4KCnYyOiBJbmNvcnBvcmF0ZWQgc3VnZ2VzdGlvbiBi eSBEYXZpZCBHb3Jkb24gdG8gbW92ZSB0aGUgd3JhcCBjb2RlCmluc2lkZSB0aGUgcHJlcGFyZSBm dW5jdGlvbiBhbmQgdGh1cyBhbGxvdyBhIHNpbmdsZSBjb21iaW5lZAp3YWl0X2Zvcl9zcGFjZSgp IGNhbGwgcmF0aGVyIHRoYW4gZG9pbmcgb25lIGJlZm9yZSB0aGUgd3JhcCBhbmQKYW5vdGhlciBh ZnRlci4gVGhpcyBhbHNvIG1ha2VzIHRoZSBwcmVwYXJlIGNvZGUgbXVjaCBzaW1wbGVyIGFuZApl YXNpZXIgdG8gZm9sbG93LgoKRm9yOiBWSVotNTExNQpDQzogRGFuaWVsIFZldHRlciA8ZGFuaWVs QGZmd2xsLmNoPgpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25A SW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICB8 IDcyICsrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmMgfCA4OSArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCB8ICA0ICstCiAzIGZpbGVzIGNo YW5nZWQsIDg4IGluc2VydGlvbnMoKyksIDc3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHJjLmMKaW5kZXggYjM2ZTA2NC4uYTQxOTM2YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJj LmMKQEAgLTY2MywxMiArNjYzLDEyIEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX3dhaXRfZm9y X3NwYWNlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCXVuc2lnbmVkIHNwYWNl OwogCWludCByZXQ7CiAKLQkvKiBUaGUgd2hvbGUgcG9pbnQgb2YgcmVzZXJ2aW5nIHNwYWNlIGlz IHRvIG5vdCB3YWl0ISAqLwotCVdBUk5fT04ocmluZ2J1Zi0+cmVzZXJ2ZWRfaW5fdXNlKTsKLQog CWlmIChpbnRlbF9yaW5nX3NwYWNlKHJpbmdidWYpID49IGJ5dGVzKQogCQlyZXR1cm4gMDsKIAor CS8qIFRoZSB3aG9sZSBwb2ludCBvZiByZXNlcnZpbmcgc3BhY2UgaXMgdG8gbm90IHdhaXQhICov CisJV0FSTl9PTihyaW5nYnVmLT5yZXNlcnZlZF9pbl91c2UpOworCiAJbGlzdF9mb3JfZWFjaF9l bnRyeSh0YXJnZXQsICZyaW5nLT5yZXF1ZXN0X2xpc3QsIGxpc3QpIHsKIAkJLyoKIAkJICogVGhl IHJlcXVlc3QgcXVldWUgaXMgcGVyLWVuZ2luZSwgc28gY2FuIGNvbnRhaW4gcmVxdWVzdHMKQEAg LTcxOCwyMiArNzE4LDExIEBAIGludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlX2FuZF9zdWJtaXQo c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogCWV4ZWNsaXN0c19jb250ZXh0 X3F1ZXVlKHJlcXVlc3QpOwogfQogCi1zdGF0aWMgaW50IGxvZ2ljYWxfcmluZ193cmFwX2J1ZmZl cihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKK3N0YXRpYyB2b2lkIF9fd3JhcF9y aW5nX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKIHsKLQlzdHJ1Y3Qg aW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9IHJlcS0+cmluZ2J1ZjsKIAl1aW50MzJfdCBfX2lv bWVtICp2aXJ0OwogCWludCByZW0gPSByaW5nYnVmLT5zaXplIC0gcmluZ2J1Zi0+dGFpbDsKIAot CS8qIENhbid0IHdyYXAgaWYgc3BhY2UgaGFzIGFscmVhZHkgYmVlbiByZXNlcnZlZCEgKi8KLQlX QVJOX09OKHJpbmdidWYtPnJlc2VydmVkX2luX3VzZSk7Ci0KLQlpZiAocmluZ2J1Zi0+c3BhY2Ug PCByZW0pIHsKLQkJaW50IHJldCA9IGxvZ2ljYWxfcmluZ193YWl0X2Zvcl9zcGFjZShyZXEsIHJl bSk7Ci0KLQkJaWYgKHJldCkKLQkJCXJldHVybiByZXQ7Ci0JfQotCiAJdmlydCA9IHJpbmdidWYt PnZpcnR1YWxfc3RhcnQgKyByaW5nYnVmLT50YWlsOwogCXJlbSAvPSA0OwogCXdoaWxlIChyZW0t LSkKQEAgLTc0MSw0MCArNzMwLDQ5IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX3dyYXBfYnVm ZmVyKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogCiAJcmluZ2J1Zi0+dGFpbCA9 IDA7CiAJaW50ZWxfcmluZ191cGRhdGVfc3BhY2UocmluZ2J1Zik7Ci0KLQlyZXR1cm4gMDsKIH0K IAogc3RhdGljIGludCBsb2dpY2FsX3JpbmdfcHJlcGFyZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcSwgaW50IGJ5dGVzKQogewogCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5n YnVmID0gcmVxLT5yaW5nYnVmOwotCWludCByZXQ7Ci0KLQkvKgotCSAqIEFkZCBvbiB0aGUgcmVz ZXJ2ZWQgc2l6ZSB0byB0aGUgcmVxdWVzdCB0byBtYWtlIHN1cmUgdGhhdCBhZnRlcgotCSAqIHRo ZSBpbnRlbmRlZCBjb21tYW5kcyBoYXZlIGJlZW4gZW1pdHRlZCwgdGhlcmUgaXMgZ3VhcmFudGVl ZCB0bwotCSAqIHN0aWxsIGJlIGVub3VnaCBmcmVlIHNwYWNlIHRvIHNlbmQgdGhlbSB0byB0aGUg aGFyZHdhcmUuCi0JICovCi0JaWYgKCFyaW5nYnVmLT5yZXNlcnZlZF9pbl91c2UpCi0JCWJ5dGVz ICs9IHJpbmdidWYtPnJlc2VydmVkX3NpemU7Ci0KLQlpZiAodW5saWtlbHkocmluZ2J1Zi0+dGFp bCArIGJ5dGVzID4gcmluZ2J1Zi0+ZWZmZWN0aXZlX3NpemUpKSB7Ci0JCXJldCA9IGxvZ2ljYWxf cmluZ193cmFwX2J1ZmZlcihyZXEpOwotCQlpZiAodW5saWtlbHkocmV0KSkKLQkJCXJldHVybiBy ZXQ7CisJaW50IHJlbWFpbiA9IHJpbmdidWYtPmVmZmVjdGl2ZV9zaXplIC0gcmluZ2J1Zi0+dGFp bDsKKwlpbnQgcmV0LCB0b3RhbF9ieXRlcywgd2FpdF9ieXRlcyA9IDA7CisJYm9vbCBuZWVkX3dy YXAgPSBmYWxzZTsKIAotCQlpZihyaW5nYnVmLT5yZXNlcnZlZF9zaXplKSB7Ci0JCQl1aW50MzJf dCBzaXplID0gcmluZ2J1Zi0+cmVzZXJ2ZWRfc2l6ZTsKKwlpZiAocmluZ2J1Zi0+cmVzZXJ2ZWRf aW5fdXNlKQorCQl0b3RhbF9ieXRlcyA9IGJ5dGVzOworCWVsc2UKKwkJdG90YWxfYnl0ZXMgPSBi eXRlcyArIHJpbmdidWYtPnJlc2VydmVkX3NpemU7CiAKLQkJCWludGVsX3JpbmdfcmVzZXJ2ZWRf c3BhY2VfY2FuY2VsKHJpbmdidWYpOwotCQkJaW50ZWxfcmluZ19yZXNlcnZlZF9zcGFjZV9yZXNl cnZlKHJpbmdidWYsIHNpemUpOworCWlmICh1bmxpa2VseShieXRlcyA+IHJlbWFpbikpIHsKKwkJ LyoKKwkJICogTm90IGVub3VnaCBzcGFjZSBmb3IgdGhlIGJhc2ljIHJlcXVlc3QuIFNvIG5lZWQg dG8gZmx1c2gKKwkJICogb3V0IHRoZSByZW1haW5kZXIgYW5kIHRoZW4gd2FpdCBmb3IgYmFzZSAr IHJlc2VydmVkLgorCQkgKi8KKwkJd2FpdF9ieXRlcyA9IHJlbWFpbiArIHRvdGFsX2J5dGVzOwor CQluZWVkX3dyYXAgPSB0cnVlOworCX0gZWxzZSB7CisJCWlmICh1bmxpa2VseSh0b3RhbF9ieXRl cyA+IHJlbWFpbikpIHsKKwkJCS8qCisJCQkgKiBUaGUgYmFzZSByZXF1ZXN0IHdpbGwgZml0IGJ1 dCB0aGUgcmVzZXJ2ZWQgc3BhY2UKKwkJCSAqIGZhbGxzIG9mZiB0aGUgZW5kLiBTbyBvbmx5IG5l ZWQgdG8gdG8gd2FpdCBmb3IgdGhlCisJCQkgKiByZXNlcnZlZCBzaXplIGFmdGVyIGZsdXNoaW5n IG91dCB0aGUgcmVtYWluZGVyLgorCQkJICovCisJCQl3YWl0X2J5dGVzID0gcmVtYWluICsgcmlu Z2J1Zi0+cmVzZXJ2ZWRfc2l6ZTsKKwkJCW5lZWRfd3JhcCA9IHRydWU7CisJCX0gZWxzZSBpZiAo dG90YWxfYnl0ZXMgPiByaW5nYnVmLT5zcGFjZSkgeworCQkJLyogTm8gd3JhcHBpbmcgcmVxdWly ZWQsIGp1c3Qgd2FpdGluZy4gKi8KKwkJCXdhaXRfYnl0ZXMgPSB0b3RhbF9ieXRlczsKIAkJfQog CX0KIAotCWlmICh1bmxpa2VseShyaW5nYnVmLT5zcGFjZSA8IGJ5dGVzKSkgewotCQlyZXQgPSBs b2dpY2FsX3Jpbmdfd2FpdF9mb3Jfc3BhY2UocmVxLCBieXRlcyk7CisJaWYgKHdhaXRfYnl0ZXMp IHsKKwkJcmV0ID0gbG9naWNhbF9yaW5nX3dhaXRfZm9yX3NwYWNlKHJlcSwgd2FpdF9ieXRlcyk7 CiAJCWlmICh1bmxpa2VseShyZXQpKQogCQkJcmV0dXJuIHJldDsKKworCQlpZiAobmVlZF93cmFw KQorCQkJX193cmFwX3JpbmdfYnVmZmVyKHJpbmdidWYpOwogCX0KIAogCXJldHVybiAwOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IGFmN2MxMmUuLjliMTAwMTkg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTIxMjEsMTIgKzIx MjEsMTIgQEAgc3RhdGljIGludCByaW5nX3dhaXRfZm9yX3NwYWNlKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcsIGludCBuKQogCXVuc2lnbmVkIHNwYWNlOwogCWludCByZXQ7CiAKLQkvKiBU aGUgd2hvbGUgcG9pbnQgb2YgcmVzZXJ2aW5nIHNwYWNlIGlzIHRvIG5vdCB3YWl0ISAqLwotCVdB Uk5fT04ocmluZ2J1Zi0+cmVzZXJ2ZWRfaW5fdXNlKTsKLQogCWlmIChpbnRlbF9yaW5nX3NwYWNl KHJpbmdidWYpID49IG4pCiAJCXJldHVybiAwOwogCisJLyogVGhlIHdob2xlIHBvaW50IG9mIHJl c2VydmluZyBzcGFjZSBpcyB0byBub3Qgd2FpdCEgKi8KKwlXQVJOX09OKHJpbmdidWYtPnJlc2Vy dmVkX2luX3VzZSk7CisKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHJlcXVlc3QsICZyaW5nLT5yZXF1 ZXN0X2xpc3QsIGxpc3QpIHsKIAkJc3BhY2UgPSBfX2ludGVsX3Jpbmdfc3BhY2UocmVxdWVzdC0+ cG9zdGZpeCwgcmluZ2J1Zi0+dGFpbCwKIAkJCQkJICAgcmluZ2J1Zi0+c2l6ZSk7CkBAIC0yMTQ1 LDIxICsyMTQ1LDExIEBAIHN0YXRpYyBpbnQgcmluZ193YWl0X2Zvcl9zcGFjZShzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nLCBpbnQgbikKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCBp bnRlbF93cmFwX3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCitzdGF0 aWMgdm9pZCBfX3dyYXBfcmluZ19idWZmZXIoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdi dWYpCiB7CiAJdWludDMyX3QgX19pb21lbSAqdmlydDsKLQlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZl ciAqcmluZ2J1ZiA9IHJpbmctPmJ1ZmZlcjsKIAlpbnQgcmVtID0gcmluZ2J1Zi0+c2l6ZSAtIHJp bmdidWYtPnRhaWw7CiAKLQkvKiBDYW4ndCB3cmFwIGlmIHNwYWNlIGhhcyBhbHJlYWR5IGJlZW4g cmVzZXJ2ZWQhICovCi0JV0FSTl9PTihyaW5nYnVmLT5yZXNlcnZlZF9pbl91c2UpOwotCi0JaWYg KHJpbmdidWYtPnNwYWNlIDwgcmVtKSB7Ci0JCWludCByZXQgPSByaW5nX3dhaXRfZm9yX3NwYWNl KHJpbmcsIHJlbSk7Ci0JCWlmIChyZXQpCi0JCQlyZXR1cm4gcmV0OwotCX0KLQogCXZpcnQgPSBy aW5nYnVmLT52aXJ0dWFsX3N0YXJ0ICsgcmluZ2J1Zi0+dGFpbDsKIAlyZW0gLz0gNDsKIAl3aGls ZSAocmVtLS0pCkBAIC0yMTY3LDggKzIxNTcsNiBAQCBzdGF0aWMgaW50IGludGVsX3dyYXBfcmlu Z19idWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAogCXJpbmdidWYtPnRhaWwg PSAwOwogCWludGVsX3JpbmdfdXBkYXRlX3NwYWNlKHJpbmdidWYpOwotCi0JcmV0dXJuIDA7CiB9 CiAKIGludCBpbnRlbF9yaW5nX2lkbGUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKQEAg LTIyMzgsOSArMjIyNiwyMSBAQCB2b2lkIGludGVsX3JpbmdfcmVzZXJ2ZWRfc3BhY2VfdXNlKHN0 cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmKQogdm9pZCBpbnRlbF9yaW5nX3Jlc2VydmVk X3NwYWNlX2VuZChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKIHsKIAlXQVJOX09O KCFyaW5nYnVmLT5yZXNlcnZlZF9pbl91c2UpOwotCVdBUk4ocmluZ2J1Zi0+dGFpbCA+IHJpbmdi dWYtPnJlc2VydmVkX3RhaWwgKyByaW5nYnVmLT5yZXNlcnZlZF9zaXplLAotCSAgICAgInJlcXVl c3QgcmVzZXJ2ZWQgc2l6ZSB0b28gc21hbGw6ICVkIHZzICVkIVxuIiwKLQkgICAgIHJpbmdidWYt PnRhaWwgLSByaW5nYnVmLT5yZXNlcnZlZF90YWlsLCByaW5nYnVmLT5yZXNlcnZlZF9zaXplKTsK KwlpZiAocmluZ2J1Zi0+dGFpbCA+IHJpbmdidWYtPnJlc2VydmVkX3RhaWwpIHsKKwkJV0FSTihy aW5nYnVmLT50YWlsID4gcmluZ2J1Zi0+cmVzZXJ2ZWRfdGFpbCArIHJpbmdidWYtPnJlc2VydmVk X3NpemUsCisJCSAgICAgInJlcXVlc3QgcmVzZXJ2ZWQgc2l6ZSB0b28gc21hbGw6ICVkIHZzICVk IVxuIiwKKwkJICAgICByaW5nYnVmLT50YWlsIC0gcmluZ2J1Zi0+cmVzZXJ2ZWRfdGFpbCwgcmlu Z2J1Zi0+cmVzZXJ2ZWRfc2l6ZSk7CisJfSBlbHNlIHsKKwkJLyoKKwkJICogVGhlIHJpbmcgd2Fz IHdyYXBwZWQgd2hpbGUgdGhlIHJlc2VydmVkIHNwYWNlIHdhcyBpbiB1c2UuCisJCSAqIFRoYXQg bWVhbnMgdGhhdCBzb21lIHVua25vd24gYW1vdW50IG9mIHRoZSByaW5nIHRhaWwgd2FzCisJCSAq IG5vLW9wIGZpbGxlZCBhbmQgc2tpcHBlZC4gVGh1cyBzaW1wbHkgYWRkaW5nIHRoZSByaW5nIHNp emUKKwkJICogdG8gdGhlIHRhaWwgYW5kIGRvaW5nIHRoZSBhYm92ZSBzcGFjZSBjaGVjayB3aWxs IG5vdCB3b3JrLgorCQkgKiBSYXRoZXIgdGhhbiBhdHRlbXB0IHRvIHRyYWNrIGhvdyBtdWNoIHRh aWwgd2FzIHNraXBwZWQsCisJCSAqIGl0IGlzIG11Y2ggc2ltcGxlciB0byBzYXkgdGhhdCBhbHNv IHNraXBwaW5nIHRoZSBzYW5pdHkKKwkJICogY2hlY2sgZXZlcnkgb25jZSBpbiBhIHdoaWxlIGlz IG5vdCBhIGJpZyBpc3N1ZS4KKwkJICovCisJfQogCiAJcmluZ2J1Zi0+cmVzZXJ2ZWRfc2l6ZSAg ID0gMDsKIAlyaW5nYnVmLT5yZXNlcnZlZF9pbl91c2UgPSBmYWxzZTsKQEAgLTIyNDksMzMgKzIy NDksNDQgQEAgdm9pZCBpbnRlbF9yaW5nX3Jlc2VydmVkX3NwYWNlX2VuZChzdHJ1Y3QgaW50ZWxf cmluZ2J1ZmZlciAqcmluZ2J1ZikKIHN0YXRpYyBpbnQgX19pbnRlbF9yaW5nX3ByZXBhcmUoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgaW50IGJ5dGVzKQogewogCXN0cnVjdCBpbnRlbF9y aW5nYnVmZmVyICpyaW5nYnVmID0gcmluZy0+YnVmZmVyOwotCWludCByZXQ7Ci0KLQkvKgotCSAq IEFkZCBvbiB0aGUgcmVzZXJ2ZWQgc2l6ZSB0byB0aGUgcmVxdWVzdCB0byBtYWtlIHN1cmUgdGhh dCBhZnRlcgotCSAqIHRoZSBpbnRlbmRlZCBjb21tYW5kcyBoYXZlIGJlZW4gZW1pdHRlZCwgdGhl cmUgaXMgZ3VhcmFudGVlZCB0bwotCSAqIHN0aWxsIGJlIGVub3VnaCBmcmVlIHNwYWNlIHRvIHNl bmQgdGhlbSB0byB0aGUgaGFyZHdhcmUuCi0JICovCi0JaWYgKCFyaW5nYnVmLT5yZXNlcnZlZF9p bl91c2UpCi0JCWJ5dGVzICs9IHJpbmdidWYtPnJlc2VydmVkX3NpemU7Ci0KLQlpZiAodW5saWtl bHkocmluZ2J1Zi0+dGFpbCArIGJ5dGVzID4gcmluZ2J1Zi0+ZWZmZWN0aXZlX3NpemUpKSB7Ci0J CXJldCA9IGludGVsX3dyYXBfcmluZ19idWZmZXIocmluZyk7Ci0JCWlmICh1bmxpa2VseShyZXQp KQotCQkJcmV0dXJuIHJldDsKKwlpbnQgcmVtYWluID0gcmluZ2J1Zi0+ZWZmZWN0aXZlX3NpemUg LSByaW5nYnVmLT50YWlsOworCWludCByZXQsIHRvdGFsX2J5dGVzLCB3YWl0X2J5dGVzID0gMDsK Kwlib29sIG5lZWRfd3JhcCA9IGZhbHNlOwogCi0JCWlmKHJpbmdidWYtPnJlc2VydmVkX3NpemUp IHsKLQkJCXVpbnQzMl90IHNpemUgPSByaW5nYnVmLT5yZXNlcnZlZF9zaXplOworCWlmIChyaW5n YnVmLT5yZXNlcnZlZF9pbl91c2UpCisJCXRvdGFsX2J5dGVzID0gYnl0ZXM7CisJZWxzZQorCQl0 b3RhbF9ieXRlcyA9IGJ5dGVzICsgcmluZ2J1Zi0+cmVzZXJ2ZWRfc2l6ZTsKIAotCQkJaW50ZWxf cmluZ19yZXNlcnZlZF9zcGFjZV9jYW5jZWwocmluZ2J1Zik7Ci0JCQlpbnRlbF9yaW5nX3Jlc2Vy dmVkX3NwYWNlX3Jlc2VydmUocmluZ2J1Ziwgc2l6ZSk7CisJaWYgKHVubGlrZWx5KGJ5dGVzID4g cmVtYWluKSkgeworCQkvKgorCQkgKiBOb3QgZW5vdWdoIHNwYWNlIGZvciB0aGUgYmFzaWMgcmVx dWVzdC4gU28gbmVlZCB0byBmbHVzaAorCQkgKiBvdXQgdGhlIHJlbWFpbmRlciBhbmQgdGhlbiB3 YWl0IGZvciBiYXNlICsgcmVzZXJ2ZWQuCisJCSAqLworCQl3YWl0X2J5dGVzID0gcmVtYWluICsg dG90YWxfYnl0ZXM7CisJCW5lZWRfd3JhcCA9IHRydWU7CisJfSBlbHNlIHsKKwkJaWYgKHVubGlr ZWx5KHRvdGFsX2J5dGVzID4gcmVtYWluKSkgeworCQkJLyoKKwkJCSAqIFRoZSBiYXNlIHJlcXVl c3Qgd2lsbCBmaXQgYnV0IHRoZSByZXNlcnZlZCBzcGFjZQorCQkJICogZmFsbHMgb2ZmIHRoZSBl bmQuIFNvIG9ubHkgbmVlZCB0byB0byB3YWl0IGZvciB0aGUKKwkJCSAqIHJlc2VydmVkIHNpemUg YWZ0ZXIgZmx1c2hpbmcgb3V0IHRoZSByZW1haW5kZXIuCisJCQkgKi8KKwkJCXdhaXRfYnl0ZXMg PSByZW1haW4gKyByaW5nYnVmLT5yZXNlcnZlZF9zaXplOworCQkJbmVlZF93cmFwID0gdHJ1ZTsK KwkJfSBlbHNlIGlmICh0b3RhbF9ieXRlcyA+IHJpbmdidWYtPnNwYWNlKSB7CisJCQkvKiBObyB3 cmFwcGluZyByZXF1aXJlZCwganVzdCB3YWl0aW5nLiAqLworCQkJd2FpdF9ieXRlcyA9IHRvdGFs X2J5dGVzOwogCQl9CiAJfQogCi0JaWYgKHVubGlrZWx5KHJpbmdidWYtPnNwYWNlIDwgYnl0ZXMp KSB7Ci0JCXJldCA9IHJpbmdfd2FpdF9mb3Jfc3BhY2UocmluZywgYnl0ZXMpOworCWlmICh3YWl0 X2J5dGVzKSB7CisJCXJldCA9IHJpbmdfd2FpdF9mb3Jfc3BhY2UocmluZywgd2FpdF9ieXRlcyk7 CiAJCWlmICh1bmxpa2VseShyZXQpKQogCQkJcmV0dXJuIHJldDsKKworCQlpZiAobmVlZF93cmFw KQorCQkJX193cmFwX3JpbmdfYnVmZmVyKHJpbmdidWYpOwogCX0KIAogCXJldHVybiAwOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IDBlMmJiYzYuLjMwNGNhYzQg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTQ3Myw3ICs0NzMs NiBAQCBzdGF0aWMgaW5saW5lIHUzMiBpbnRlbF9yaW5nX2dldF90YWlsKHN0cnVjdCBpbnRlbF9y aW5nYnVmZmVyICpyaW5nYnVmKQogICogd2lsbCBhbHdheXMgaGF2ZSBzdWZmaWNpZW50IHJvb20g dG8gZG8gaXRzIHN0dWZmLiBUaGUgcmVxdWVzdCBjcmVhdGlvbgogICogY29kZSBjYWxscyB0aGlz IGF1dG9tYXRpY2FsbHkuCiAgKi8KLWludCBpbnRlbF9yaW5nX3Jlc2VydmVfc3BhY2Uoc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KTsKIHZvaWQgaW50ZWxfcmluZ19yZXNlcnZl ZF9zcGFjZV9yZXNlcnZlKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLCBpbnQgc2l6 ZSk7CiAvKiBDYW5jZWwgdGhlIHJlc2VydmF0aW9uLCBlLmcuIGJlY2F1c2UgdGhlIHJlcXVlc3Qg aXMgYmVpbmcgZGlzY2FyZGVkLiAqLwogdm9pZCBpbnRlbF9yaW5nX3Jlc2VydmVkX3NwYWNlX2Nh bmNlbChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1Zik7CkBAIC00ODIsNCArNDgxLDcg QEAgdm9pZCBpbnRlbF9yaW5nX3Jlc2VydmVkX3NwYWNlX3VzZShzdHJ1Y3QgaW50ZWxfcmluZ2J1 ZmZlciAqcmluZ2J1Zik7CiAvKiBGaW5pc2ggd2l0aCB0aGUgcmVzZXJ2ZWQgc3BhY2UgLSBmb3Ig dXNlIGJ5IGk5MTVfYWRkX3JlcXVlc3QoKSBvbmx5LiAqLwogdm9pZCBpbnRlbF9yaW5nX3Jlc2Vy dmVkX3NwYWNlX2VuZChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1Zik7CiAKKy8qIExl Z2FjeSByaW5nYnVmZmVyIHNwZWNpZmljIHBvcnRpb24gb2YgcmVzZXJ2YXRpb24gY29kZTogKi8K K2ludCBpbnRlbF9yaW5nX3Jlc2VydmVfc3BhY2Uoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpyZXF1ZXN0KTsKKwogI2VuZGlmIC8qIF9JTlRFTF9SSU5HQlVGRkVSX0hfICovCi0tIAoxLjku MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK