From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH v2 16/18] drm/i915: Don't pass pitch to intel_compute_page_offset() Date: Wed, 20 Jan 2016 21:05:37 +0200 Message-ID: <1453316739-13296-17-git-send-email-ville.syrjala@linux.intel.com> References: <1453316739-13296-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 5524D6E951 for ; Wed, 20 Jan 2016 11:06:31 -0800 (PST) In-Reply-To: <1453316739-13296-1-git-send-email-ville.syrjala@linux.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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCmlu dGVsX2NvbXB1dGVfcGFnZV9vZmZzZXQoKSBjYW4gZGlnIHVwIHRoZSBjb3JyZWN0IHBpdGNoIGZy b20gdGhlIGZiCml0c2VsZiwgbm8gbmVlZCBmb3IgdGhlIGNhbGxlciB0byBwYXNzIGl0IGluLgoK QSBiaXQgb2YgZXh0cmEgY2FyZSBpcyBuZWVkZWQgZm9yIHRoZSBsb3dlciBsZXZlbApfaW50ZWxf Y29tcHV0ZV9wYWdlX29mZnNldCgpIHNpbmNlIHRoYXQgb25lIGdldHMgY2FsbGVkIGJlZm9yZSB0 aGUKcm90YXRlZCBwaXRjaCB1bmRlciBpbnRlbF9mYiBpcyBwb3B1bGF0ZWQuIE5vdGUgdGhhdCB3 ZSBkb24ndCBhY3R1YWxseQpjYWxsIGl0IHdpdGggYW55dGhpbmcgYnV0IERSTV9ST1RBVEVfMCB0 aGVyZSBzbyB3ZSB3b3VsZG4ndCBhY3R1YWxseQpsb29rIHVwIHRoZSByb3RhdGVkIHBpdGNoIHRo ZXJlLCBidXQgc3RpbGwsIGxlYXZlIHRoZSBwaXRjaCBhcyBzb21ldGhpbmcKdGhlIGNhbGxlciBo YXMgdG8gcGFzcyB0byBfaW50ZWxfY29tcHV0ZV9wYWdlX29mZnNldCgpIGFzIGFuCmluZGljYXRv ciB0aGF0IHNvbWV0aGluZyBpcyBhIGJpdCBzcGVjaWFsLgoKVGhpcyBsZWF2ZXMgJ3N0cmlkZV9k aXYnIGluIHRoZSBza2wgcGxhbmUgdXBkYXRlIGhvb2tzIGFzIGEgbW9zdGx5IHVzZWxlc3MKdmFy aWFibGUgc28ganVzdCBnZXQgcmlkIG9mIGl0LgoKdjI6IEFkZCBhIG5vdGUgd2h5IHN0cmlkZV9k aXYgZ290IG51a2VkCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmph bGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYyB8IDMwICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDEgLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf c3ByaXRlLmMgIHwgMjYgKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdl ZCwgMjcgaW5zZXJ0aW9ucygrKSwgMzAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCmluZGV4IGVmNjg4OTJmNGUwYS4uZWI4Y2U4YTk5MjkxIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0yNTYyLDExICsyNTYyLDE2IEBAIHN0YXRpYyB1 MzIgX2ludGVsX2NvbXB1dGVfdGlsZV9vZmZzZXQoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAogCiB1bnNpZ25lZCBpbnQgaW50ZWxfY29tcHV0ZV90aWxlX29mZnNldChp bnQgKngsIGludCAqeSwKIAkJCQkgICAgICAgY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAq ZmIsIGludCBwbGFuZSwKLQkJCQkgICAgICAgdW5zaWduZWQgaW50IHBpdGNoLAogCQkJCSAgICAg ICB1bnNpZ25lZCBpbnQgcm90YXRpb24pCiB7CiAJY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShmYi0+ZGV2KTsKIAl1bnNpZ25lZCBpbnQgYWxpZ25tZW50 ID0gaW50ZWxfc3VyZl9hbGlnbm1lbnQoZGV2X3ByaXYsIGZiLT5tb2RpZmllcltwbGFuZV0pOwor CXVuc2lnbmVkIGludCBwaXRjaDsKKworCWlmIChpbnRlbF9yb3RhdGlvbl85MF9vcl8yNzAocm90 YXRpb24pKQorCQlwaXRjaCA9IHRvX2ludGVsX2ZyYW1lYnVmZmVyKGZiKS0+cm90YXRlZFtwbGFu ZV0ucGl0Y2g7CisJZWxzZQorCQlwaXRjaCA9IGZiLT5waXRjaGVzW3BsYW5lXTsKIAogCXJldHVy biBfaW50ZWxfY29tcHV0ZV90aWxlX29mZnNldChkZXZfcHJpdiwgeCwgeSwgZmIsIHBsYW5lLCBw aXRjaCwKIAkJCQkJICByb3RhdGlvbiwgYWxpZ25tZW50ID8gKGFsaWdubWVudCAtIDEpIDogMCk7 CkBAIC0yOTg4LDggKzI5OTMsNyBAQCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV9wcmltYXJ5X3Bs YW5lKHN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnksCiAKIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5n ZW4gPj0gNCkKIAkJaW50ZWxfY3J0Yy0+ZHNwYWRkcl9vZmZzZXQgPQotCQkJaW50ZWxfY29tcHV0 ZV90aWxlX29mZnNldCgmeCwgJnksIGZiLCAwLAotCQkJCQkJICBmYi0+cGl0Y2hlc1swXSwgcm90 YXRpb24pOworCQkJaW50ZWxfY29tcHV0ZV90aWxlX29mZnNldCgmeCwgJnksIGZiLCAwLCByb3Rh dGlvbik7CiAKIAlpZiAocm90YXRpb24gPT0gQklUKERSTV9ST1RBVEVfMTgwKSkgewogCQlkc3Bj bnRyIHw9IERJU1BQTEFORV9ST1RBVEVfMTgwOwpAQCAtMzA5MSw4ICszMDk1LDcgQEAgc3RhdGlj IHZvaWQgaXJvbmxha2VfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcHJp bWFyeSwKIAlpbnRlbF9hZGRfZmJfb2Zmc2V0cygmeCwgJnksIGZiLCAwLCByb3RhdGlvbik7CiAK IAlpbnRlbF9jcnRjLT5kc3BhZGRyX29mZnNldCA9Ci0JCWludGVsX2NvbXB1dGVfdGlsZV9vZmZz ZXQoJngsICZ5LCBmYiwgMCwKLQkJCQkJICBmYi0+cGl0Y2hlc1swXSwgcm90YXRpb24pOworCQlp bnRlbF9jb21wdXRlX3RpbGVfb2Zmc2V0KCZ4LCAmeSwgZmIsIDAsIHJvdGF0aW9uKTsKIAogCWlm IChyb3RhdGlvbiA9PSBCSVQoRFJNX1JPVEFURV8xODApKSB7CiAJCWRzcGNudHIgfD0gRElTUFBM QU5FX1JPVEFURV8xODA7CkBAIC0zMjYzLDcgKzMyNjYsNyBAQCBzdGF0aWMgdm9pZCBza3lsYWtl X3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCXN0cnVjdCBp bnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjX3N0YXRlLT5iYXNlLmNy dGMpOwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmVfc3RhdGUtPmJhc2UuZmI7 CiAJaW50IHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwotCXUzMiBwbGFuZV9jdGwsIHN0cmlkZV9k aXYsIHN0cmlkZTsKKwl1MzIgcGxhbmVfY3RsLCBzdHJpZGU7CiAJdW5zaWduZWQgaW50IHJvdGF0 aW9uID0gcGxhbmVfc3RhdGUtPmJhc2Uucm90YXRpb247CiAJdTMyIHN1cmZfYWRkcjsKIAlpbnQg c2NhbGVyX2lkID0gcGxhbmVfc3RhdGUtPnNjYWxlcl9pZDsKQEAgLTMzMDMsMTcgKzMzMDYsMTYg QEAgc3RhdGljIHZvaWQgc2t5bGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSwKIAkJc3JjX3cgPSBkcm1fcmVjdF93aWR0aCgmcik7CiAJCXNyY19oID0gZHJt X3JlY3RfaGVpZ2h0KCZyKTsKIAotCQlzdHJpZGVfZGl2ID0gaW50ZWxfdGlsZV9oZWlnaHQoZGV2 X3ByaXYsIGZiLT5tb2RpZmllclswXSwgY3BwKTsKLQkJc3RyaWRlID0gaW50ZWxfZmItPnJvdGF0 ZWRbMF0ucGl0Y2g7CisJCXN0cmlkZSA9IGludGVsX2ZiLT5yb3RhdGVkWzBdLnBpdGNoIC8KKwkJ CWludGVsX3RpbGVfaGVpZ2h0KGRldl9wcml2LCBmYi0+bW9kaWZpZXJbMF0sIGNwcCk7CiAJfSBl bHNlIHsKLQkJc3RyaWRlX2RpdiA9IGludGVsX2ZiX3N0cmlkZV9hbGlnbm1lbnQoZGV2X3ByaXYs IGZiLT5tb2RpZmllclswXSwKLQkJCQkJCSAgICAgICBmYi0+cGl4ZWxfZm9ybWF0KTsKLQkJc3Ry aWRlID0gZmItPnBpdGNoZXNbMF07CisJCXN0cmlkZSA9IGZiLT5waXRjaGVzWzBdIC8KKwkJCWlu dGVsX2ZiX3N0cmlkZV9hbGlnbm1lbnQoZGV2X3ByaXYsIGZiLT5tb2RpZmllclswXSwKKwkJCQkJ CSAgZmItPnBpeGVsX2Zvcm1hdCk7CiAJfQogCiAJaW50ZWxfYWRkX2ZiX29mZnNldHMoJnNyY194 LCAmc3JjX3ksIGZiLCAwLCByb3RhdGlvbik7Ci0Jc3VyZl9hZGRyID0gaW50ZWxfY29tcHV0ZV90 aWxlX29mZnNldCgmc3JjX3gsICZzcmNfeSwgZmIsIDAsCi0JCQkJCSAgICAgIHN0cmlkZSwgcm90 YXRpb24pOworCXN1cmZfYWRkciA9IGludGVsX2NvbXB1dGVfdGlsZV9vZmZzZXQoJnNyY194LCAm c3JjX3ksIGZiLCAwLCByb3RhdGlvbik7CiAKIAkvKiBTaXplcyBhcmUgMCBiYXNlZCAqLwogCXNy Y193LS07CkBAIC0zMzI2LDcgKzMzMjgsNyBAQCBzdGF0aWMgdm9pZCBza3lsYWtlX3VwZGF0ZV9w cmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCiAJSTkxNV9XUklURShQTEFO RV9DVEwocGlwZSwgMCksIHBsYW5lX2N0bCk7CiAJSTkxNV9XUklURShQTEFORV9PRkZTRVQocGlw ZSwgMCksIChzcmNfeSA8PCAxNikgfCBzcmNfeCk7Ci0JSTkxNV9XUklURShQTEFORV9TVFJJREUo cGlwZSwgMCksIHN0cmlkZSAvIHN0cmlkZV9kaXYpOworCUk5MTVfV1JJVEUoUExBTkVfU1RSSURF KHBpcGUsIDApLCBzdHJpZGUpOwogCUk5MTVfV1JJVEUoUExBTkVfU0laRShwaXBlLCAwKSwgKHNy Y19oIDw8IDE2KSB8IHNyY193KTsKIAogCWlmIChzY2FsZXJfaWQgPj0gMCkgewpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaAppbmRleCA0NzNiNGNmOWEyZmYuLmUzZGUxZmMzYjA0ZCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTExOTAsNyArMTE5MCw2IEBAIHZvaWQgYXNzZXJ0X3BpcGUo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVtIHBpcGUgcGlwZSwgYm9vbCBz dGF0ZSk7CiAjZGVmaW5lIGFzc2VydF9waXBlX2Rpc2FibGVkKGQsIHApIGFzc2VydF9waXBlKGQs IHAsIGZhbHNlKQogdTMyIGludGVsX2NvbXB1dGVfdGlsZV9vZmZzZXQoaW50ICp4LCBpbnQgKnks CiAJCQkgICAgICBjb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwgaW50IHBsYW5lLAot CQkJICAgICAgdW5zaWduZWQgaW50IHBpdGNoLAogCQkJICAgICAgdW5zaWduZWQgaW50IHJvdGF0 aW9uKTsKIHZvaWQgaW50ZWxfcHJlcGFyZV9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsK IHZvaWQgaW50ZWxfZmluaXNoX3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCA4NjE3NjMwNDE1NWQuLjMxYmUyNGYyNzIwNyAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTE4OSw3ICsxODksNyBAQCBza2xf dXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRybV9wbGFuZSwKIAlzdHJ1Y3QgaW50ZWxf ZnJhbWVidWZmZXIgKmludGVsX2ZiID0gdG9faW50ZWxfZnJhbWVidWZmZXIoZmIpOwogCWNvbnN0 IGludCBwaXBlID0gaW50ZWxfcGxhbmUtPnBpcGU7CiAJY29uc3QgaW50IHBsYW5lID0gaW50ZWxf cGxhbmUtPnBsYW5lICsgMTsKLQl1MzIgcGxhbmVfY3RsLCBzdHJpZGVfZGl2LCBzdHJpZGU7CisJ dTMyIHBsYW5lX2N0bCwgc3RyaWRlOwogCWNvbnN0IHN0cnVjdCBkcm1faW50ZWxfc3ByaXRlX2Nv bG9ya2V5ICprZXkgPSAmcGxhbmVfc3RhdGUtPmNrZXk7CiAJdTMyIHN1cmZfYWRkcjsKIAl1bnNp Z25lZCBpbnQgcm90YXRpb24gPSBwbGFuZV9zdGF0ZS0+YmFzZS5yb3RhdGlvbjsKQEAgLTI0MSwx NyArMjQxLDE2IEBAIHNrbF91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHJtX3BsYW5l LAogCQlzcmNfdyA9IGRybV9yZWN0X3dpZHRoKCZyKTsKIAkJc3JjX2ggPSBkcm1fcmVjdF9oZWln aHQoJnIpOwogCi0JCXN0cmlkZV9kaXYgPSBpbnRlbF90aWxlX2hlaWdodChkZXZfcHJpdiwgZmIt Pm1vZGlmaWVyWzBdLCBjcHApOwotCQlzdHJpZGUgPSBpbnRlbF9mYi0+cm90YXRlZFswXS5waXRj aDsKKwkJc3RyaWRlID0gaW50ZWxfZmItPnJvdGF0ZWRbMF0ucGl0Y2ggLworCQkJaW50ZWxfdGls ZV9oZWlnaHQoZGV2X3ByaXYsIGZiLT5tb2RpZmllclswXSwgY3BwKTsKIAl9IGVsc2UgewotCQlz dHJpZGVfZGl2ID0gaW50ZWxfZmJfc3RyaWRlX2FsaWdubWVudChkZXZfcHJpdiwgZmItPm1vZGlm aWVyWzBdLAotCQkJCQkJICAgICAgIGZiLT5waXhlbF9mb3JtYXQpOwotCQlzdHJpZGUgPSBmYi0+ cGl0Y2hlc1swXTsKKwkJc3RyaWRlID0gZmItPnBpdGNoZXNbMF0gLworCQkJaW50ZWxfZmJfc3Ry aWRlX2FsaWdubWVudChkZXZfcHJpdiwgZmItPm1vZGlmaWVyWzBdLAorCQkJCQkJICBmYi0+cGl4 ZWxfZm9ybWF0KTsKIAl9CiAKIAlpbnRlbF9hZGRfZmJfb2Zmc2V0cygmeCwgJnksIGZiLCAwLCBy b3RhdGlvbik7Ci0Jc3VyZl9hZGRyID0gaW50ZWxfY29tcHV0ZV90aWxlX29mZnNldCgmeCwgJnks IGZiLCAwLAotCQkJCQkgICAgICBzdHJpZGUsIHJvdGF0aW9uKTsKKwlzdXJmX2FkZHIgPSBpbnRl bF9jb21wdXRlX3RpbGVfb2Zmc2V0KCZ4LCAmeSwgZmIsIDAsIHJvdGF0aW9uKTsKIAogCS8qIFNp emVzIGFyZSAwIGJhc2VkICovCiAJc3JjX3ctLTsKQEAgLTI2MCw3ICsyNTksNyBAQCBza2xfdXBk YXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRybV9wbGFuZSwKIAljcnRjX2gtLTsKIAogCUk5 MTVfV1JJVEUoUExBTkVfT0ZGU0VUKHBpcGUsIHBsYW5lKSwgKHkgPDwgMTYpIHwgeCk7Ci0JSTkx NV9XUklURShQTEFORV9TVFJJREUocGlwZSwgcGxhbmUpLCBzdHJpZGUgLyBzdHJpZGVfZGl2KTsK KwlJOTE1X1dSSVRFKFBMQU5FX1NUUklERShwaXBlLCBwbGFuZSksIHN0cmlkZSk7CiAJSTkxNV9X UklURShQTEFORV9TSVpFKHBpcGUsIHBsYW5lKSwgKHNyY19oIDw8IDE2KSB8IHNyY193KTsKIAog CS8qIHByb2dyYW0gcGxhbmUgc2NhbGVyICovCkBAIC00MjgsOCArNDI3LDcgQEAgdmx2X3VwZGF0 ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxhbmUsCiAJY3J0Y19oLS07CiAKIAlpbnRlbF9h ZGRfZmJfb2Zmc2V0cygmeCwgJnksIGZiLCAwLCByb3RhdGlvbik7Ci0Jc3Byc3VyZl9vZmZzZXQg PSBpbnRlbF9jb21wdXRlX3RpbGVfb2Zmc2V0KCZ4LCAmeSwgZmIsIDAsCi0JCQkJCQkgICBmYi0+ cGl0Y2hlc1swXSwgcm90YXRpb24pOworCXNwcnN1cmZfb2Zmc2V0ID0gaW50ZWxfY29tcHV0ZV90 aWxlX29mZnNldCgmeCwgJnksIGZiLCAwLCByb3RhdGlvbik7CiAKIAlpZiAocm90YXRpb24gPT0g QklUKERSTV9ST1RBVEVfMTgwKSkgewogCQlzcHJjdGwgfD0gU1BfUk9UQVRFXzE4MDsKQEAgLTU2 MCw4ICs1NTgsNyBAQCBpdmJfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAog CQlzcHJzY2FsZSA9IFNQUklURV9TQ0FMRV9FTkFCTEUgfCAoc3JjX3cgPDwgMTYpIHwgc3JjX2g7 CiAKIAlpbnRlbF9hZGRfZmJfb2Zmc2V0cygmeCwgJnksIGZiLCAwLCByb3RhdGlvbik7Ci0Jc3By c3VyZl9vZmZzZXQgPSBpbnRlbF9jb21wdXRlX3RpbGVfb2Zmc2V0KCZ4LCAmeSwgZmIsIDAsCi0J CQkJCQkgICBmYi0+cGl0Y2hlc1swXSwgcm90YXRpb24pOworCXNwcnN1cmZfb2Zmc2V0ID0gaW50 ZWxfY29tcHV0ZV90aWxlX29mZnNldCgmeCwgJnksIGZiLCAwLCByb3RhdGlvbik7CiAKIAlpZiAo cm90YXRpb24gPT0gQklUKERSTV9ST1RBVEVfMTgwKSkgewogCQlzcHJjdGwgfD0gU1BSSVRFX1JP VEFURV8xODA7CkBAIC02OTYsOCArNjkzLDcgQEAgaWxrX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZSwKIAkJZHZzc2NhbGUgPSBEVlNfU0NBTEVfRU5BQkxFIHwgKHNyY193IDw8 IDE2KSB8IHNyY19oOwogCiAJaW50ZWxfYWRkX2ZiX29mZnNldHMoJngsICZ5LCBmYiwgMCwgcm90 YXRpb24pOwotCWR2c3N1cmZfb2Zmc2V0ID0gaW50ZWxfY29tcHV0ZV90aWxlX29mZnNldCgmeCwg JnksIGZiLCAwLAotCQkJCQkJICAgZmItPnBpdGNoZXNbMF0sIHJvdGF0aW9uKTsKKwlkdnNzdXJm X29mZnNldCA9IGludGVsX2NvbXB1dGVfdGlsZV9vZmZzZXQoJngsICZ5LCBmYiwgMCwgcm90YXRp b24pOwogCiAJaWYgKHJvdGF0aW9uID09IEJJVChEUk1fUk9UQVRFXzE4MCkpIHsKIAkJZHZzY250 ciB8PSBEVlNfUk9UQVRFXzE4MDsKLS0gCjIuNC4xMAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK