From: ville.syrjala@linux.intel.com Subject: [PATCH 01/14] drm/i915: Track visible planes in a bitmask Date: Mon, 12 Dec 2016 22:35:17 +0200 Message-ID: <1481574931-8658-2-git-send-email-ville.syrjala@linux.intel.com> References: <1481574931-8658-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id C446F6E3F7 for ; Mon, 12 Dec 2016 20:35:36 +0000 (UTC) In-Reply-To: <1481574931-8658-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCklu IGEgbG90IG9mIHBsYWNlIHdlIHdpc2ggdG8ga25vdyB3aGljaCBwbGFuZXMgb24gdGhlIGNydGMg YXJlIGFjdHVhbGx5CnZpc2libGUsIG9yIGhvdyBtYW55IG9mIHRoZW0gdGhlcmUgYXJlLiBMZXQn cyBzdGFydCB0cmFja2luZyB0aGF0IGluIGEKYml0bWFzayBpbiB0aGUgY3J0YyBzdGF0ZS4KCldl IGFscmVhZHkgdHJhY2sgZW5hYmxlZCBwbGFuZXMgKGllLiBvbmVzIHdpdGggYW4gZmIgYW5kIGNy dGMgc3BlY2lmaWVkIGJ5CnRoZSB1c2VyKSBidXQgdGhhdCdzIG5vdCBxdWl0ZSB0aGUgc2FtZSB0 aGluZyBhcyBlbmFibGVkIHBsYW5lcyBtYXkKc3RpbGwgZW5kIHVwIGJlaW5nIGludmlzaWJsZSBk dWUgdG8gY2xpcHBpbmcgYW5kIHdoYXRub3QuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rs w6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2F0b21pY19wbGFuZS5jIHwgIDYgKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMgICAgICB8IDc5ICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICAgICAgIHwgIDMgKysKIDMgZmls ZXMgY2hhbmdlZCwgNjQgaW5zZXJ0aW9ucygrKSwgMjQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYwppbmRleCBkYmU5ZmI0MWFlNTMuLjdlYzEy ZWRkYTRkNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3Bs YW5lLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKQEAg LTE4MSw2ICsxODEsMTIgQEAgc3RhdGljIGludCBpbnRlbF9wbGFuZV9hdG9taWNfY2hlY2soc3Ry dWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAorCS8qIEZJ WE1FIHByZS1nNHggZG9uJ3Qgd29yayBsaWtlIHRoaXMgKi8KKwlpZiAoaW50ZWxfc3RhdGUtPmJh c2UudmlzaWJsZSkKKwkJY3J0Y19zdGF0ZS0+YWN0aXZlX3BsYW5lcyB8PSBCSVQoaW50ZWxfcGxh bmUtPmlkKTsKKwllbHNlCisJCWNydGNfc3RhdGUtPmFjdGl2ZV9wbGFuZXMgJj0gfkJJVChpbnRl bF9wbGFuZS0+aWQpOworCiAJcmV0dXJuIGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMo JmNydGNfc3RhdGUtPmJhc2UsIHN0YXRlKTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCmluZGV4IGJjMWFmODc3ODliYy4uM2YwMjczNDFiMGYzIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0yNzQxLDYgKzI3NDEsMjkgQEAgdXBkYXRlX3N0YXRlX2Zi KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKQogfQogCiBzdGF0aWMgdm9pZAoraW50ZWxfc2V0X3Bs YW5lX3Zpc2libGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCisJCQlzdHJ1 Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlLAorCQkJYm9vbCB2aXNpYmxlKQorewor CXN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZV9zdGF0ZS0+ YmFzZS5wbGFuZSk7CisKKwlwbGFuZV9zdGF0ZS0+YmFzZS52aXNpYmxlID0gdmlzaWJsZTsKKwor CS8qIEZJWE1FIHByZS1nNHggZG9uJ3Qgd29yayBsaWtlIHRoaXMgKi8KKwlpZiAodmlzaWJsZSkg eworCQljcnRjX3N0YXRlLT5iYXNlLnBsYW5lX21hc2sgfD0gQklUKGRybV9wbGFuZV9pbmRleCgm cGxhbmUtPmJhc2UpKTsKKwkJY3J0Y19zdGF0ZS0+YWN0aXZlX3BsYW5lcyB8PSBCSVQocGxhbmUt PmlkKTsKKwl9IGVsc2UgeworCQljcnRjX3N0YXRlLT5iYXNlLnBsYW5lX21hc2sgJj0gfkJJVChk cm1fcGxhbmVfaW5kZXgoJnBsYW5lLT5iYXNlKSk7CisJCWNydGNfc3RhdGUtPmFjdGl2ZV9wbGFu ZXMgJj0gfkJJVChwbGFuZS0+aWQpOworCX0KKworCURSTV9ERUJVR19LTVMoIiVzIGFjdGl2ZSBw bGFuZXMgMHgleFxuIiwKKwkJICAgICAgY3J0Y19zdGF0ZS0+YmFzZS5jcnRjLT5uYW1lLAorCQkg ICAgICBjcnRjX3N0YXRlLT5hY3RpdmVfcGxhbmVzKTsKK30KKworc3RhdGljIHZvaWQKIGludGVs X2ZpbmRfaW5pdGlhbF9wbGFuZV9vYmooc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCiAJ CQkgICAgIHN0cnVjdCBpbnRlbF9pbml0aWFsX3BsYW5lX2NvbmZpZyAqcGxhbmVfY29uZmlnKQog ewpAQCAtMjc5OCw4ICsyODIxLDkgQEAgaW50ZWxfZmluZF9pbml0aWFsX3BsYW5lX29iaihzdHJ1 Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAkgKiBzaW1wbGVzdCBzb2x1dGlvbiBpcyB0byBq dXN0IGRpc2FibGUgdGhlIHByaW1hcnkgcGxhbmUgbm93IGFuZAogCSAqIHByZXRlbmQgdGhlIEJJ T1MgbmV2ZXIgaGFkIGl0IGVuYWJsZWQuCiAJICovCi0JdG9faW50ZWxfcGxhbmVfc3RhdGUocGxh bmVfc3RhdGUpLT5iYXNlLnZpc2libGUgPSBmYWxzZTsKLQljcnRjX3N0YXRlLT5wbGFuZV9tYXNr ICY9IH4oMSA8PCBkcm1fcGxhbmVfaW5kZXgocHJpbWFyeSkpOworCWludGVsX3NldF9wbGFuZV92 aXNpYmxlKHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Y19zdGF0ZSksCisJCQkJdG9faW50ZWxfcGxh bmVfc3RhdGUocGxhbmVfc3RhdGUpLAorCQkJCWZhbHNlKTsKIAlpbnRlbF9wcmVfZGlzYWJsZV9w cmltYXJ5X25vYXRvbWljKCZpbnRlbF9jcnRjLT5iYXNlKTsKIAlpbnRlbF9wbGFuZS0+ZGlzYWJs ZV9wbGFuZShwcmltYXJ5LCAmaW50ZWxfY3J0Yy0+YmFzZSk7CiAKQEAgLTI4MjYsNyArMjg1MCwx MSBAQCBpbnRlbF9maW5kX2luaXRpYWxfcGxhbmVfb2JqKHN0cnVjdCBpbnRlbF9jcnRjICppbnRl bF9jcnRjLAogCWRybV9mcmFtZWJ1ZmZlcl9yZWZlcmVuY2UoZmIpOwogCXByaW1hcnktPmZiID0g cHJpbWFyeS0+c3RhdGUtPmZiID0gZmI7CiAJcHJpbWFyeS0+Y3J0YyA9IHByaW1hcnktPnN0YXRl LT5jcnRjID0gJmludGVsX2NydGMtPmJhc2U7Ci0JaW50ZWxfY3J0Yy0+YmFzZS5zdGF0ZS0+cGxh bmVfbWFzayB8PSAoMSA8PCBkcm1fcGxhbmVfaW5kZXgocHJpbWFyeSkpOworCisJaW50ZWxfc2V0 X3BsYW5lX3Zpc2libGUodG9faW50ZWxfY3J0Y19zdGF0ZShpbnRlbF9jcnRjLT5iYXNlLnN0YXRl KSwKKwkJCQl0b19pbnRlbF9wbGFuZV9zdGF0ZShwcmltYXJ5LT5zdGF0ZSksCisJCQkJdHJ1ZSk7 CisKIAlhdG9taWNfb3IodG9faW50ZWxfcGxhbmUocHJpbWFyeSktPmZyb250YnVmZmVyX2JpdCwK IAkJICAmb2JqLT5mcm9udGJ1ZmZlcl9iaXRzKTsKIH0KQEAgLTEyNDQwLDExICsxMjQ2OCwxMSBA QCBpbnQgaW50ZWxfcGxhbmVfYXRvbWljX2NhbGNfY2hhbmdlcyhzdHJ1Y3QgZHJtX2NydGNfc3Rh dGUgKmNydGNfc3RhdGUsCiAJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnID0g dG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjX3N0YXRlKTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMg PSBjcnRjX3N0YXRlLT5jcnRjOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9f aW50ZWxfY3J0YyhjcnRjKTsKLQlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSA9IHBsYW5lX3N0YXRl LT5wbGFuZTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lID0gdG9faW50ZWxfcGxhbmUocGxh bmVfc3RhdGUtPnBsYW5lKTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2Owog CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1 Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm9sZF9wbGFuZV9zdGF0ZSA9Ci0JCXRvX2ludGVsX3BsYW5l X3N0YXRlKHBsYW5lLT5zdGF0ZSk7CisJCXRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lLT5iYXNl LnN0YXRlKTsKIAlib29sIG1vZGVfY2hhbmdlZCA9IG5lZWRzX21vZGVzZXQoY3J0Y19zdGF0ZSk7 CiAJYm9vbCB3YXNfY3J0Y19lbmFibGVkID0gY3J0Yy0+c3RhdGUtPmFjdGl2ZTsKIAlib29sIGlz X2NydGNfZW5hYmxlZCA9IGNydGNfc3RhdGUtPmFjdGl2ZTsKQEAgLTEyNDUyLDcgKzEyNDgwLDcg QEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlLAogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmVfc3Rh dGUtPmZiOwogCWludCByZXQ7CiAKLQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5ICYmIHBs YW5lLT50eXBlICE9IERSTV9QTEFORV9UWVBFX0NVUlNPUikgeworCWlmIChJTlRFTF9HRU4oZGV2 X3ByaXYpID49IDkgJiYgcGxhbmUtPmlkICE9IFBMQU5FX0NVUlNPUikgewogCQlyZXQgPSBza2xf dXBkYXRlX3NjYWxlcl9wbGFuZSgKIAkJCXRvX2ludGVsX2NydGNfc3RhdGUoY3J0Y19zdGF0ZSks CiAJCQl0b19pbnRlbF9wbGFuZV9zdGF0ZShwbGFuZV9zdGF0ZSkpOwpAQCAtMTI0NzYsOCArMTI1 MDQsMTAgQEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9j cnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCSAqIHBlci1wbGFuZSB3bSBjb21wdXRhdGlvbiB0byB0 aGUgLmNoZWNrX3BsYW5lKCkgaG9vaywgYW5kCiAJICogb25seSBjb21iaW5lIHRoZSByZXN1bHRz IGZyb20gYWxsIHBsYW5lcyBpbiB0aGUgY3VycmVudCBwbGFjZT8KIAkgKi8KLQlpZiAoIWlzX2Ny dGNfZW5hYmxlZCkKKwlpZiAoIWlzX2NydGNfZW5hYmxlZCkgewogCQl0b19pbnRlbF9wbGFuZV9z dGF0ZShwbGFuZV9zdGF0ZSktPmJhc2UudmlzaWJsZSA9IHZpc2libGUgPSBmYWxzZTsKKwkJdG9f aW50ZWxfY3J0Y19zdGF0ZShjcnRjX3N0YXRlKS0+YWN0aXZlX3BsYW5lcyAmPSB+QklUKHBsYW5l LT5pZCk7CisJfQogCiAJaWYgKCF3YXNfdmlzaWJsZSAmJiAhdmlzaWJsZSkKIAkJcmV0dXJuIDA7 CkBAIC0xMjQ4OSwxMyArMTI1MTksMTIgQEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxjX2No YW5nZXMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCXR1cm5fb24gPSB2aXNp YmxlICYmICghd2FzX3Zpc2libGUgfHwgbW9kZV9jaGFuZ2VkKTsKIAogCURSTV9ERUJVR19BVE9N SUMoIltDUlRDOiVkOiVzXSBoYXMgW1BMQU5FOiVkOiVzXSB3aXRoIGZiICVpXG4iLAotCQkJIGlu dGVsX2NydGMtPmJhc2UuYmFzZS5pZCwKLQkJCSBpbnRlbF9jcnRjLT5iYXNlLm5hbWUsCi0JCQkg cGxhbmUtPmJhc2UuaWQsIHBsYW5lLT5uYW1lLAorCQkJIGludGVsX2NydGMtPmJhc2UuYmFzZS5p ZCwgaW50ZWxfY3J0Yy0+YmFzZS5uYW1lLAorCQkJIHBsYW5lLT5iYXNlLmJhc2UuaWQsIHBsYW5l LT5iYXNlLm5hbWUsCiAJCQkgZmIgPyBmYi0+YmFzZS5pZCA6IC0xKTsKIAogCURSTV9ERUJVR19B VE9NSUMoIltQTEFORTolZDolc10gdmlzaWJsZSAlaSAtPiAlaSwgb2ZmICVpLCBvbiAlaSwgbXMg JWlcbiIsCi0JCQkgcGxhbmUtPmJhc2UuaWQsIHBsYW5lLT5uYW1lLAorCQkJIHBsYW5lLT5iYXNl LmJhc2UuaWQsIHBsYW5lLT5iYXNlLm5hbWUsCiAJCQkgd2FzX3Zpc2libGUsIHZpc2libGUsCiAJ CQkgdHVybl9vZmYsIHR1cm5fb24sIG1vZGVfY2hhbmdlZCk7CiAKQEAgLTEyNTAzLDE1ICsxMjUz MiwxNSBAQCBpbnQgaW50ZWxfcGxhbmVfYXRvbWljX2NhbGNfY2hhbmdlcyhzdHJ1Y3QgZHJtX2Ny dGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCXBpcGVfY29uZmlnLT51cGRhdGVfd21fcHJlID0gdHJ1 ZTsKIAogCQkvKiBtdXN0IGRpc2FibGUgY3hzciBhcm91bmQgcGxhbmUgZW5hYmxlL2Rpc2FibGUg Ki8KLQkJaWYgKHBsYW5lLT50eXBlICE9IERSTV9QTEFORV9UWVBFX0NVUlNPUikKKwkJaWYgKHBs YW5lLT5pZCAhPSBQTEFORV9DVVJTT1IpCiAJCQlwaXBlX2NvbmZpZy0+ZGlzYWJsZV9jeHNyID0g dHJ1ZTsKIAl9IGVsc2UgaWYgKHR1cm5fb2ZmKSB7CiAJCXBpcGVfY29uZmlnLT51cGRhdGVfd21f cG9zdCA9IHRydWU7CiAKIAkJLyogbXVzdCBkaXNhYmxlIGN4c3IgYXJvdW5kIHBsYW5lIGVuYWJs ZS9kaXNhYmxlICovCi0JCWlmIChwbGFuZS0+dHlwZSAhPSBEUk1fUExBTkVfVFlQRV9DVVJTT1Ip CisJCWlmIChwbGFuZS0+aWQgIT0gUExBTkVfQ1VSU09SKQogCQkJcGlwZV9jb25maWctPmRpc2Fi bGVfY3hzciA9IHRydWU7Ci0JfSBlbHNlIGlmIChpbnRlbF93bV9uZWVkX3VwZGF0ZShwbGFuZSwg cGxhbmVfc3RhdGUpKSB7CisJfSBlbHNlIGlmIChpbnRlbF93bV9uZWVkX3VwZGF0ZSgmcGxhbmUt PmJhc2UsIHBsYW5lX3N0YXRlKSkgewogCQkvKiBGSVhNRSBib2xsb2NrcyAqLwogCQlwaXBlX2Nv bmZpZy0+dXBkYXRlX3dtX3ByZSA9IHRydWU7CiAJCXBpcGVfY29uZmlnLT51cGRhdGVfd21fcG9z dCA9IHRydWU7CkBAIC0xMjUyMyw3ICsxMjU1Miw3IEBAIGludCBpbnRlbF9wbGFuZV9hdG9taWNf Y2FsY19jaGFuZ2VzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJdG9faW50 ZWxfY3J0Y19zdGF0ZShjcnRjX3N0YXRlKS0+d20ubmVlZF9wb3N0dmJsX3VwZGF0ZSA9IHRydWU7 CiAKIAlpZiAodmlzaWJsZSB8fCB3YXNfdmlzaWJsZSkKLQkJcGlwZV9jb25maWctPmZiX2JpdHMg fD0gdG9faW50ZWxfcGxhbmUocGxhbmUpLT5mcm9udGJ1ZmZlcl9iaXQ7CisJCXBpcGVfY29uZmln LT5mYl9iaXRzIHw9IHBsYW5lLT5mcm9udGJ1ZmZlcl9iaXQ7CiAKIAkvKgogCSAqIFdhQ3hTUkRp c2FibGVkRm9yU3ByaXRlU2NhbGluZzppdmIKQEAgLTEyNTMxLDcgKzEyNTYwLDcgQEAgaW50IGlu dGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRj X3N0YXRlLAogCSAqIGNzdGF0ZS0+dXBkYXRlX3dtIHdhcyBhbHJlYWR5IHNldCBhYm92ZSwgc28g dGhpcyBmbGFnIHdpbGwKIAkgKiB0YWtlIGVmZmVjdCB3aGVuIHdlIGNvbW1pdCBhbmQgcHJvZ3Jh bSB3YXRlcm1hcmtzLgogCSAqLwotCWlmIChwbGFuZS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9P VkVSTEFZICYmIElTX0lWWUJSSURHRShkZXZfcHJpdikgJiYKKwlpZiAocGxhbmUtPmlkID09IFBM QU5FX1NQUklURTAgJiYgSVNfSVZZQlJJREdFKGRldl9wcml2KSAmJgogCSAgICBuZWVkc19zY2Fs aW5nKHRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lX3N0YXRlKSkgJiYKIAkgICAgIW5lZWRzX3Nj YWxpbmcob2xkX3BsYW5lX3N0YXRlKSkKIAkJcGlwZV9jb25maWctPmRpc2FibGVfbHBfd20gPSB0 cnVlOwpAQCAtMTY4NzYsMTUgKzE2OTA1LDE0IEBAIHN0YXRpYyBib29sIHByaW1hcnlfZ2V0X2h3 X3N0YXRlKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUpCiAvKiBGSVhNRSByZWFkIG91dCBmdWxs IHBsYW5lIHN0YXRlIGZvciBhbGwgcGxhbmVzICovCiBzdGF0aWMgdm9pZCByZWFkb3V0X3BsYW5l X3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogewotCXN0cnVjdCBkcm1fcGxhbmUgKnBy aW1hcnkgPSBjcnRjLT5iYXNlLnByaW1hcnk7Ci0Jc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpw bGFuZV9zdGF0ZSA9Ci0JCXRvX2ludGVsX3BsYW5lX3N0YXRlKHByaW1hcnktPnN0YXRlKTsKKwlz dHJ1Y3QgaW50ZWxfcGxhbmUgKnByaW1hcnkgPSB0b19pbnRlbF9wbGFuZShjcnRjLT5iYXNlLnBy aW1hcnkpOworCWJvb2wgdmlzaWJsZTsKIAotCXBsYW5lX3N0YXRlLT5iYXNlLnZpc2libGUgPSBj cnRjLT5hY3RpdmUgJiYKLQkJcHJpbWFyeV9nZXRfaHdfc3RhdGUodG9faW50ZWxfcGxhbmUocHJp bWFyeSkpOworCXZpc2libGUgPSBjcnRjLT5hY3RpdmUgJiYgcHJpbWFyeV9nZXRfaHdfc3RhdGUo cHJpbWFyeSk7CiAKLQlpZiAocGxhbmVfc3RhdGUtPmJhc2UudmlzaWJsZSkKLQkJY3J0Yy0+YmFz ZS5zdGF0ZS0+cGxhbmVfbWFzayB8PSAxIDw8IGRybV9wbGFuZV9pbmRleChwcmltYXJ5KTsKKwlp bnRlbF9zZXRfcGxhbmVfdmlzaWJsZSh0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPmJhc2Uuc3Rh dGUpLAorCQkJCXRvX2ludGVsX3BsYW5lX3N0YXRlKHByaW1hcnktPmJhc2Uuc3RhdGUpLAorCQkJ CXZpc2libGUpOwogfQogCiBzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3Rh dGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKQEAgLTE3MTcxLDcgKzE3MTk5LDEwIEBAIHZvaWQg aW50ZWxfbW9kZXNldF9nZW1faW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJYy0+cHJp bWFyeS0+ZmIgPSBOVUxMOwogCQkJYy0+cHJpbWFyeS0+Y3J0YyA9IGMtPnByaW1hcnktPnN0YXRl LT5jcnRjID0gTlVMTDsKIAkJCXVwZGF0ZV9zdGF0ZV9mYihjLT5wcmltYXJ5KTsKLQkJCWMtPnN0 YXRlLT5wbGFuZV9tYXNrICY9IH4oMSA8PCBkcm1fcGxhbmVfaW5kZXgoYy0+cHJpbWFyeSkpOwor CisJCQlpbnRlbF9zZXRfcGxhbmVfdmlzaWJsZSh0b19pbnRlbF9jcnRjX3N0YXRlKGMtPnN0YXRl KSwKKwkJCQkJCXRvX2ludGVsX3BsYW5lX3N0YXRlKGMtPnByaW1hcnktPnN0YXRlKSwKKwkJCQkJ CWZhbHNlKTsKIAkJfQogCX0KIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggOGY0ZGRj YTBmNTIxLi4yMGJhOGY0OGJjM2IgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC02Njks NiArNjY5LDkgQEAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgewogCiAJLyogR2FtbWEgbW9kZSBw cm9ncmFtbWVkIG9uIHRoZSBwaXBlICovCiAJdWludDMyX3QgZ2FtbWFfbW9kZTsKKworCS8qIGJp dG1hc2sgb2YgdmlzaWJsZSBwbGFuZXMgKGVudW0gcGxhbmVfaWQpICovCisJdTggYWN0aXZlX3Bs YW5lczsKIH07CiAKIHN0cnVjdCB2bHZfd21fc3RhdGUgewotLSAKMi43LjQKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=