From: John.C.Harrison@Intel.com Subject: [PATCH] drm/i915: Reserve space improvements Date: Tue, 30 Jun 2015 12:40:55 +0100 Message-ID: <1435664455-12657-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 62DA36E3B2 for ; Tue, 30 Jun 2015 04:41:05 -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 YXNpZXIgdG8gZm9sbG93LgoKdjM6IEZpeCBmb3IgJ2VmZmVjdGl2ZV9zaXplJyB2cyAnc2l6ZScg ZHVyaW5nIHJpbmcgYnVmZmVyIHJlbWFpbmRlcgpjYWxjdWxhdGlvbnMgKHNwb3R0ZWQgYnkgVG9t YXMgRWxmKS4KCkZvcjogVklaLTUxMTUKQ0M6IERhbmllbCBWZXR0ZXIgPGRhbmllbEBmZndsbC5j aD4KU2lnbmVkLW9mZi1ieTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgfCA3MyArKysr KysrKysrKysrLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5jIHwgOTAgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAgNCArLQogMyBmaWxlcyBjaGFuZ2VkLCA5 MCBpbnNlcnRpb25zKCspLCA3NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5j CmluZGV4IGIzNmUwNjQuLjdkOTUxNWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC02 NjMsMTIgKzY2MywxMiBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ193YWl0X2Zvcl9zcGFjZShz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAl1bnNpZ25lZCBzcGFjZTsKIAlpbnQg cmV0OwogCi0JLyogVGhlIHdob2xlIHBvaW50IG9mIHJlc2VydmluZyBzcGFjZSBpcyB0byBub3Qg d2FpdCEgKi8KLQlXQVJOX09OKHJpbmdidWYtPnJlc2VydmVkX2luX3VzZSk7Ci0KIAlpZiAoaW50 ZWxfcmluZ19zcGFjZShyaW5nYnVmKSA+PSBieXRlcykKIAkJcmV0dXJuIDA7CiAKKwkvKiBUaGUg d2hvbGUgcG9pbnQgb2YgcmVzZXJ2aW5nIHNwYWNlIGlzIHRvIG5vdCB3YWl0ISAqLworCVdBUk5f T04ocmluZ2J1Zi0+cmVzZXJ2ZWRfaW5fdXNlKTsKKwogCWxpc3RfZm9yX2VhY2hfZW50cnkodGFy Z2V0LCAmcmluZy0+cmVxdWVzdF9saXN0LCBsaXN0KSB7CiAJCS8qCiAJCSAqIFRoZSByZXF1ZXN0 IHF1ZXVlIGlzIHBlci1lbmdpbmUsIHNvIGNhbiBjb250YWluIHJlcXVlc3RzCkBAIC03MTgsMjIg KzcxOCwxMSBAQCBpbnRlbF9sb2dpY2FsX3JpbmdfYWR2YW5jZV9hbmRfc3VibWl0KHN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIAlleGVjbGlzdHNfY29udGV4dF9xdWV1ZShy ZXF1ZXN0KTsKIH0KIAotc3RhdGljIGludCBsb2dpY2FsX3Jpbmdfd3JhcF9idWZmZXIoc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCitzdGF0aWMgdm9pZCBfX3dyYXBfcmluZ19idWZm ZXIoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYpCiB7Ci0Jc3RydWN0IGludGVsX3Jp bmdidWZmZXIgKnJpbmdidWYgPSByZXEtPnJpbmdidWY7CiAJdWludDMyX3QgX19pb21lbSAqdmly dDsKIAlpbnQgcmVtID0gcmluZ2J1Zi0+c2l6ZSAtIHJpbmdidWYtPnRhaWw7CiAKLQkvKiBDYW4n dCB3cmFwIGlmIHNwYWNlIGhhcyBhbHJlYWR5IGJlZW4gcmVzZXJ2ZWQhICovCi0JV0FSTl9PTihy aW5nYnVmLT5yZXNlcnZlZF9pbl91c2UpOwotCi0JaWYgKHJpbmdidWYtPnNwYWNlIDwgcmVtKSB7 Ci0JCWludCByZXQgPSBsb2dpY2FsX3Jpbmdfd2FpdF9mb3Jfc3BhY2UocmVxLCByZW0pOwotCi0J CWlmIChyZXQpCi0JCQlyZXR1cm4gcmV0OwotCX0KLQogCXZpcnQgPSByaW5nYnVmLT52aXJ0dWFs X3N0YXJ0ICsgcmluZ2J1Zi0+dGFpbDsKIAlyZW0gLz0gNDsKIAl3aGlsZSAocmVtLS0pCkBAIC03 NDEsNDAgKzczMCw1MCBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ193cmFwX2J1ZmZlcihzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAogCXJpbmdidWYtPnRhaWwgPSAwOwogCWlu dGVsX3JpbmdfdXBkYXRlX3NwYWNlKHJpbmdidWYpOwotCi0JcmV0dXJuIDA7CiB9CiAKIHN0YXRp YyBpbnQgbG9naWNhbF9yaW5nX3ByZXBhcmUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpy ZXEsIGludCBieXRlcykKIHsKIAlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9IHJl cS0+cmluZ2J1ZjsKLQlpbnQgcmV0OwotCi0JLyoKLQkgKiBBZGQgb24gdGhlIHJlc2VydmVkIHNp emUgdG8gdGhlIHJlcXVlc3QgdG8gbWFrZSBzdXJlIHRoYXQgYWZ0ZXIKLQkgKiB0aGUgaW50ZW5k ZWQgY29tbWFuZHMgaGF2ZSBiZWVuIGVtaXR0ZWQsIHRoZXJlIGlzIGd1YXJhbnRlZWQgdG8KLQkg KiBzdGlsbCBiZSBlbm91Z2ggZnJlZSBzcGFjZSB0byBzZW5kIHRoZW0gdG8gdGhlIGhhcmR3YXJl LgotCSAqLwotCWlmICghcmluZ2J1Zi0+cmVzZXJ2ZWRfaW5fdXNlKQotCQlieXRlcyArPSByaW5n YnVmLT5yZXNlcnZlZF9zaXplOwotCi0JaWYgKHVubGlrZWx5KHJpbmdidWYtPnRhaWwgKyBieXRl cyA+IHJpbmdidWYtPmVmZmVjdGl2ZV9zaXplKSkgewotCQlyZXQgPSBsb2dpY2FsX3Jpbmdfd3Jh cF9idWZmZXIocmVxKTsKLQkJaWYgKHVubGlrZWx5KHJldCkpCi0JCQlyZXR1cm4gcmV0OworCWlu dCByZW1haW5fdXNhYmxlID0gcmluZ2J1Zi0+ZWZmZWN0aXZlX3NpemUgLSByaW5nYnVmLT50YWls OworCWludCByZW1haW5fYWN0dWFsID0gcmluZ2J1Zi0+c2l6ZSAtIHJpbmdidWYtPnRhaWw7CisJ aW50IHJldCwgdG90YWxfYnl0ZXMsIHdhaXRfYnl0ZXMgPSAwOworCWJvb2wgbmVlZF93cmFwID0g ZmFsc2U7CiAKLQkJaWYocmluZ2J1Zi0+cmVzZXJ2ZWRfc2l6ZSkgewotCQkJdWludDMyX3Qgc2l6 ZSA9IHJpbmdidWYtPnJlc2VydmVkX3NpemU7CisJaWYgKHJpbmdidWYtPnJlc2VydmVkX2luX3Vz ZSkKKwkJdG90YWxfYnl0ZXMgPSBieXRlczsKKwllbHNlCisJCXRvdGFsX2J5dGVzID0gYnl0ZXMg KyByaW5nYnVmLT5yZXNlcnZlZF9zaXplOwogCi0JCQlpbnRlbF9yaW5nX3Jlc2VydmVkX3NwYWNl X2NhbmNlbChyaW5nYnVmKTsKLQkJCWludGVsX3JpbmdfcmVzZXJ2ZWRfc3BhY2VfcmVzZXJ2ZShy aW5nYnVmLCBzaXplKTsKKwlpZiAodW5saWtlbHkoYnl0ZXMgPiByZW1haW5fdXNhYmxlKSkgewor CQkvKgorCQkgKiBOb3QgZW5vdWdoIHNwYWNlIGZvciB0aGUgYmFzaWMgcmVxdWVzdC4gU28gbmVl ZCB0byBmbHVzaAorCQkgKiBvdXQgdGhlIHJlbWFpbmRlciBhbmQgdGhlbiB3YWl0IGZvciBiYXNl ICsgcmVzZXJ2ZWQuCisJCSAqLworCQl3YWl0X2J5dGVzID0gcmVtYWluX2FjdHVhbCArIHRvdGFs X2J5dGVzOworCQluZWVkX3dyYXAgPSB0cnVlOworCX0gZWxzZSB7CisJCWlmICh1bmxpa2VseSh0 b3RhbF9ieXRlcyA+IHJlbWFpbl91c2FibGUpKSB7CisJCQkvKgorCQkJICogVGhlIGJhc2UgcmVx dWVzdCB3aWxsIGZpdCBidXQgdGhlIHJlc2VydmVkIHNwYWNlCisJCQkgKiBmYWxscyBvZmYgdGhl IGVuZC4gU28gb25seSBuZWVkIHRvIHRvIHdhaXQgZm9yIHRoZQorCQkJICogcmVzZXJ2ZWQgc2l6 ZSBhZnRlciBmbHVzaGluZyBvdXQgdGhlIHJlbWFpbmRlci4KKwkJCSAqLworCQkJd2FpdF9ieXRl cyA9IHJlbWFpbl9hY3R1YWwgKyByaW5nYnVmLT5yZXNlcnZlZF9zaXplOworCQkJbmVlZF93cmFw ID0gdHJ1ZTsKKwkJfSBlbHNlIGlmICh0b3RhbF9ieXRlcyA+IHJpbmdidWYtPnNwYWNlKSB7CisJ CQkvKiBObyB3cmFwcGluZyByZXF1aXJlZCwganVzdCB3YWl0aW5nLiAqLworCQkJd2FpdF9ieXRl cyA9IHRvdGFsX2J5dGVzOwogCQl9CiAJfQogCi0JaWYgKHVubGlrZWx5KHJpbmdidWYtPnNwYWNl IDwgYnl0ZXMpKSB7Ci0JCXJldCA9IGxvZ2ljYWxfcmluZ193YWl0X2Zvcl9zcGFjZShyZXEsIGJ5 dGVzKTsKKwlpZiAod2FpdF9ieXRlcykgeworCQlyZXQgPSBsb2dpY2FsX3Jpbmdfd2FpdF9mb3Jf c3BhY2UocmVxLCB3YWl0X2J5dGVzKTsKIAkJaWYgKHVubGlrZWx5KHJldCkpCiAJCQlyZXR1cm4g cmV0OworCisJCWlmIChuZWVkX3dyYXApCisJCQlfX3dyYXBfcmluZ19idWZmZXIocmluZ2J1Zik7 CiAJfQogCiAJcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMK aW5kZXggYWY3YzEyZS4uZTM5Yzg5MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jpbmdi dWZmZXIuYwpAQCAtMjEyMSwxMiArMjEyMSwxMiBAQCBzdGF0aWMgaW50IHJpbmdfd2FpdF9mb3Jf c3BhY2Uoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgaW50IG4pCiAJdW5zaWduZWQgc3Bh Y2U7CiAJaW50IHJldDsKIAotCS8qIFRoZSB3aG9sZSBwb2ludCBvZiByZXNlcnZpbmcgc3BhY2Ug aXMgdG8gbm90IHdhaXQhICovCi0JV0FSTl9PTihyaW5nYnVmLT5yZXNlcnZlZF9pbl91c2UpOwot CiAJaWYgKGludGVsX3Jpbmdfc3BhY2UocmluZ2J1ZikgPj0gbikKIAkJcmV0dXJuIDA7CiAKKwkv KiBUaGUgd2hvbGUgcG9pbnQgb2YgcmVzZXJ2aW5nIHNwYWNlIGlzIHRvIG5vdCB3YWl0ISAqLwor CVdBUk5fT04ocmluZ2J1Zi0+cmVzZXJ2ZWRfaW5fdXNlKTsKKwogCWxpc3RfZm9yX2VhY2hfZW50 cnkocmVxdWVzdCwgJnJpbmctPnJlcXVlc3RfbGlzdCwgbGlzdCkgewogCQlzcGFjZSA9IF9faW50 ZWxfcmluZ19zcGFjZShyZXF1ZXN0LT5wb3N0Zml4LCByaW5nYnVmLT50YWlsLAogCQkJCQkgICBy aW5nYnVmLT5zaXplKTsKQEAgLTIxNDUsMjEgKzIxNDUsMTEgQEAgc3RhdGljIGludCByaW5nX3dh aXRfZm9yX3NwYWNlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIGludCBuKQogCXJldHVy biAwOwogfQogCi1zdGF0aWMgaW50IGludGVsX3dyYXBfcmluZ19idWZmZXIoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqcmluZykKK3N0YXRpYyB2b2lkIF9fd3JhcF9yaW5nX2J1ZmZlcihzdHJ1Y3Qg aW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKIHsKIAl1aW50MzJfdCBfX2lvbWVtICp2aXJ0Owot CXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmID0gcmluZy0+YnVmZmVyOwogCWludCBy ZW0gPSByaW5nYnVmLT5zaXplIC0gcmluZ2J1Zi0+dGFpbDsKIAotCS8qIENhbid0IHdyYXAgaWYg c3BhY2UgaGFzIGFscmVhZHkgYmVlbiByZXNlcnZlZCEgKi8KLQlXQVJOX09OKHJpbmdidWYtPnJl c2VydmVkX2luX3VzZSk7Ci0KLQlpZiAocmluZ2J1Zi0+c3BhY2UgPCByZW0pIHsKLQkJaW50IHJl dCA9IHJpbmdfd2FpdF9mb3Jfc3BhY2UocmluZywgcmVtKTsKLQkJaWYgKHJldCkKLQkJCXJldHVy biByZXQ7Ci0JfQotCiAJdmlydCA9IHJpbmdidWYtPnZpcnR1YWxfc3RhcnQgKyByaW5nYnVmLT50 YWlsOwogCXJlbSAvPSA0OwogCXdoaWxlIChyZW0tLSkKQEAgLTIxNjcsOCArMjE1Nyw2IEBAIHN0 YXRpYyBpbnQgaW50ZWxfd3JhcF9yaW5nX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nKQogCiAJcmluZ2J1Zi0+dGFpbCA9IDA7CiAJaW50ZWxfcmluZ191cGRhdGVfc3BhY2Uocmlu Z2J1Zik7Ci0KLQlyZXR1cm4gMDsKIH0KIAogaW50IGludGVsX3JpbmdfaWRsZShzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nKQpAQCAtMjIzOCw5ICsyMjI2LDIxIEBAIHZvaWQgaW50ZWxfcmlu Z19yZXNlcnZlZF9zcGFjZV91c2Uoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYpCiB2 b2lkIGludGVsX3JpbmdfcmVzZXJ2ZWRfc3BhY2VfZW5kKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVy ICpyaW5nYnVmKQogewogCVdBUk5fT04oIXJpbmdidWYtPnJlc2VydmVkX2luX3VzZSk7Ci0JV0FS TihyaW5nYnVmLT50YWlsID4gcmluZ2J1Zi0+cmVzZXJ2ZWRfdGFpbCArIHJpbmdidWYtPnJlc2Vy dmVkX3NpemUsCi0JICAgICAicmVxdWVzdCByZXNlcnZlZCBzaXplIHRvbyBzbWFsbDogJWQgdnMg JWQhXG4iLAotCSAgICAgcmluZ2J1Zi0+dGFpbCAtIHJpbmdidWYtPnJlc2VydmVkX3RhaWwsIHJp bmdidWYtPnJlc2VydmVkX3NpemUpOworCWlmIChyaW5nYnVmLT50YWlsID4gcmluZ2J1Zi0+cmVz ZXJ2ZWRfdGFpbCkgeworCQlXQVJOKHJpbmdidWYtPnRhaWwgPiByaW5nYnVmLT5yZXNlcnZlZF90 YWlsICsgcmluZ2J1Zi0+cmVzZXJ2ZWRfc2l6ZSwKKwkJICAgICAicmVxdWVzdCByZXNlcnZlZCBz aXplIHRvbyBzbWFsbDogJWQgdnMgJWQhXG4iLAorCQkgICAgIHJpbmdidWYtPnRhaWwgLSByaW5n YnVmLT5yZXNlcnZlZF90YWlsLCByaW5nYnVmLT5yZXNlcnZlZF9zaXplKTsKKwl9IGVsc2Ugewor CQkvKgorCQkgKiBUaGUgcmluZyB3YXMgd3JhcHBlZCB3aGlsZSB0aGUgcmVzZXJ2ZWQgc3BhY2Ug d2FzIGluIHVzZS4KKwkJICogVGhhdCBtZWFucyB0aGF0IHNvbWUgdW5rbm93biBhbW91bnQgb2Yg dGhlIHJpbmcgdGFpbCB3YXMKKwkJICogbm8tb3AgZmlsbGVkIGFuZCBza2lwcGVkLiBUaHVzIHNp bXBseSBhZGRpbmcgdGhlIHJpbmcgc2l6ZQorCQkgKiB0byB0aGUgdGFpbCBhbmQgZG9pbmcgdGhl IGFib3ZlIHNwYWNlIGNoZWNrIHdpbGwgbm90IHdvcmsuCisJCSAqIFJhdGhlciB0aGFuIGF0dGVt cHQgdG8gdHJhY2sgaG93IG11Y2ggdGFpbCB3YXMgc2tpcHBlZCwKKwkJICogaXQgaXMgbXVjaCBz aW1wbGVyIHRvIHNheSB0aGF0IGFsc28gc2tpcHBpbmcgdGhlIHNhbml0eQorCQkgKiBjaGVjayBl dmVyeSBvbmNlIGluIGEgd2hpbGUgaXMgbm90IGEgYmlnIGlzc3VlLgorCQkgKi8KKwl9CiAKIAly aW5nYnVmLT5yZXNlcnZlZF9zaXplICAgPSAwOwogCXJpbmdidWYtPnJlc2VydmVkX2luX3VzZSA9 IGZhbHNlOwpAQCAtMjI0OSwzMyArMjI0OSw0NSBAQCB2b2lkIGludGVsX3JpbmdfcmVzZXJ2ZWRf c3BhY2VfZW5kKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmKQogc3RhdGljIGludCBf X2ludGVsX3JpbmdfcHJlcGFyZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLCBpbnQgYnl0 ZXMpCiB7CiAJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSByaW5nLT5idWZmZXI7 Ci0JaW50IHJldDsKLQotCS8qCi0JICogQWRkIG9uIHRoZSByZXNlcnZlZCBzaXplIHRvIHRoZSBy ZXF1ZXN0IHRvIG1ha2Ugc3VyZSB0aGF0IGFmdGVyCi0JICogdGhlIGludGVuZGVkIGNvbW1hbmRz IGhhdmUgYmVlbiBlbWl0dGVkLCB0aGVyZSBpcyBndWFyYW50ZWVkIHRvCi0JICogc3RpbGwgYmUg ZW5vdWdoIGZyZWUgc3BhY2UgdG8gc2VuZCB0aGVtIHRvIHRoZSBoYXJkd2FyZS4KLQkgKi8KLQlp ZiAoIXJpbmdidWYtPnJlc2VydmVkX2luX3VzZSkKLQkJYnl0ZXMgKz0gcmluZ2J1Zi0+cmVzZXJ2 ZWRfc2l6ZTsKLQotCWlmICh1bmxpa2VseShyaW5nYnVmLT50YWlsICsgYnl0ZXMgPiByaW5nYnVm LT5lZmZlY3RpdmVfc2l6ZSkpIHsKLQkJcmV0ID0gaW50ZWxfd3JhcF9yaW5nX2J1ZmZlcihyaW5n KTsKLQkJaWYgKHVubGlrZWx5KHJldCkpCi0JCQlyZXR1cm4gcmV0OworCWludCByZW1haW5fdXNh YmxlID0gcmluZ2J1Zi0+ZWZmZWN0aXZlX3NpemUgLSByaW5nYnVmLT50YWlsOworCWludCByZW1h aW5fYWN0dWFsID0gcmluZ2J1Zi0+c2l6ZSAtIHJpbmdidWYtPnRhaWw7CisJaW50IHJldCwgdG90 YWxfYnl0ZXMsIHdhaXRfYnl0ZXMgPSAwOworCWJvb2wgbmVlZF93cmFwID0gZmFsc2U7CiAKLQkJ aWYocmluZ2J1Zi0+cmVzZXJ2ZWRfc2l6ZSkgewotCQkJdWludDMyX3Qgc2l6ZSA9IHJpbmdidWYt PnJlc2VydmVkX3NpemU7CisJaWYgKHJpbmdidWYtPnJlc2VydmVkX2luX3VzZSkKKwkJdG90YWxf Ynl0ZXMgPSBieXRlczsKKwllbHNlCisJCXRvdGFsX2J5dGVzID0gYnl0ZXMgKyByaW5nYnVmLT5y ZXNlcnZlZF9zaXplOwogCi0JCQlpbnRlbF9yaW5nX3Jlc2VydmVkX3NwYWNlX2NhbmNlbChyaW5n YnVmKTsKLQkJCWludGVsX3JpbmdfcmVzZXJ2ZWRfc3BhY2VfcmVzZXJ2ZShyaW5nYnVmLCBzaXpl KTsKKwlpZiAodW5saWtlbHkoYnl0ZXMgPiByZW1haW5fdXNhYmxlKSkgeworCQkvKgorCQkgKiBO b3QgZW5vdWdoIHNwYWNlIGZvciB0aGUgYmFzaWMgcmVxdWVzdC4gU28gbmVlZCB0byBmbHVzaAor CQkgKiBvdXQgdGhlIHJlbWFpbmRlciBhbmQgdGhlbiB3YWl0IGZvciBiYXNlICsgcmVzZXJ2ZWQu CisJCSAqLworCQl3YWl0X2J5dGVzID0gcmVtYWluX2FjdHVhbCArIHRvdGFsX2J5dGVzOworCQlu ZWVkX3dyYXAgPSB0cnVlOworCX0gZWxzZSB7CisJCWlmICh1bmxpa2VseSh0b3RhbF9ieXRlcyA+ IHJlbWFpbl91c2FibGUpKSB7CisJCQkvKgorCQkJICogVGhlIGJhc2UgcmVxdWVzdCB3aWxsIGZp dCBidXQgdGhlIHJlc2VydmVkIHNwYWNlCisJCQkgKiBmYWxscyBvZmYgdGhlIGVuZC4gU28gb25s eSBuZWVkIHRvIHRvIHdhaXQgZm9yIHRoZQorCQkJICogcmVzZXJ2ZWQgc2l6ZSBhZnRlciBmbHVz aGluZyBvdXQgdGhlIHJlbWFpbmRlci4KKwkJCSAqLworCQkJd2FpdF9ieXRlcyA9IHJlbWFpbl9h Y3R1YWwgKyByaW5nYnVmLT5yZXNlcnZlZF9zaXplOworCQkJbmVlZF93cmFwID0gdHJ1ZTsKKwkJ fSBlbHNlIGlmICh0b3RhbF9ieXRlcyA+IHJpbmdidWYtPnNwYWNlKSB7CisJCQkvKiBObyB3cmFw cGluZyByZXF1aXJlZCwganVzdCB3YWl0aW5nLiAqLworCQkJd2FpdF9ieXRlcyA9IHRvdGFsX2J5 dGVzOwogCQl9CiAJfQogCi0JaWYgKHVubGlrZWx5KHJpbmdidWYtPnNwYWNlIDwgYnl0ZXMpKSB7 Ci0JCXJldCA9IHJpbmdfd2FpdF9mb3Jfc3BhY2UocmluZywgYnl0ZXMpOworCWlmICh3YWl0X2J5 dGVzKSB7CisJCXJldCA9IHJpbmdfd2FpdF9mb3Jfc3BhY2UocmluZywgd2FpdF9ieXRlcyk7CiAJ CWlmICh1bmxpa2VseShyZXQpKQogCQkJcmV0dXJuIHJldDsKKworCQlpZiAobmVlZF93cmFwKQor CQkJX193cmFwX3JpbmdfYnVmZmVyKHJpbmdidWYpOwogCX0KIAogCXJldHVybiAwOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IDBlMmJiYzYuLjMwNGNhYzQgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTQ3Myw3ICs0NzMsNiBA QCBzdGF0aWMgaW5saW5lIHUzMiBpbnRlbF9yaW5nX2dldF90YWlsKHN0cnVjdCBpbnRlbF9yaW5n YnVmZmVyICpyaW5nYnVmKQogICogd2lsbCBhbHdheXMgaGF2ZSBzdWZmaWNpZW50IHJvb20gdG8g ZG8gaXRzIHN0dWZmLiBUaGUgcmVxdWVzdCBjcmVhdGlvbgogICogY29kZSBjYWxscyB0aGlzIGF1 dG9tYXRpY2FsbHkuCiAgKi8KLWludCBpbnRlbF9yaW5nX3Jlc2VydmVfc3BhY2Uoc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KTsKIHZvaWQgaW50ZWxfcmluZ19yZXNlcnZlZF9z cGFjZV9yZXNlcnZlKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLCBpbnQgc2l6ZSk7 CiAvKiBDYW5jZWwgdGhlIHJlc2VydmF0aW9uLCBlLmcuIGJlY2F1c2UgdGhlIHJlcXVlc3QgaXMg YmVpbmcgZGlzY2FyZGVkLiAqLwogdm9pZCBpbnRlbF9yaW5nX3Jlc2VydmVkX3NwYWNlX2NhbmNl bChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1Zik7CkBAIC00ODIsNCArNDgxLDcgQEAg dm9pZCBpbnRlbF9yaW5nX3Jlc2VydmVkX3NwYWNlX3VzZShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZl ciAqcmluZ2J1Zik7CiAvKiBGaW5pc2ggd2l0aCB0aGUgcmVzZXJ2ZWQgc3BhY2UgLSBmb3IgdXNl IGJ5IGk5MTVfYWRkX3JlcXVlc3QoKSBvbmx5LiAqLwogdm9pZCBpbnRlbF9yaW5nX3Jlc2VydmVk X3NwYWNlX2VuZChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1Zik7CiAKKy8qIExlZ2Fj eSByaW5nYnVmZmVyIHNwZWNpZmljIHBvcnRpb24gb2YgcmVzZXJ2YXRpb24gY29kZTogKi8KK2lu dCBpbnRlbF9yaW5nX3Jlc2VydmVfc3BhY2Uoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpy ZXF1ZXN0KTsKKwogI2VuZGlmIC8qIF9JTlRFTF9SSU5HQlVGRkVSX0hfICovCi0tIAoxLjkuMQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK