From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 13/14] drm/i915: Complete plane hw and uapi split, v2. Date: Thu, 24 Oct 2019 14:48:04 +0200 Message-ID: <20191024124805.26840-13-maarten.lankhorst@linux.intel.com> References: <20191024124805.26840-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id A92C36E3D6 for ; Thu, 24 Oct 2019 12:48:11 +0000 (UTC) In-Reply-To: <20191024124805.26840-1-maarten.lankhorst@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 U3BsaXR0aW5nIHBsYW5lIHN0YXRlIGlzIGVhc2llciB0aGFuIHNwbGl0dGluZyBjcnRjX3N0YXRl LApiZWZvcmUgcGxhbmUgY2hlY2sgd2UgY29weSB0aGUgZHJtIHByb3BlcnRpZXMgdG8gaHcgc28g d2UgY2FuCmRvIHRoZSBzYW1lIGluIGJpZ2pvaW5lciBsYXRlciBvbi4KCldlIGNvcHkgdGhlIHN0 YXRlIGFmdGVyIHdlIGRpZCBhbGwgdGhlIG1vZGVzZXQgaGFuZGxpbmcsIGJ1dCBmb3J0dW5hdGVs eQppOTE1IHNlZW1zIHRvIGJlIHNwbGl0IGNvcnJlY3RseSBhbmQgbm90aGluZyBkdXJpbmcgbW9k ZXNldCBsb29rcwphdCBwbGFuZV9zdGF0ZS4KCkNoYW5nZXMgc2luY2UgdjE6Ci0gRG8gbm90IGNs ZWFyIGh3IHN0YXRlIG9uIGR1cGxpY2F0aW9uLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5r aG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiAuLi4vZ3B1L2Ry bS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljX3BsYW5lLmMgfCAzNyArKysrKysrKysrKysrKysr KystCiAuLi4vZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljX3BsYW5lLmggfCAgMiAr CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYyAgfCAgMSArCiAu Li4vZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5X3R5cGVzLmggICAgfCAyMyArKysrKysr KystLS0KIDQgZmlsZXMgY2hhbmdlZCwgNTcgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0b21pY19w bGFuZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWNfcGxhbmUu YwppbmRleCBlNDA0NGFiYzJkMjEuLmQ5YjY1ZTljNDVmYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWNfcGxhbmUuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0b21pY19wbGFuZS5jCkBAIC05Myw2ICs5MywxMCBA QCBpbnRlbF9wbGFuZV9kdXBsaWNhdGVfc3RhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCiAJ aW50ZWxfc3RhdGUtPnZtYSA9IE5VTEw7CiAJaW50ZWxfc3RhdGUtPmZsYWdzID0gMDsKIAorCS8q IGFkZCByZWZlcmVuY2UgdG8gZmIgKi8KKwlpZiAoaW50ZWxfc3RhdGUtPmh3LmZiKQorCQlkcm1f ZnJhbWVidWZmZXJfZ2V0KGludGVsX3N0YXRlLT5ody5mYik7CisKIAlyZXR1cm4gJmludGVsX3N0 YXRlLT51YXBpOwogfQogCkBAIC0xMTIsNiArMTE2LDggQEAgaW50ZWxfcGxhbmVfZGVzdHJveV9z dGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlXQVJOX09OKHBsYW5lX3N0YXRlLT52bWEp OwogCiAJX19kcm1fYXRvbWljX2hlbHBlcl9wbGFuZV9kZXN0cm95X3N0YXRlKCZwbGFuZV9zdGF0 ZS0+dWFwaSk7CisJaWYgKHBsYW5lX3N0YXRlLT5ody5mYikKKwkJZHJtX2ZyYW1lYnVmZmVyX3B1 dChwbGFuZV9zdGF0ZS0+aHcuZmIpOwogCWtmcmVlKHBsYW5lX3N0YXRlKTsKIH0KIApAQCAtMTM4 LDE1ICsxNDQsNDQgQEAgdW5zaWduZWQgaW50IGludGVsX3BsYW5lX2RhdGFfcmF0ZShjb25zdCBz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAlyZXR1cm4gY3BwICogY3J0Y19z dGF0ZS0+cGl4ZWxfcmF0ZTsKIH0KIAorc3RhdGljIHZvaWQgaW50ZWxfcGxhbmVfY2xlYXJfaHdf c3RhdGUoc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKK3sKKwlpZiAocGxh bmVfc3RhdGUtPmh3LmZiKQorCQlkcm1fZnJhbWVidWZmZXJfcHV0KHBsYW5lX3N0YXRlLT5ody5m Yik7CisKKwltZW1zZXQoJnBsYW5lX3N0YXRlLT5odywgMCwgc2l6ZW9mKHBsYW5lX3N0YXRlLT5o dykpOworfQorCit2b2lkIGludGVsX3BsYW5lX2NvcHlfdWFwaV90b19od19zdGF0ZShzdHJ1Y3Qg aW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlLAorCQkJCSAgICAgICBjb25zdCBzdHJ1Y3Qg aW50ZWxfcGxhbmVfc3RhdGUgKmZyb21fcGxhbmVfc3RhdGUpCit7CisJaW50ZWxfcGxhbmVfY2xl YXJfaHdfc3RhdGUocGxhbmVfc3RhdGUpOworCisJcGxhbmVfc3RhdGUtPmh3LmNydGMgPSBmcm9t X3BsYW5lX3N0YXRlLT51YXBpLmNydGM7CisJcGxhbmVfc3RhdGUtPmh3LmZiID0gZnJvbV9wbGFu ZV9zdGF0ZS0+dWFwaS5mYjsKKwlpZiAocGxhbmVfc3RhdGUtPmh3LmZiKQorCQlkcm1fZnJhbWVi dWZmZXJfZ2V0KHBsYW5lX3N0YXRlLT5ody5mYik7CisKKwlwbGFuZV9zdGF0ZS0+aHcuYWxwaGEg PSBmcm9tX3BsYW5lX3N0YXRlLT51YXBpLmFscGhhOworCXBsYW5lX3N0YXRlLT5ody5waXhlbF9i bGVuZF9tb2RlID0KKwkJZnJvbV9wbGFuZV9zdGF0ZS0+dWFwaS5waXhlbF9ibGVuZF9tb2RlOwor CXBsYW5lX3N0YXRlLT5ody5yb3RhdGlvbiA9IGZyb21fcGxhbmVfc3RhdGUtPnVhcGkucm90YXRp b247CisJcGxhbmVfc3RhdGUtPmh3LmNvbG9yX2VuY29kaW5nID0gZnJvbV9wbGFuZV9zdGF0ZS0+ dWFwaS5jb2xvcl9lbmNvZGluZzsKKwlwbGFuZV9zdGF0ZS0+aHcuY29sb3JfcmFuZ2UgPSBmcm9t X3BsYW5lX3N0YXRlLT51YXBpLmNvbG9yX3JhbmdlOworfQorCiBpbnQgaW50ZWxfcGxhbmVfYXRv bWljX2NoZWNrX3dpdGhfc3RhdGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9j cnRjX3N0YXRlLAogCQkJCQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGUs CiAJCQkJCWNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqb2xkX3BsYW5lX3N0YXRlLAog CQkJCQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm5ld19wbGFuZV9zdGF0ZSkKIHsKIAlzdHJ1 Y3QgaW50ZWxfcGxhbmUgKnBsYW5lID0gdG9faW50ZWxfcGxhbmUobmV3X3BsYW5lX3N0YXRlLT51 YXBpLnBsYW5lKTsKLQljb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IG5ld19wbGFu ZV9zdGF0ZS0+aHcuZmI7CisJY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmI7CiAJaW50 IHJldDsKIAorCWludGVsX3BsYW5lX2NvcHlfdWFwaV90b19od19zdGF0ZShuZXdfcGxhbmVfc3Rh dGUsIG5ld19wbGFuZV9zdGF0ZSk7CisJZmIgPSBuZXdfcGxhbmVfc3RhdGUtPmh3LmZiOworCiAJ bmV3X2NydGNfc3RhdGUtPmFjdGl2ZV9wbGFuZXMgJj0gfkJJVChwbGFuZS0+aWQpOwogCW5ld19j cnRjX3N0YXRlLT5udjEyX3BsYW5lcyAmPSB+QklUKHBsYW5lLT5pZCk7CiAJbmV3X2NydGNfc3Rh dGUtPmM4X3BsYW5lcyAmPSB+QklUKHBsYW5lLT5pZCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0b21pY19wbGFuZS5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWNfcGxhbmUuaAppbmRleCBkYzg1YWYwMmU5YjcuLjEy MzQwNGE5Y2YyMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRl bF9hdG9taWNfcGxhbmUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVs X2F0b21pY19wbGFuZS5oCkBAIC0yMCw2ICsyMCw4IEBAIGV4dGVybiBjb25zdCBzdHJ1Y3QgZHJt X3BsYW5lX2hlbHBlcl9mdW5jcyBpbnRlbF9wbGFuZV9oZWxwZXJfZnVuY3M7CiAKIHVuc2lnbmVk IGludCBpbnRlbF9wbGFuZV9kYXRhX3JhdGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNydGNfc3RhdGUsCiAJCQkJICAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFu ZV9zdGF0ZSk7Cit2b2lkIGludGVsX3BsYW5lX2NvcHlfdWFwaV90b19od19zdGF0ZShzdHJ1Y3Qg aW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlLAorCQkJCSAgICAgICBjb25zdCBzdHJ1Y3Qg aW50ZWxfcGxhbmVfc3RhdGUgKmZyb21fcGxhbmVfc3RhdGUpOwogdm9pZCBpbnRlbF91cGRhdGVf cGxhbmUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwKIAkJCWNvbnN0IHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRl ICpwbGFuZV9zdGF0ZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5 L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlz cGxheS5jCmluZGV4IDEyZjIzMGE0MWYyZi4uMjMzMGFjMjRmZDRkIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYwpAQCAtMzI2Nyw2ICszMjY3LDcgQEAg aW50ZWxfZmluZF9pbml0aWFsX3BsYW5lX29iaihzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0 YywKIAogCXBsYW5lX3N0YXRlLT5mYiA9IGZiOwogCXBsYW5lX3N0YXRlLT5jcnRjID0gJmludGVs X2NydGMtPmJhc2U7CisJaW50ZWxfcGxhbmVfY29weV91YXBpX3RvX2h3X3N0YXRlKGludGVsX3N0 YXRlLCBpbnRlbF9zdGF0ZSk7CiAKIAlhdG9taWNfb3IodG9faW50ZWxfcGxhbmUocHJpbWFyeSkt PmZyb250YnVmZmVyX2JpdCwKIAkJICAmdG9faW50ZWxfZnJvbnRidWZmZXIoZmIpLT5iaXRzKTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheV90 eXBlcy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5X3R5cGVz LmgKaW5kZXggZDJhOTg0Zjg0NDY0Li4yMTA1YTI3YzUwZTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheV90eXBlcy5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheV90eXBlcy5oCkBAIC01MTUsMTEgKzUx NSwyNCBAQCBzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlIHsKIH07CiAKIHN0cnVjdCBpbnRlbF9w bGFuZV9zdGF0ZSB7Ci0JdW5pb24gewotCQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlIGJhc2U7Ci0J CXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgdWFwaTsKLQkJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSBo dzsKLQl9OworCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgdWFwaTsKKworCS8qCisJICogYWN0dWFs IGhhcmR3YXJlIHN0YXRlLCB0aGUgc3RhdGUgd2UgcHJvZ3JhbSB0byB0aGUgaGFyZHdhcmUuCisJ ICogVGhlIGZvbGxvd2luZyBtZW1iZXJzIGFyZSB1c2VkIHRvIHZlcmlmeSB0aGUgaGFyZHdhcmUg c3RhdGU6CisJICogRHVyaW5nIGluaXRpYWwgaHcgcmVhZG91dCwgdGhleSBuZWVkIHRvIGJlIGNv cGllZCBmcm9tIHVhcGkuCisJICovCisJc3RydWN0IHsKKwkJc3RydWN0IGRybV9jcnRjICpjcnRj OworCQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYjsKKworCQl1MTYgYWxwaGE7CisJCXVpbnQx Nl90IHBpeGVsX2JsZW5kX21vZGU7CisJCXVuc2lnbmVkIGludCByb3RhdGlvbjsKKwkJZW51bSBk cm1fY29sb3JfZW5jb2RpbmcgY29sb3JfZW5jb2Rpbmc7CisJCWVudW0gZHJtX2NvbG9yX3Jhbmdl IGNvbG9yX3JhbmdlOworCX0gaHc7CisKIAlzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgdmlldzsKIAlz dHJ1Y3QgaTkxNV92bWEgKnZtYTsKIAl1bnNpZ25lZCBsb25nIGZsYWdzOwotLSAKMi4yMy4wCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00628CA9EAF for ; Thu, 24 Oct 2019 12:48:26 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D5BC5205C9 for ; Thu, 24 Oct 2019 12:48:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D5BC5205C9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2BFA86E3CE; Thu, 24 Oct 2019 12:48:25 +0000 (UTC) Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id A92C36E3D6 for ; Thu, 24 Oct 2019 12:48:11 +0000 (UTC) From: Maarten Lankhorst To: intel-gfx@lists.freedesktop.org Date: Thu, 24 Oct 2019 14:48:04 +0200 Message-Id: <20191024124805.26840-13-maarten.lankhorst@linux.intel.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191024124805.26840-1-maarten.lankhorst@linux.intel.com> References: <20191024124805.26840-1-maarten.lankhorst@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 13/14] drm/i915: Complete plane hw and uapi split, v2. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Message-ID: <20191024124804.HYFQxC0Yeao43rwP4DVv_8mTYQa7oioFePvKSLmWvoM@z> U3BsaXR0aW5nIHBsYW5lIHN0YXRlIGlzIGVhc2llciB0aGFuIHNwbGl0dGluZyBjcnRjX3N0YXRl LApiZWZvcmUgcGxhbmUgY2hlY2sgd2UgY29weSB0aGUgZHJtIHByb3BlcnRpZXMgdG8gaHcgc28g d2UgY2FuCmRvIHRoZSBzYW1lIGluIGJpZ2pvaW5lciBsYXRlciBvbi4KCldlIGNvcHkgdGhlIHN0 YXRlIGFmdGVyIHdlIGRpZCBhbGwgdGhlIG1vZGVzZXQgaGFuZGxpbmcsIGJ1dCBmb3J0dW5hdGVs eQppOTE1IHNlZW1zIHRvIGJlIHNwbGl0IGNvcnJlY3RseSBhbmQgbm90aGluZyBkdXJpbmcgbW9k ZXNldCBsb29rcwphdCBwbGFuZV9zdGF0ZS4KCkNoYW5nZXMgc2luY2UgdjE6Ci0gRG8gbm90IGNs ZWFyIGh3IHN0YXRlIG9uIGR1cGxpY2F0aW9uLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5r aG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiAuLi4vZ3B1L2Ry bS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljX3BsYW5lLmMgfCAzNyArKysrKysrKysrKysrKysr KystCiAuLi4vZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljX3BsYW5lLmggfCAgMiAr CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYyAgfCAgMSArCiAu Li4vZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5X3R5cGVzLmggICAgfCAyMyArKysrKysr KystLS0KIDQgZmlsZXMgY2hhbmdlZCwgNTcgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0b21pY19w bGFuZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWNfcGxhbmUu YwppbmRleCBlNDA0NGFiYzJkMjEuLmQ5YjY1ZTljNDVmYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWNfcGxhbmUuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0b21pY19wbGFuZS5jCkBAIC05Myw2ICs5MywxMCBA QCBpbnRlbF9wbGFuZV9kdXBsaWNhdGVfc3RhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCiAJ aW50ZWxfc3RhdGUtPnZtYSA9IE5VTEw7CiAJaW50ZWxfc3RhdGUtPmZsYWdzID0gMDsKIAorCS8q IGFkZCByZWZlcmVuY2UgdG8gZmIgKi8KKwlpZiAoaW50ZWxfc3RhdGUtPmh3LmZiKQorCQlkcm1f ZnJhbWVidWZmZXJfZ2V0KGludGVsX3N0YXRlLT5ody5mYik7CisKIAlyZXR1cm4gJmludGVsX3N0 YXRlLT51YXBpOwogfQogCkBAIC0xMTIsNiArMTE2LDggQEAgaW50ZWxfcGxhbmVfZGVzdHJveV9z dGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlXQVJOX09OKHBsYW5lX3N0YXRlLT52bWEp OwogCiAJX19kcm1fYXRvbWljX2hlbHBlcl9wbGFuZV9kZXN0cm95X3N0YXRlKCZwbGFuZV9zdGF0 ZS0+dWFwaSk7CisJaWYgKHBsYW5lX3N0YXRlLT5ody5mYikKKwkJZHJtX2ZyYW1lYnVmZmVyX3B1 dChwbGFuZV9zdGF0ZS0+aHcuZmIpOwogCWtmcmVlKHBsYW5lX3N0YXRlKTsKIH0KIApAQCAtMTM4 LDE1ICsxNDQsNDQgQEAgdW5zaWduZWQgaW50IGludGVsX3BsYW5lX2RhdGFfcmF0ZShjb25zdCBz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAlyZXR1cm4gY3BwICogY3J0Y19z dGF0ZS0+cGl4ZWxfcmF0ZTsKIH0KIAorc3RhdGljIHZvaWQgaW50ZWxfcGxhbmVfY2xlYXJfaHdf c3RhdGUoc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKK3sKKwlpZiAocGxh bmVfc3RhdGUtPmh3LmZiKQorCQlkcm1fZnJhbWVidWZmZXJfcHV0KHBsYW5lX3N0YXRlLT5ody5m Yik7CisKKwltZW1zZXQoJnBsYW5lX3N0YXRlLT5odywgMCwgc2l6ZW9mKHBsYW5lX3N0YXRlLT5o dykpOworfQorCit2b2lkIGludGVsX3BsYW5lX2NvcHlfdWFwaV90b19od19zdGF0ZShzdHJ1Y3Qg aW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlLAorCQkJCSAgICAgICBjb25zdCBzdHJ1Y3Qg aW50ZWxfcGxhbmVfc3RhdGUgKmZyb21fcGxhbmVfc3RhdGUpCit7CisJaW50ZWxfcGxhbmVfY2xl YXJfaHdfc3RhdGUocGxhbmVfc3RhdGUpOworCisJcGxhbmVfc3RhdGUtPmh3LmNydGMgPSBmcm9t X3BsYW5lX3N0YXRlLT51YXBpLmNydGM7CisJcGxhbmVfc3RhdGUtPmh3LmZiID0gZnJvbV9wbGFu ZV9zdGF0ZS0+dWFwaS5mYjsKKwlpZiAocGxhbmVfc3RhdGUtPmh3LmZiKQorCQlkcm1fZnJhbWVi dWZmZXJfZ2V0KHBsYW5lX3N0YXRlLT5ody5mYik7CisKKwlwbGFuZV9zdGF0ZS0+aHcuYWxwaGEg PSBmcm9tX3BsYW5lX3N0YXRlLT51YXBpLmFscGhhOworCXBsYW5lX3N0YXRlLT5ody5waXhlbF9i bGVuZF9tb2RlID0KKwkJZnJvbV9wbGFuZV9zdGF0ZS0+dWFwaS5waXhlbF9ibGVuZF9tb2RlOwor CXBsYW5lX3N0YXRlLT5ody5yb3RhdGlvbiA9IGZyb21fcGxhbmVfc3RhdGUtPnVhcGkucm90YXRp b247CisJcGxhbmVfc3RhdGUtPmh3LmNvbG9yX2VuY29kaW5nID0gZnJvbV9wbGFuZV9zdGF0ZS0+ dWFwaS5jb2xvcl9lbmNvZGluZzsKKwlwbGFuZV9zdGF0ZS0+aHcuY29sb3JfcmFuZ2UgPSBmcm9t X3BsYW5lX3N0YXRlLT51YXBpLmNvbG9yX3JhbmdlOworfQorCiBpbnQgaW50ZWxfcGxhbmVfYXRv bWljX2NoZWNrX3dpdGhfc3RhdGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9j cnRjX3N0YXRlLAogCQkJCQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGUs CiAJCQkJCWNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqb2xkX3BsYW5lX3N0YXRlLAog CQkJCQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm5ld19wbGFuZV9zdGF0ZSkKIHsKIAlzdHJ1 Y3QgaW50ZWxfcGxhbmUgKnBsYW5lID0gdG9faW50ZWxfcGxhbmUobmV3X3BsYW5lX3N0YXRlLT51 YXBpLnBsYW5lKTsKLQljb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IG5ld19wbGFu ZV9zdGF0ZS0+aHcuZmI7CisJY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmI7CiAJaW50 IHJldDsKIAorCWludGVsX3BsYW5lX2NvcHlfdWFwaV90b19od19zdGF0ZShuZXdfcGxhbmVfc3Rh dGUsIG5ld19wbGFuZV9zdGF0ZSk7CisJZmIgPSBuZXdfcGxhbmVfc3RhdGUtPmh3LmZiOworCiAJ bmV3X2NydGNfc3RhdGUtPmFjdGl2ZV9wbGFuZXMgJj0gfkJJVChwbGFuZS0+aWQpOwogCW5ld19j cnRjX3N0YXRlLT5udjEyX3BsYW5lcyAmPSB+QklUKHBsYW5lLT5pZCk7CiAJbmV3X2NydGNfc3Rh dGUtPmM4X3BsYW5lcyAmPSB+QklUKHBsYW5lLT5pZCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0b21pY19wbGFuZS5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWNfcGxhbmUuaAppbmRleCBkYzg1YWYwMmU5YjcuLjEy MzQwNGE5Y2YyMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRl bF9hdG9taWNfcGxhbmUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVs X2F0b21pY19wbGFuZS5oCkBAIC0yMCw2ICsyMCw4IEBAIGV4dGVybiBjb25zdCBzdHJ1Y3QgZHJt X3BsYW5lX2hlbHBlcl9mdW5jcyBpbnRlbF9wbGFuZV9oZWxwZXJfZnVuY3M7CiAKIHVuc2lnbmVk IGludCBpbnRlbF9wbGFuZV9kYXRhX3JhdGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNydGNfc3RhdGUsCiAJCQkJICAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFu ZV9zdGF0ZSk7Cit2b2lkIGludGVsX3BsYW5lX2NvcHlfdWFwaV90b19od19zdGF0ZShzdHJ1Y3Qg aW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlLAorCQkJCSAgICAgICBjb25zdCBzdHJ1Y3Qg aW50ZWxfcGxhbmVfc3RhdGUgKmZyb21fcGxhbmVfc3RhdGUpOwogdm9pZCBpbnRlbF91cGRhdGVf cGxhbmUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwKIAkJCWNvbnN0IHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRl ICpwbGFuZV9zdGF0ZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5 L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlz cGxheS5jCmluZGV4IDEyZjIzMGE0MWYyZi4uMjMzMGFjMjRmZDRkIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYwpAQCAtMzI2Nyw2ICszMjY3LDcgQEAg aW50ZWxfZmluZF9pbml0aWFsX3BsYW5lX29iaihzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0 YywKIAogCXBsYW5lX3N0YXRlLT5mYiA9IGZiOwogCXBsYW5lX3N0YXRlLT5jcnRjID0gJmludGVs X2NydGMtPmJhc2U7CisJaW50ZWxfcGxhbmVfY29weV91YXBpX3RvX2h3X3N0YXRlKGludGVsX3N0 YXRlLCBpbnRlbF9zdGF0ZSk7CiAKIAlhdG9taWNfb3IodG9faW50ZWxfcGxhbmUocHJpbWFyeSkt PmZyb250YnVmZmVyX2JpdCwKIAkJICAmdG9faW50ZWxfZnJvbnRidWZmZXIoZmIpLT5iaXRzKTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheV90 eXBlcy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5X3R5cGVz LmgKaW5kZXggZDJhOTg0Zjg0NDY0Li4yMTA1YTI3YzUwZTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheV90eXBlcy5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheV90eXBlcy5oCkBAIC01MTUsMTEgKzUx NSwyNCBAQCBzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlIHsKIH07CiAKIHN0cnVjdCBpbnRlbF9w bGFuZV9zdGF0ZSB7Ci0JdW5pb24gewotCQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlIGJhc2U7Ci0J CXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgdWFwaTsKLQkJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSBo dzsKLQl9OworCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgdWFwaTsKKworCS8qCisJICogYWN0dWFs IGhhcmR3YXJlIHN0YXRlLCB0aGUgc3RhdGUgd2UgcHJvZ3JhbSB0byB0aGUgaGFyZHdhcmUuCisJ ICogVGhlIGZvbGxvd2luZyBtZW1iZXJzIGFyZSB1c2VkIHRvIHZlcmlmeSB0aGUgaGFyZHdhcmUg c3RhdGU6CisJICogRHVyaW5nIGluaXRpYWwgaHcgcmVhZG91dCwgdGhleSBuZWVkIHRvIGJlIGNv cGllZCBmcm9tIHVhcGkuCisJICovCisJc3RydWN0IHsKKwkJc3RydWN0IGRybV9jcnRjICpjcnRj OworCQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYjsKKworCQl1MTYgYWxwaGE7CisJCXVpbnQx Nl90IHBpeGVsX2JsZW5kX21vZGU7CisJCXVuc2lnbmVkIGludCByb3RhdGlvbjsKKwkJZW51bSBk cm1fY29sb3JfZW5jb2RpbmcgY29sb3JfZW5jb2Rpbmc7CisJCWVudW0gZHJtX2NvbG9yX3Jhbmdl IGNvbG9yX3JhbmdlOworCX0gaHc7CisKIAlzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgdmlldzsKIAlz dHJ1Y3QgaTkxNV92bWEgKnZtYTsKIAl1bnNpZ25lZCBsb25nIGZsYWdzOwotLSAKMi4yMy4wCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=