From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: [PATCH 08/14] drm/i915: Drop intel_update_sprite_watermarks Date: Mon, 14 Sep 2015 19:19:24 -0700 Message-ID: <1442283570-26824-9-git-send-email-matthew.d.roper@intel.com> References: <1442283570-26824-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id C482E6E97C for ; Mon, 14 Sep 2015 19:20:06 -0700 (PDT) In-Reply-To: <1442283570-26824-1-git-send-email-matthew.d.roper@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 VGhlIG9ubHkgcGxhdGZvcm0gdGhhdCBzdGlsbCBoYXMgYW4gdXBkYXRlX3Nwcml0ZV93bSBlbnRy eXBvaW50IGlzIFNLTDsKb24gU0tMLCBpbnRlbF91cGRhdGVfc3ByaXRlX3dhdGVybWFya3MganVz dCB1cGRhdGVzIGludGVsX3BsYW5lLT53bSBhbmQKdGhlbiBwZXJmb3JtcyBhIHJlZ3VsYXIgd2F0 ZXJtYXJrIHVwZGF0ZS4gIEhvd2V2ZXIgaW50ZWxfcGxhbmUtPndtIGlzCm9ubHkgdXNlZCB0byB1 cGRhdGUgYSBjb3VwbGUgZmllbGRzIGluIGludGVsX3dtX2NvbmZpZywgYW5kIHRob3NlIGZpZWxk cwphcmUgbmV2ZXIgdXNlZCBieSB0aGUgU0tMIGNvZGUsIHNvIG9uIFNLTCBhbiB1cGRhdGVfc3By aXRlX3dtIGlzCmVmZmVjdGl2ZWx5IGlkZW50aWNhbCB0byBhbiB1cGRhdGVfd20gY2FsbC4gIFNp bmNlIHdlJ3JlIGFscmVhZHkKZW5zdXJpbmcgdGhhdCB0aGUgcmVndWxhciBpbnRlbF91cGRhdGVf d20gaXMgY2FsbGVkIGFueSB0aW1lIHdlJ2QgdHJ5IHRvCmNhbGwgaW50ZWxfdXBkYXRlX3Nwcml0 ZV93YXRlcm1hcmtzLCB0aGUgd2hvbGUgY2FsbCBpcyByZWR1bmRhbnQgYW5kIGNhbgpiZSBkcm9w cGVkLgoKU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgfCAgNCAtLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8ICA1IC0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICA2IC0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMgICAgICB8IDU4IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgIHwgMTUgLS0tLS0tLS0tLQog NSBmaWxlcyBjaGFuZ2VkLCA4OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApp bmRleCA1MzliZmEyLi5iMTk3ZDQxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTYyOCwx MCArNjI4LDYgQEAgc3RydWN0IGRybV9pOTE1X2Rpc3BsYXlfZnVuY3MgewogCQkJICBzdHJ1Y3Qg ZHBsbCAqbWF0Y2hfY2xvY2ssCiAJCQkgIHN0cnVjdCBkcGxsICpiZXN0X2Nsb2NrKTsKIAl2b2lk ICgqdXBkYXRlX3dtKShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwotCXZvaWQgKCp1cGRhdGVfc3By aXRlX3dtKShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKLQkJCQkgc3RydWN0IGRybV9jcnRjICpj cnRjLAotCQkJCSB1aW50MzJfdCBzcHJpdGVfd2lkdGgsIHVpbnQzMl90IHNwcml0ZV9oZWlnaHQs Ci0JCQkJIGludCBwaXhlbF9zaXplLCBib29sIGVuYWJsZSwgYm9vbCBzY2FsZWQpOwogCWludCAo Km1vZGVzZXRfY2FsY19jZGNsaykoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKTsKIAl2 b2lkICgqbW9kZXNldF9jb21taXRfY2RjbGspKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSk7CiAJLyogUmV0dXJucyB0aGUgYWN0aXZlIHN0YXRlIG9mIHRoZSBjcnRjLCBhbmQgaWYgdGhl IGNydGMgaXMgYWN0aXZlLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGRh YTBlZGUuLjk2Y2VlZDcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTQ3 MjEsNyArNDcyMSw2IEBAIHN0YXRpYyB2b2lkIGludGVsX3Bvc3RfcGxhbmVfdXBkYXRlKHN0cnVj dCBpbnRlbF9jcnRjICpjcnRjKQogCXN0cnVjdCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQgKmF0 b21pYyA9ICZjcnRjLT5hdG9taWM7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJh c2UuZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3By aXZhdGU7Ci0Jc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7CiAKIAlpZiAoYXRvbWljLT53YWl0X3Zi bGFuaykKIAkJaW50ZWxfd2FpdF9mb3JfdmJsYW5rKGRldiwgY3J0Yy0+cGlwZSk7CkBAIC00NzQw LDEwICs0NzM5LDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfcG9zdF9wbGFuZV91cGRhdGUoc3RydWN0 IGludGVsX2NydGMgKmNydGMpCiAJaWYgKGF0b21pYy0+cG9zdF9lbmFibGVfcHJpbWFyeSkKIAkJ aW50ZWxfcG9zdF9lbmFibGVfcHJpbWFyeSgmY3J0Yy0+YmFzZSk7CiAKLQlkcm1fZm9yX2VhY2hf cGxhbmVfbWFzayhwbGFuZSwgZGV2LCBhdG9taWMtPnVwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcykK LQkJaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKHBsYW5lLCAmY3J0Yy0+YmFzZSwKLQkJ CQkJICAgICAgIDAsIDAsIDAsIGZhbHNlLCBmYWxzZSk7Ci0KIAltZW1zZXQoYXRvbWljLCAwLCBz aXplb2YoKmF0b21pYykpOwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDNmYTJl NjYuLjk4ODViMjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xMzgwLDEyICsxMzgw LDYgQEAgdm9pZCBpbnRlbF9pbml0X2Nsb2NrX2dhdGluZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KTsKIHZvaWQgaW50ZWxfc3VzcGVuZF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGludCBp bGtfd21fbWF4X2xldmVsKGNvbnN0IHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBpbnRl bF91cGRhdGVfd2F0ZXJtYXJrcyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwotdm9pZCBpbnRlbF91 cGRhdGVfc3ByaXRlX3dhdGVybWFya3Moc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCi0JCQkJICAg IHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKLQkJCQkgICAgdWludDMyX3Qgc3ByaXRlX3dpZHRoLAot CQkJCSAgICB1aW50MzJfdCBzcHJpdGVfaGVpZ2h0LAotCQkJCSAgICBpbnQgcGl4ZWxfc2l6ZSwK LQkJCQkgICAgYm9vbCBlbmFibGVkLCBib29sIHNjYWxlZCk7CiB2b2lkIGludGVsX2luaXRfcG0o c3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIGludGVsX3BtX3NldHVwKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpOwogdm9pZCBpbnRlbF9ncHVfaXBzX2luaXQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IGQ2MDE2MzAuLjNm OWUwZTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMzE3MCwxOCArMzE3MCw5IEBAIHN0 YXRpYyB2b2lkIHNrbF9jb21wdXRlX3dtX2dsb2JhbF9wYXJhbWV0ZXJzKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsCiAJCQkJCSAgICAgc3RydWN0IGludGVsX3dtX2NvbmZpZyAqY29uZmlnKQogewog CXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKLQlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKIAogCWxp c3RfZm9yX2VhY2hfZW50cnkoY3J0YywgJmRldi0+bW9kZV9jb25maWcuY3J0Y19saXN0LCBoZWFk KQogCQljb25maWctPm51bV9waXBlc19hY3RpdmUgKz0gdG9faW50ZWxfY3J0YyhjcnRjKS0+YWN0 aXZlOwotCi0JLyogRklYTUU6IEkgZG9uJ3QgdGhpbmsgd2UgbmVlZCB0aG9zZSB0d28gZ2xvYmFs IHBhcmFtZXRlcnMgb24gU0tMICovCi0JbGlzdF9mb3JfZWFjaF9lbnRyeShwbGFuZSwgJmRldi0+ bW9kZV9jb25maWcucGxhbmVfbGlzdCwgaGVhZCkgewotCQlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmlu dGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwotCi0JCWNvbmZpZy0+c3ByaXRlc19l bmFibGVkIHw9IGludGVsX3BsYW5lLT53bS5lbmFibGVkOwotCQljb25maWctPnNwcml0ZXNfc2Nh bGVkIHw9IGludGVsX3BsYW5lLT53bS5zY2FsZWQ7Ci0JfQogfQogCiBzdGF0aWMgYm9vbCBza2xf Y29tcHV0ZV9wbGFuZV93bShjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs CkBAIC0zNjgwLDM5ICszNjcxLDYgQEAgc3RhdGljIHZvaWQgc2tsX3VwZGF0ZV93bShzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMpCiAJZGV2X3ByaXYtPndtLnNrbF9odyA9ICpyZXN1bHRzOwogfQogCi1z dGF0aWMgdm9pZAotc2tsX3VwZGF0ZV9zcHJpdGVfd20oc3RydWN0IGRybV9wbGFuZSAqcGxhbmUs IHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKLQkJICAgICB1aW50MzJfdCBzcHJpdGVfd2lkdGgsIHVp bnQzMl90IHNwcml0ZV9oZWlnaHQsCi0JCSAgICAgaW50IHBpeGVsX3NpemUsIGJvb2wgZW5hYmxl ZCwgYm9vbCBzY2FsZWQpCi17Ci0Jc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRv X2ludGVsX3BsYW5lKHBsYW5lKTsKLQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBsYW5l LT5zdGF0ZS0+ZmI7Ci0KLQlpbnRlbF9wbGFuZS0+d20uZW5hYmxlZCA9IGVuYWJsZWQ7Ci0JaW50 ZWxfcGxhbmUtPndtLnNjYWxlZCA9IHNjYWxlZDsKLQlpbnRlbF9wbGFuZS0+d20uaG9yaXpfcGl4 ZWxzID0gc3ByaXRlX3dpZHRoOwotCWludGVsX3BsYW5lLT53bS52ZXJ0X3BpeGVscyA9IHNwcml0 ZV9oZWlnaHQ7Ci0JaW50ZWxfcGxhbmUtPndtLnRpbGluZyA9IERSTV9GT1JNQVRfTU9EX05PTkU7 Ci0KLQkvKiBGb3IgcGxhbmFyOiBCcHAgaXMgZm9yIFVWIHBsYW5lLCB5X0JwcCBpcyBmb3IgWSBw bGFuZSAqLwotCWludGVsX3BsYW5lLT53bS5ieXRlc19wZXJfcGl4ZWwgPQotCQkoZmIgJiYgZmIt PnBpeGVsX2Zvcm1hdCA9PSBEUk1fRk9STUFUX05WMTIpID8KLQkJZHJtX2Zvcm1hdF9wbGFuZV9j cHAocGxhbmUtPnN0YXRlLT5mYi0+cGl4ZWxfZm9ybWF0LCAxKSA6IHBpeGVsX3NpemU7Ci0JaW50 ZWxfcGxhbmUtPndtLnlfYnl0ZXNfcGVyX3BpeGVsID0KLQkJKGZiICYmIGZiLT5waXhlbF9mb3Jt YXQgPT0gRFJNX0ZPUk1BVF9OVjEyKSA/Ci0JCWRybV9mb3JtYXRfcGxhbmVfY3BwKHBsYW5lLT5z dGF0ZS0+ZmItPnBpeGVsX2Zvcm1hdCwgMCkgOiAwOwotCi0JLyoKLQkgKiBGcmFtZWJ1ZmZlciBj YW4gYmUgTlVMTCBvbiBwbGFuZSBkaXNhYmxlLCBidXQgaXQgZG9lcyBub3QKLQkgKiBtYXR0ZXIg Zm9yIHdhdGVybWFya3MgaWYgd2UgYXNzdW1lIG5vIHRpbGluZyBpbiB0aGF0IGNhc2UuCi0JICov Ci0JaWYgKGZiKQotCQlpbnRlbF9wbGFuZS0+d20udGlsaW5nID0gZmItPm1vZGlmaWVyWzBdOwot CWludGVsX3BsYW5lLT53bS5yb3RhdGlvbiA9IHBsYW5lLT5zdGF0ZS0+cm90YXRpb247Ci0KLQlz a2xfdXBkYXRlX3dtKGNydGMpOwotfQotCiBzdGF0aWMgdm9pZCBpbGtfdXBkYXRlX3dtKHN0cnVj dCBkcm1fY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRv X2ludGVsX2NydGMoY3J0Yyk7CkBAIC00MTQ4LDIxICs0MTA2LDYgQEAgdm9pZCBpbnRlbF91cGRh dGVfd2F0ZXJtYXJrcyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJCWRldl9wcml2LT5kaXNwbGF5 LnVwZGF0ZV93bShjcnRjKTsKIH0KIAotdm9pZCBpbnRlbF91cGRhdGVfc3ByaXRlX3dhdGVybWFy a3Moc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCi0JCQkJICAgIHN0cnVjdCBkcm1fY3J0YyAqY3J0 YywKLQkJCQkgICAgdWludDMyX3Qgc3ByaXRlX3dpZHRoLAotCQkJCSAgICB1aW50MzJfdCBzcHJp dGVfaGVpZ2h0LAotCQkJCSAgICBpbnQgcGl4ZWxfc2l6ZSwKLQkJCQkgICAgYm9vbCBlbmFibGVk LCBib29sIHNjYWxlZCkKLXsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBw bGFuZS0+ZGV2LT5kZXZfcHJpdmF0ZTsKLQotCWlmIChkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVf c3ByaXRlX3dtKQotCQlkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfc3ByaXRlX3dtKHBsYW5lLCBj cnRjLAotCQkJCQkJICAgc3ByaXRlX3dpZHRoLCBzcHJpdGVfaGVpZ2h0LAotCQkJCQkJICAgcGl4 ZWxfc2l6ZSwgZW5hYmxlZCwgc2NhbGVkKTsKLX0KLQogLyoqCiAgKiBMb2NrIHByb3RlY3Rpbmcg SVBTIHJlbGF0ZWQgZGF0YSBzdHJ1Y3R1cmVzCiAgKi8KQEAgLTcwNzIsNyArNzAxNSw2IEBAIHZv aWQgaW50ZWxfaW5pdF9wbShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJZGV2X3ByaXYtPmRp c3BsYXkuaW5pdF9jbG9ja19nYXRpbmcgPQogCQkJCXNrbF9pbml0X2Nsb2NrX2dhdGluZzsKIAkJ ZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3dtID0gc2tsX3VwZGF0ZV93bTsKLQkJZGV2X3ByaXYt PmRpc3BsYXkudXBkYXRlX3Nwcml0ZV93bSA9IHNrbF91cGRhdGVfc3ByaXRlX3dtOwogCX0gZWxz ZSBpZiAoSEFTX1BDSF9TUExJVChkZXYpKSB7CiAJCWlsa19zZXR1cF93bV9sYXRlbmN5KGRldik7 CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggNGQyNzI0My4uZmIwOTZlNSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTE4Miw3ICsxODIsNiBAQCBza2xf dXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRybV9wbGFuZSwgc3RydWN0IGRybV9jcnRj ICpjcnRjLAogCWNvbnN0IGludCBwaXBlID0gaW50ZWxfcGxhbmUtPnBpcGU7CiAJY29uc3QgaW50 IHBsYW5lID0gaW50ZWxfcGxhbmUtPnBsYW5lICsgMTsKIAl1MzIgcGxhbmVfY3RsLCBzdHJpZGVf ZGl2LCBzdHJpZGU7Ci0JaW50IHBpeGVsX3NpemUgPSBkcm1fZm9ybWF0X3BsYW5lX2NwcChmYi0+ cGl4ZWxfZm9ybWF0LCAwKTsKIAljb25zdCBzdHJ1Y3QgZHJtX2ludGVsX3Nwcml0ZV9jb2xvcmtl eSAqa2V5ID0KIAkJJnRvX2ludGVsX3BsYW5lX3N0YXRlKGRybV9wbGFuZS0+c3RhdGUpLT5ja2V5 OwogCXVuc2lnbmVkIGxvbmcgc3VyZl9hZGRyOwpAQCAtMjAxLDEwICsyMDAsNiBAQCBza2xfdXBk YXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRybV9wbGFuZSwgc3RydWN0IGRybV9jcnRjICpj cnRjLAogCXJvdGF0aW9uID0gZHJtX3BsYW5lLT5zdGF0ZS0+cm90YXRpb247CiAJcGxhbmVfY3Rs IHw9IHNrbF9wbGFuZV9jdGxfcm90YXRpb24ocm90YXRpb24pOwogCi0JaW50ZWxfdXBkYXRlX3Nw cml0ZV93YXRlcm1hcmtzKGRybV9wbGFuZSwgY3J0Yywgc3JjX3csIHNyY19oLAotCQkJCSAgICAg ICBwaXhlbF9zaXplLCB0cnVlLAotCQkJCSAgICAgICBzcmNfdyAhPSBjcnRjX3cgfHwgc3JjX2gg IT0gY3J0Y19oKTsKLQogCXN0cmlkZV9kaXYgPSBpbnRlbF9mYl9zdHJpZGVfYWxpZ25tZW50KGRl diwgZmItPm1vZGlmaWVyWzBdLAogCQkJCQkgICAgICAgZmItPnBpeGVsX2Zvcm1hdCk7CiAKQEAg LTI4Niw4ICsyODEsNiBAQCBza2xfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxh bmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAogCUk5MTVfV1JJVEUoUExBTkVfU1VSRihwaXBl LCBwbGFuZSksIDApOwogCVBPU1RJTkdfUkVBRChQTEFORV9TVVJGKHBpcGUsIHBsYW5lKSk7Ci0K LQlpbnRlbF91cGRhdGVfc3ByaXRlX3dhdGVybWFya3MoZHBsYW5lLCBjcnRjLCAwLCAwLCAwLCBm YWxzZSwgZmFsc2UpOwogfQogCiBzdGF0aWMgdm9pZApAQCAtNTMwLDEwICs1MjMsNiBAQCBpdmJf dXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNy dGMsCiAJaWYgKElTX0hBU1dFTEwoZGV2KSB8fCBJU19CUk9BRFdFTEwoZGV2KSkKIAkJc3ByY3Rs IHw9IFNQUklURV9QSVBFX0NTQ19FTkFCTEU7CiAKLQlpbnRlbF91cGRhdGVfc3ByaXRlX3dhdGVy bWFya3MocGxhbmUsIGNydGMsIHNyY193LCBzcmNfaCwgcGl4ZWxfc2l6ZSwKLQkJCQkgICAgICAg dHJ1ZSwKLQkJCQkgICAgICAgc3JjX3cgIT0gY3J0Y193IHx8IHNyY19oICE9IGNydGNfaCk7Ci0K IAkvKiBTaXplcyBhcmUgMCBiYXNlZCAqLwogCXNyY193LS07CiAJc3JjX2gtLTsKQEAgLTY2Nywx MCArNjU2LDYgQEAgaWxrX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3Ry dWN0IGRybV9jcnRjICpjcnRjLAogCWlmIChJU19HRU42KGRldikpCiAJCWR2c2NudHIgfD0gRFZT X1RSSUNLTEVfRkVFRF9ESVNBQkxFOyAvKiBtdXN0IGRpc2FibGUgKi8KIAotCWludGVsX3VwZGF0 ZV9zcHJpdGVfd2F0ZXJtYXJrcyhwbGFuZSwgY3J0Yywgc3JjX3csIHNyY19oLAotCQkJCSAgICAg ICBwaXhlbF9zaXplLCB0cnVlLAotCQkJCSAgICAgICBzcmNfdyAhPSBjcnRjX3cgfHwgc3JjX2gg IT0gY3J0Y19oKTsKLQogCS8qIFNpemVzIGFyZSAwIGJhc2VkICovCiAJc3JjX3ctLTsKIAlzcmNf aC0tOwotLSAKMi4xLjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==