From: Ville Syrjala Subject: [PATCH 4/5] drm/i915: Make primary/sprite zpos configurable on VLV/CHV Date: Tue, 29 May 2018 21:28:03 +0300 Message-ID: <20180529182804.8571-4-ville.syrjala@linux.intel.com> References: <20180529182804.8571-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 010ED6E50D for ; Tue, 29 May 2018 18:28:16 +0000 (UTC) In-Reply-To: <20180529182804.8571-1-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClZM Vi9DSFYgY2FuIGNoYW5nZSB0aGUgeiBvcmRlciBiZXR3ZWVuIHRoZSBwcmltYXJ5IGFuZCBzcHJp dGUgcGxhbmVzCmZyZWVseS4gTGV0J3MgZXhwb3NlIHRoYXQgY2FwYWJpbGl0eSBieSBtYWtpbmcg dGhlIHpwb3MgcHJvcGVydHkKbXV0YWJsZS4gVGhlIGN1cnNvciBwbGFuZSBpcyBhbHdheXMgb24g dG9wLCBzbyB0aGUgY3Vyc29yIHpwb3MgaXMKbGVmdCBhcyBhbiBpbW11dGFibGUgcHJvcGVydHku CgpUaGUgd2F5IHRoZSBoYXJkd2FyZSBpcyBjb25maWd1cmVkIGlzIGEgYml0IGF3a3dhcmQuIEJv dGggc3ByaXRlIHBsYW5lcwpoYXZlIGEgImJvdHRvbSIgYW5kICJ6b3JkZXIiIGJpdHMsIGJ1dCB0 aGUgd2F5IHRoZXkgaW50ZXJhY3QgYmV0d2VlbnMKdGhlIHNwcml0ZXMgZG9lc24ndCBzZWVtIGVu dGlyZWx5IGxvZ2ljYWwuIFRoZSBzcGVjIGRvZXNuJ3QgZXZlbiBsaXN0CmFsbCAxNiBwb3NzaWJs ZSBjb21iaW5hdGlvbnMgKGp1c3QgMTAgYXJlIGxpc3RlZCksIGJ1dCBJJ3ZlIGdvbmUgdGhyb3Vn aAp0aGVtIGFsbCB0aGUgZGlzY292ZXJlZCB0aGUgZm9sbG93aW5nIHJlbGF0aW9uc2hpcDoKCnNw cml0ZSAwCXNwcml0ZSAxCXJlc3VsdGluZyBwbGFuZSBvcmRlciAoYm90dG9tIHRvIHRvcCkKQiBa CQlCIFoKMCAwCQkwIDAJCVAgMCAxCSAgZDAoc2VlIG5vdGUpLGQxLGQwMSxkMDFwCjAgMAkJMCAx CQlQIDAgMQkqCjAgMAkJMSAwCQkxIFAgMAkqIGQwCjAgMAkJMSAxCQkxIFAgMAowIDEJCTAgMAkJ UCAxIDAJKgowIDEJCTAgMQkJUCAwIDEKMCAxCQkxIDAJCTEgMCBQCSogZHAKMCAxCQkxIDEJCTEg MCBQCjEgMAkJMCAwCQkwIFAgMQkqIGQxCjEgMAkJMCAxCQkwIDEgUAkqIGRwCjEgMAkJMSAwCQlQ IDAgMQoxIDAJCTEgMQkJUCAwIDEKMSAxCQkwIDAJCTAgUCAxCjEgMQkJMCAxCQkwIDEgUAoxIDEJ CTEgMAkJUCAwIDEKMSAxCQkxIDEJCVAgMCAxCgpbQj1ib3R0b20gYml0IFo9em9yZGVyIGJpdCwg MD1zcHJpdGUgMCwgMT1zcHJpdGUgMSwgUD1wcmltYXJ5LAogZDA9c3ByaXRlIDAgZGlzYWJsZWQs IGQxPXNwcml0ZSAxIGRpc2FibGVkLCBkcD1wcmltYXJ5IGRpc2FibGVkLAogZDAxPWJvdGggc3By aXRlcywgZDAxcD1ib3RoIHNwcml0ZXMgYW5kIHByaW1hcnkgZGlzYWJsZWRdCgpEaXNhYmxpbmcg YW55IG9uZSBvciB0d28gcGxhbmVzIGRvZXNuJ3Qgc2VlbSB0byBpbnRlcmZlcmUgd2l0aCB0aGUK cmVzdWx0aW5nIHBsYW5lIG9yZGVyIGluIGFuIHVuZXhwZWN0ZWQgd2F5LiBUaGUgYm90dG9tIGFu ZCB6b3JkZXIKYml0cyBvZiB0aGUgZGlzYWJsZWQgcGxhbmVzIGFyZSBzdGlsbCBlZmZlY3RpdmUg dGhvdWdoLCBzbyB3ZSBtdXN0IGJlCmNhcmVmdWwgd2hhdCB3ZSBsZWF2ZSBpbiB0aG9zZSBiaXRz IHdoZW4gdGhlIHBsYW5lIGlzIGRpc2FibGVkLgoKV2hhdCB3ZSBkbyBmb3IgZW5hYmxlZCBzcHJp dGUgcGxhbmVzIGlzIHNldCBib3R0b209MSBpZiB0aGUgcGxhbmUgaXMKYXQgdGhlIGJvdHRvbSwg ZWxzZSB3ZSBzZXQgem9yZGVyPTEgaWYgdGhlIHBsYW5lIGlzIGp1c3QgYWJvdmUKdGhlIG90aGVy IHNwcml0ZSBwbGFuZS4gVGhpcyB3aWxsIGVuZCB1cCBwaWNraW5nIHRoZSBjb25maWd1cmF0aW9u cwptYXJrZWQgd2l0aCAqIGZyb20gdGhlIHRhYmxlIHdoZW4gYm90aCBzcHJpdGUgcGxhbmVzIGFy ZSBlbmFibGVkLgoKRm9yIHRoZSBkaXNhYmxlZCBwbGFuZSBjYXNlcyB3ZSBqdXN0IGxlYXZlIGJv dHRvbT0wIGFuZCB6b3JkZXI9MApmb3IgYW55IGRpc2FibGVkIHNwcml0ZSBwbGFuZS4gQW55IGVu YWJsZWQgc3ByaXRlIHBsYW5lIHdpbGwgc3RpbGwKZm9sbG93IHRoZSBydWxlIGxhaWQgb3V0IGJl Zm9yZS4gRm9yIHRoZSBwdXJwb3NlcyBvZiB0aGF0IHJ1bGUsCndlJ2xsIGNvbnNpZGVyIGFueSBk aXNhYmxlZCBwbGFuZSB0byBiZSBzdGFja2VkIG9uIHRvcCBvZiB0aGUKZW5hYmxlZCBwbGFuZXMu IFRoaXMgd2lsbCBlbmQgdXAgcGlja2luZyB0aGUgY29uZmlndXJhdGlvbnMgbWFya2VkCmQwIHdo ZW4gc3ByaXRlIDAgaXMgZGlzYWJsZWQsIGQxIHdoZW4gc3ByaXRlIDEgaXMgZGlzYWJsZWQsCmRw IHdoZW4gdGhlIHByaW1hcnkgaXMgZGlzYWJsZWQsIGFuZCBkMDEgd2hlbiBib3RoIHNwcml0ZXMg YXJlCmRpc2FibGVkIChhbmQgZDAxcCBpcyBhY3R1YWxseSB0aGUgc2FtZSB0aGluZyB3aXRoIGp1 c3QgcHJpbWFyeQpkaXNhYmxlZCBhcyB3ZWxsKS4KClRoZSB1c2Ugb2YgdGhlICdQIDAgMScgY29u ZmlndXJhdGlvbiBmb3IgdGhlIGZpcnN0IGQwIGNhc2UgZG9lc24ndApyZWFsbHkgbWFrZSBzZW5z ZSBiYXNlZCBvbiB0aGUgYWJvdmUsIGJ1dCBnaXZlbiB0aGUgd2F5IHRoZSB6b3JkZXIKYml0cyB3 b3JrLCB0aGVyZSdzIG5vIG5pY2Ugd2F5IHRvIHBpY2sgdGhlICdQIDEgMCcgKHdoaWNoIHdvdWxk IGJlCnRoZSBsb2dpY2FsIHRoaW5nKSB3aGVuIHNwcml0ZSAwIGlzIGRpc2FibGVkIGFzIHRoYXQg d291bGQgcmVxdWlyZQpzZXR0aW5nIHRoZSB6b3JkZXIgYml0IGluIHRoZSBzcHJpdGUgMCBjb250 cm9sIHJlZ2lzdGVyLCBidXQgYXMKc3RhdGVkIHdlIGFsd2F5cyBzZXQgYm90aCBiaXRzIHRvIDAg Zm9yIGRpc2FibGVkIHBsYW5lcy4gVGhhdCB3YXkKd2UgZG9uJ3QgaGF2ZSB0byByZWNvbmZpZ3Vy ZSBhbHJlYWR5IGRpc2FibGVkIHBsYW5lcyB0byBjaGFuZ2UgdGhlCnpvcmRlciBiZXR3ZWVuIHRo ZSBjdXJyZW50bHkgYWN0aXZlIHBsYW5lcywgYW5kIG1vcmUgaW1wb3JhbnRseSB3ZQpkb24ndCBu ZWVkIHRvIGNvbnN1bHQgYW55IHBsYW5lL2NydGMgc3RhdGUgaW4gdGhlIC5kaXNhYmxlX3BsYW5l KCkKaG9vay4gVGhpcyBzbGlnaHQgaXJyZWd1bGFyaXR5IGRvZXNuJ3QgbWF0dGVyIGluIHRoZSBl bmQgYXMgYm90aApvZiB0aGVzZSBjb25maWd1cmF0aW9zIHdpbGwgZ2l2ZSB1cyB0aGUgZXhwZWN0 ZWQgdmlzaWJsZSAnUCAxJwpyZXN1bHQuCgp2MjogUmVkbyB0aGUgZmluYWwgenBvcyBjb21wdXRh dGlvbiB0byBub3QgcmVxdWlyZSBldmVyeSBwbGFuZQogICAgb24gdGhlIGNydGMgdG8gYmUgcGFy dCBvZiB0aGUgc3RhdGUKdjM6IE1vcmUgcG9saXNoCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJq w6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfcmVnLmggICAgICAgICAgIHwgICAyICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2F0b21pY19wbGFuZS5jIHwgICA4ICsrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMgICAgICB8IDE0NiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuaCAgICAgIHwgICA5ICsrCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgICAgICB8ICAgNyArKwogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgICAgICAgfCAgMjQgKysrKy0KIDYgZmlsZXMgY2hhbmdl ZCwgMTkyIGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVn LmgKaW5kZXggZjIzOGI3YjMzY2Q5Li40NGVhYzVmZmMyY2UgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9y ZWcuaApAQCAtNjI2NSw2ICs2MjY1LDggQEAgZW51bSB7CiAjZGVmaW5lICAgU1BfUk9UQVRFXzE4 MAkJCSgxPDwxNSkKICNkZWZpbmUgICBTUF9USUxFRAkJCSgxPDwxMCkKICNkZWZpbmUgICBTUF9N SVJST1IJCQkoMTw8OCkgLyogQ0hWIHBpcGUgQiAqLworI2RlZmluZSAgIFNQX0JPVFRPTQkJCSgx PDwyKQorI2RlZmluZSAgIFNQX1pPUkRFUgkJCSgxPDwwKQogI2RlZmluZSBfU1BBTElOT0ZGCQko VkxWX0RJU1BMQVlfQkFTRSArIDB4NzIxODQpCiAjZGVmaW5lIF9TUEFTVFJJREUJCShWTFZfRElT UExBWV9CQVNFICsgMHg3MjE4OCkKICNkZWZpbmUgX1NQQVBPUwkJCShWTFZfRElTUExBWV9CQVNF ICsgMHg3MjE4YykKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21p Y19wbGFuZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKaW5k ZXggNmQwNjg3ODZlYjQxLi5hNWEzMTIzNTg5ZTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2F0b21pY19wbGFuZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2F0b21pY19wbGFuZS5jCkBAIC0xOTMsNiArMTkzLDE0IEBAIGludCBpbnRlbF9wbGFuZV9h dG9taWNfY2hlY2tfd2l0aF9zdGF0ZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xk X2NydGNfCiAJZWxzZQogCQljcnRjX3N0YXRlLT5udjEyX3BsYW5lcyAmPSB+QklUKGludGVsX3Bs YW5lLT5pZCk7CiAKKwkvKgorCSAqIENvcHkgb3ZlciB0aGUgenBvcyB0byB0aGUgY3J0YyBzdGF0 ZSBzbyB0aGF0IHdlIGRvbid0CisJICogbmVlZCB0byBhZGQgZXZlcnkgcGxhbmUgb24gdGhlIGNy dGMgdG8gdGhlIHN0YXRlIHRvCisJICogcmVjb21wdXRlIHRoZSBmaW5hbCB6cG9zLgorCSAqLwor CWNydGNfc3RhdGUtPnJhd196cG9zW2ludGVsX3BsYW5lLT5pZF0gPQorCQlpbnRlbF9wbGFuZV9y YXdfenBvcyhjcnRjX3N0YXRlLCBpbnRlbF9zdGF0ZSk7CisKIAlyZXR1cm4gaW50ZWxfcGxhbmVf YXRvbWljX2NhbGNfY2hhbmdlcyhvbGRfY3J0Y19zdGF0ZSwKIAkJCQkJICAgICAgICZjcnRjX3N0 YXRlLT5iYXNlLAogCQkJCQkgICAgICAgb2xkX3BsYW5lX3N0YXRlLApkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCmluZGV4IGJjM2RlMWI1YmI4OS4uMTExY2IwYzFkYTU0IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSA8 bGludXgvaTJjLmg+CiAjaW5jbHVkZSA8bGludXgva2VybmVsLmg+CiAjaW5jbHVkZSA8bGludXgv c2xhYi5oPgorI2luY2x1ZGUgPGxpbnV4L3NvcnQuaD4KICNpbmNsdWRlIDxsaW51eC92Z2FhcmIu aD4KICNpbmNsdWRlIDxkcm0vZHJtX2VkaWQuaD4KICNpbmNsdWRlIDxkcm0vZHJtUC5oPgpAQCAt Mjc2MCw2ICsyNzYxLDggQEAgaW50ZWxfc2V0X3BsYW5lX3Zpc2libGUoc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCWNydGNfc3RhdGUtPmFjdGl2ZV9wbGFuZXMgJj0gfkJJ VChwbGFuZS0+aWQpOwogCX0KIAorCWNydGNfc3RhdGUtPnJhd196cG9zW3BsYW5lLT5pZF0gPSBp bnRlbF9wbGFuZV9yYXdfenBvcyhjcnRjX3N0YXRlLCBwbGFuZV9zdGF0ZSk7CisKIAlEUk1fREVC VUdfS01TKCIlcyBhY3RpdmUgcGxhbmVzIDB4JXhcbiIsCiAJCSAgICAgIGNydGNfc3RhdGUtPmJh c2UuY3J0Yy0+bmFtZSwKIAkJICAgICAgY3J0Y19zdGF0ZS0+YWN0aXZlX3BsYW5lcyk7CkBAIC0z MjA4LDggKzMyMTEsOCBAQCBpbnQgc2tsX2NoZWNrX3BsYW5lX3N1cmZhY2UoY29uc3Qgc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiBzdGF0aWMgdTMyIGk5eHhfcGxhbmVfY3Rs KGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkJICBjb25zdCBz dHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlKQogewotCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9Ci0JCXRvX2k5MTUocGxhbmVfc3RhdGUtPmJhc2UucGxhbmUt PmRldik7CisJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5l X3N0YXRlLT5iYXNlLnBsYW5lKTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB0b19pOTE1KHBsYW5lLT5iYXNlLmRldik7CiAJc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0 b19pbnRlbF9jcnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0Yyk7CiAJY29uc3Qgc3RydWN0IGRybV9m cmFtZWJ1ZmZlciAqZmIgPSBwbGFuZV9zdGF0ZS0+YmFzZS5mYjsKIAl1bnNpZ25lZCBpbnQgcm90 YXRpb24gPSBwbGFuZV9zdGF0ZS0+YmFzZS5yb3RhdGlvbjsKQEAgLTEwOTMyLDYgKzEwOTM1LDcg QEAgY2xlYXJfaW50ZWxfY3J0Y19zdGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19z dGF0ZSkKIAlzdHJ1Y3QgaW50ZWxfZHBsbF9od19zdGF0ZSBkcGxsX2h3X3N0YXRlOwogCXN0cnVj dCBpbnRlbF9zaGFyZWRfZHBsbCAqc2hhcmVkX2RwbGw7CiAJc3RydWN0IGludGVsX2NydGNfd21f c3RhdGUgd21fc3RhdGU7CisJdTggcmF3X3pwb3NbSTkxNV9NQVhfUExBTkVTXTsKIAlib29sIGZv cmNlX3RocnUsIGlwc19mb3JjZV9kaXNhYmxlOwogCiAJLyogRklYTUU6IGJlZm9yZSB0aGUgc3dp dGNoIHRvIGF0b21pYyBzdGFydGVkLCBhIG5ldyBwaXBlX2NvbmZpZyB3YXMKQEAgLTEwOTQ3LDYg KzEwOTUxLDcgQEAgY2xlYXJfaW50ZWxfY3J0Y19zdGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3J0Y19zdGF0ZSkKIAlpZiAoSVNfRzRYKGRldl9wcml2KSB8fAogCSAgICBJU19WQUxMRVlW SUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJd21fc3RhdGUgPSBj cnRjX3N0YXRlLT53bTsKKwltZW1jcHkocmF3X3pwb3MsIGNydGNfc3RhdGUtPnJhd196cG9zLCBz aXplb2YocmF3X3pwb3MpKTsKIAogCS8qIEtlZXAgYmFzZSBkcm1fY3J0Y19zdGF0ZSBpbnRhY3Qs IG9ubHkgY2xlYXIgb3VyIGV4dGVuZGVkIHN0cnVjdCAqLwogCUJVSUxEX0JVR19PTihvZmZzZXRv ZihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSwgYmFzZSkpOwpAQCAtMTA5NjEsNiArMTA5NjYsNyBA QCBjbGVhcl9pbnRlbF9jcnRjX3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0 YXRlKQogCWlmIChJU19HNFgoZGV2X3ByaXYpIHx8CiAJICAgIElTX1ZBTExFWVZJRVcoZGV2X3By aXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQljcnRjX3N0YXRlLT53bSA9IHdtX3N0 YXRlOworCW1lbWNweShjcnRjX3N0YXRlLT5yYXdfenBvcywgcmF3X3pwb3MsIHNpemVvZihyYXdf enBvcykpOwogfQogCiBzdGF0aWMgaW50CkBAIC0xMjE2MSw2ICsxMjE2NywxMzAgQEAgc3RhdGlj IGludCBjYWxjX3dhdGVybWFya19kYXRhKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkK IAlyZXR1cm4gMDsKIH0KIAoraW50IGludGVsX3BsYW5lX3Jhd196cG9zKGNvbnN0IHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAorCQkJIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFu ZV9zdGF0ZSAqcGxhbmVfc3RhdGUpCit7CisJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSA9IHRv X2ludGVsX3BsYW5lKHBsYW5lX3N0YXRlLT5iYXNlLnBsYW5lKTsKKworCS8qCisJICogV2UnbGwg a2VlcCB0aGUgY3Vyc29yIGFsd2F5cyBhdCB0aGUgdG9wIHJlZ2FyZGxlc3Mgb2YKKwkgKiB3aGV0 aGVyIGl0J3MgZW5hYmxlZCBvciBub3QuIFRoaXMgYXZvaWRzIGNoYW5nZXMgdG8gdGhlCisJICog c29ydGVkIHpwb3Mgb2Ygb3RoZXIgcGxhbmVzIHdoZW4gdHVybmluZyB0aGUgY3Vyc29yIG9uL29m ZiwKKwkgKiBhbmQgdGh1cyB3ZSBjYW4gZWFzaWx5IGF2b2lkIGhhdmluZyB0byBhZGQgdGhlIG90 aGVyCisJICogcGxhbmVzIHRvIHRoZSBhdG9taWMgc3RhdGUuCisJICovCisJaWYgKHBsYW5lLT5p ZCA9PSBQTEFORV9DVVJTT1IpCisJCXJldHVybiAweDIwOworCisJLyoKKwkgKiBGb3Igb3RoZXIg cGxhbmVzIHdlIHN0YWNrIHRoZSBkaXNhYmxlZCBwbGFuZXMgb24gdG9wCisJICogb2YgYW55IGVu YWJsZWQgcGxhbmVzLiBUaGlzIHNpbXBsaWZpZXMgb3VyIGxpZmUgYnkKKwkgKiBhbGxvd2luZyB1 cyB0byBrZWVwIHRoZSBTUF9CT1RUT00gYW5kIFNQX1pPUkRFUiBiaXRzCisJICogY2xlYXJlZCBm b3IgYW55IGRpc2FibGVkIHBsYW5lcyBvbiBWTFYvQ0hWLiBUaHVzIHdlCisJICogZG9uJ3QgaGF2 ZSB0byB3b3JyeSBhYm91dCB6cG9zIGluIC5kaXNhYmxlX3BsYW5lKCkuCisJICovCisJaWYgKHBs YW5lX3N0YXRlLT5iYXNlLnZpc2libGUpCisJCXJldHVybiBwbGFuZV9zdGF0ZS0+YmFzZS56cG9z OworCWVsc2UKKwkJcmV0dXJuIDB4MTA7Cit9CisKK3N0cnVjdCBpbnRlbF9wbGFuZV96cG9zIHsK Kwl1MzIgb2JqX2lkOworCWVudW0gcGxhbmVfaWQgcGxhbmVfaWQ7CisJdTggenBvczsKK307CisK K3N0YXRpYyBpbnQgaW50ZWxfenBvc19jbXAoY29uc3Qgdm9pZCAqYSwgY29uc3Qgdm9pZCAqYikK K3sKKwljb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfenBvcyAqemEgPSAoY29uc3Qgc3RydWN0IGlu dGVsX3BsYW5lX3pwb3MgKilhOworCWNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV96cG9zICp6YiA9 IChjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfenBvcyAqKWI7CisKKwlpZiAoemEtPnpwb3MgIT0g emItPnpwb3MpCisJCXJldHVybiB6YS0+enBvcyAtIHpiLT56cG9zOworCWVsc2UKKwkJcmV0dXJu IHphLT5vYmpfaWQgLSB6Yi0+b2JqX2lkOworfQorCitzdGF0aWMgdm9pZCB2bHZfbm9ybWFsaXpl X3pwb3Moc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCit7CisJc3RydWN0IGlu dGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0Yyk7CisJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRl dik7CisJc3RydWN0IGludGVsX3BsYW5lX3pwb3MgenBvc1tJOTE1X01BWF9QTEFORVNdID0ge307 CisJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZTsKKwlpbnQgaSwgbnVtX3BsYW5lczsKKworCWkg PSAwOworCWZvcl9lYWNoX2ludGVsX3BsYW5lX29uX2NydGMoJmRldl9wcml2LT5kcm0sIGNydGMs IHBsYW5lKSB7CisJCXpwb3NbaV0ub2JqX2lkID0gcGxhbmUtPmJhc2UuYmFzZS5pZDsKKwkJenBv c1tpXS5wbGFuZV9pZCA9IHBsYW5lLT5pZDsKKwkJenBvc1tpXS56cG9zID0gY3J0Y19zdGF0ZS0+ cmF3X3pwb3NbcGxhbmUtPmlkXTsKKwkJaSsrOworCX0KKworCW51bV9wbGFuZXMgPSBpOworCisJ Lyogc29ydCBhY2NvcmRpbmcgdG8genBvcy9wbGFuZSBvYmogaWQgKi8KKwlzb3J0KHpwb3MsIG51 bV9wbGFuZXMsIHNpemVvZih6cG9zWzBdKSwKKwkgICAgIGludGVsX3pwb3NfY21wLCBOVUxMKTsK KworCS8qIGNvcHkgb3ZlciBzb3J0ZWQgenBvcyAqLworCWZvciAoaSA9IDA7IGkgPCBudW1fcGxh bmVzOyBpKyspIHsKKwkJZW51bSBwbGFuZV9pZCBwbGFuZV9pZCA9IHpwb3NbaV0ucGxhbmVfaWQ7 CisKKwkJY3J0Y19zdGF0ZS0+enBvc1twbGFuZV9pZF0gPSBpOworCX0KK30KKworc3RhdGljIGlu dCB2bHZfdXBkYXRlX3pwb3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJ ICAgc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUpCit7CisJc3RydWN0IGludGVsX2Ny dGMgKmNydGM7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLCAqbmV3 X2NydGNfc3RhdGU7CisJaW50IGk7CisKKwlmb3JfZWFjaF9vbGRuZXdfaW50ZWxfY3J0Y19pbl9z dGF0ZShzdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIG5ld19jcnRjX3N0YXRlLCBpKSB7CisJ CXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOworCQlib29sIHNwcml0ZXNfY2hhbmdlZDsKKworCQl2 bHZfbm9ybWFsaXplX3pwb3MobmV3X2NydGNfc3RhdGUpOworCisJCXNwcml0ZXNfY2hhbmdlZCA9 CisJCQltZW1jbXAobmV3X2NydGNfc3RhdGUtPnpwb3MsCisJCQkgICAgICAgb2xkX2NydGNfc3Rh dGUtPnpwb3MsCisJCQkgICAgICAgc2l6ZW9mKG5ld19jcnRjX3N0YXRlLT56cG9zKSkgIT0gMDsK KworCQlpZiAoIXNwcml0ZXNfY2hhbmdlZCkKKwkJCWNvbnRpbnVlOworCisJCWRybV9mb3JfZWFj aF9wbGFuZV9tYXNrKHBsYW5lLCAmZGV2X3ByaXYtPmRybSwKKwkJCQkJbmV3X2NydGNfc3RhdGUt PmJhc2UucGxhbmVfbWFzaykgeworCQkJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3Rh dGU7CisJCQllbnVtIHBsYW5lX2lkIHBsYW5lX2lkID0gdG9faW50ZWxfcGxhbmUocGxhbmUpLT5p ZDsKKworCQkJaWYgKHBsYW5lX2lkID09IFBMQU5FX0NVUlNPUiB8fAorCQkJICAgIHBsYW5lX2lk ID09IFBMQU5FX1BSSU1BUlkpCisJCQkJY29udGludWU7CisKKwkJCS8qCisJCQkgKiB6cG9zIGlz IGNvbmZpZ3VyZWQgdmlhIHNwcml0ZSByZWdpc3RlcnMsIHNvIG11c3QKKwkJCSAqIGFkZCB0aGVt IHRvIHRoZSBzdGF0ZSBpZiBhbnl0aGluZyBzaWduaWZpY2FudAorCQkJICogY2hhbmdlZC4KKwkJ CSAqLworCQkJcGxhbmVfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9wbGFuZV9zdGF0ZSgmc3RhdGUt PmJhc2UsIHBsYW5lKTsKKwkJCWlmIChJU19FUlIocGxhbmVfc3RhdGUpKQorCQkJCXJldHVybiBQ VFJfRVJSKHBsYW5lX3N0YXRlKTsKKwkJfQorCisJCURSTV9ERUJVR19LTVMoInBpcGUgJWMgenBv cyBzcHJpdGUgJWM6ICVkLCBzcHJpdGUgJWM6ICVkXG4iLAorCQkJICAgICAgcGlwZV9uYW1lKGNy dGMtPnBpcGUpLAorCQkJICAgICAgc3ByaXRlX25hbWUoY3J0Yy0+cGlwZSwgMCksIG5ld19jcnRj X3N0YXRlLT56cG9zW1BMQU5FX1NQUklURTBdLAorCQkJICAgICAgc3ByaXRlX25hbWUoY3J0Yy0+ cGlwZSwgMSksIG5ld19jcnRjX3N0YXRlLT56cG9zW1BMQU5FX1NQUklURTFdKTsKKwl9CisKKwly ZXR1cm4gMDsKK30KKwogLyoqCiAgKiBpbnRlbF9hdG9taWNfY2hlY2sgLSB2YWxpZGF0ZSBzdGF0 ZSBvYmplY3QKICAqIEBkZXY6IGRybSBkZXZpY2UKQEAgLTEyMjM2LDcgKzEyMzY2LDE0IEBAIHN0 YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaWYg KHJldCkKIAkJcmV0dXJuIHJldDsKIAorCWlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJ U19DSEVSUllWSUVXKGRldl9wcml2KSkgeworCQlyZXQgPSB2bHZfdXBkYXRlX3pwb3MoZGV2X3By aXYsIGludGVsX3N0YXRlKTsKKwkJaWYgKHJldCkKKwkJCXJldHVybiByZXQ7CisJfQorCiAJaW50 ZWxfZmJjX2Nob29zZV9jcnRjKGRldl9wcml2LCBpbnRlbF9zdGF0ZSk7CisKIAlyZXR1cm4gY2Fs Y193YXRlcm1hcmtfZGF0YShzdGF0ZSk7CiB9CiAKQEAgLTEzNTkyLDcgKzEzNzI5LDEwIEBAIGlu dGVsX3ByaW1hcnlfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwgZW51bSBwaXBlIHBpcGUpCiAJCQkJCQkgIERSTV9DT0xPUl9ZQ0JDUl9MSU1JVEVEX1JBTkdF KTsKIAogCXpwb3MgPSAwOwotCWRybV9wbGFuZV9jcmVhdGVfenBvc19pbW11dGFibGVfcHJvcGVy dHkoJnByaW1hcnktPmJhc2UsIHpwb3MpOworCWlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8 fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkKKwkJZHJtX3BsYW5lX2NyZWF0ZV96cG9zX3Byb3Bl cnR5KCZwcmltYXJ5LT5iYXNlLCB6cG9zLCAwLCAyKTsKKwllbHNlCisJCWRybV9wbGFuZV9jcmVh dGVfenBvc19pbW11dGFibGVfcHJvcGVydHkoJnByaW1hcnktPmJhc2UsIHpwb3MpOwogCiAJZHJt X3BsYW5lX2hlbHBlcl9hZGQoJnByaW1hcnktPmJhc2UsICZpbnRlbF9wbGFuZV9oZWxwZXJfZnVu Y3MpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5Lmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmgKaW5kZXggMmVmMzE2MTc2MTRh Li4wOWJiZDlhM2VmZDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmgKQEAgLTMz Myw2ICszMzMsMTUgQEAgc3RydWN0IGludGVsX2xpbmtfbV9uIHsKIAkgICAgIChfX2kpKyspIFwK IAkJZm9yX2VhY2hfaWYocGxhbmUpCiAKKyNkZWZpbmUgZm9yX2VhY2hfb2xkbmV3X2ludGVsX2Ny dGNfaW5fc3RhdGUoX19zdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIG5ld19jcnRjX3N0YXRl LCBfX2kpIFwKKwlmb3IgKChfX2kpID0gMDsgXAorCSAgICAgKF9faSkgPCAoX19zdGF0ZSktPmJh c2UuZGV2LT5tb2RlX2NvbmZpZy5udW1fY3J0YyAmJiBcCisJCSAgICAgKChjcnRjKSA9IHRvX2lu dGVsX2NydGMoKF9fc3RhdGUpLT5iYXNlLmNydGNzW19faV0ucHRyKSwgXAorCQkgICAgICAob2xk X2NydGNfc3RhdGUpID0gdG9faW50ZWxfY3J0Y19zdGF0ZSgoX19zdGF0ZSktPmJhc2UuY3J0Y3Nb X19pXS5vbGRfc3RhdGUpLCBcCisJCSAgICAgIChuZXdfY3J0Y19zdGF0ZSkgPSB0b19pbnRlbF9j cnRjX3N0YXRlKChfX3N0YXRlKS0+YmFzZS5jcnRjc1tfX2ldLm5ld19zdGF0ZSksIDEpOyBcCisJ ICAgICAoX19pKSsrKSBcCisJCWZvcl9lYWNoX2lmKGNydGMpCisKIHZvaWQgaW50ZWxfbGlua19j b21wdXRlX21fbihpbnQgYnBwLCBpbnQgbmxhbmVzLAogCQkJICAgIGludCBwaXhlbF9jbG9jaywg aW50IGxpbmtfY2xvY2ssCiAJCQkgICAgc3RydWN0IGludGVsX2xpbmtfbV9uICptX24sCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGZkNjI1NjYzMjQ4Mi4uOTk0Yjk0NzNiODE3IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtODkwLDYgKzg5MCwxMCBAQCBzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSB7CiAJdTggYWN0aXZlX3BsYW5lczsKIAl1OCBudjEyX3BsYW5lczsKIAorCS8q IFZMVi9DSFYgenBvcyBmb3IgZWFjaCBwbGFuZSAqLworCXU4IHJhd196cG9zW0k5MTVfTUFYX1BM QU5FU107IC8qIHJhdyBwcm9wZXJ0eSB2YWx1ZSAob3IgMHhmZiBmb3IgZGlzYWJsZWQgcGxhbmVz KSAqLworCXU4IHpwb3NbSTkxNV9NQVhfUExBTkVTXTsgLyogZmluYWwgenBvcyBmb3IgZWFjaCBw bGFuZSAqLworCiAJLyogSERNSSBzY3JhbWJsaW5nIHN0YXR1cyAqLwogCWJvb2wgaGRtaV9zY3Jh bWJsaW5nOwogCkBAIC0xNDU3LDYgKzE0NjEsOSBAQCB2b2lkIGludGVsX2R1bXBfY2RjbGtfc3Rh dGUoY29uc3Qgc3RydWN0IGludGVsX2NkY2xrX3N0YXRlICpjZGNsa19zdGF0ZSwKIAkJCSAgICBj b25zdCBjaGFyICpjb250ZXh0KTsKIAogLyogaW50ZWxfZGlzcGxheS5jICovCitpbnQgaW50ZWxf cGxhbmVfcmF3X3pwb3MoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUs CisJCQkgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSk7Cit2b2lk IGludGVsX19lbmFibGVfcGlwZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVu dW0gcGlwZSBwaXBlKTsKIHZvaWQgaTgzMF9lbmFibGVfcGlwZShzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsIGVudW0gcGlwZSBwaXBlKTsKIHZvaWQgaTgzMF9kaXNhYmxlX3BpcGUo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVtIHBpcGUgcGlwZSk7CiBlbnVt IHBpcGUgaW50ZWxfY3J0Y19wY2hfdHJhbnNjb2RlcihzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0Yyk7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IGE2ZjQ1MjRhZGZmNC4uMjI4ZWJh NTgyZDQ0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtNTExLDYgKzUxMSwy MiBAQCBzdGF0aWMgdTMyIHZsdl9zcHJpdGVfY3RsKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlLAogCXJldHVybiBzcHJjdGw7CiB9CiAKK3N0YXRpYyB1MzIgdmx2X3Nw cmN0bF96cG9zKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCisJCQkgICBjb25zdCBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKK3sKKwllbnVtIHBsYW5lX2lkIHBsYW5lX2lk ID0gcGxhbmUtPmlkOworCWVudW0gcGxhbmVfaWQgb3RoZXJfcGxhbmVfaWQgPSBwbGFuZV9pZCA9 PSBQTEFORV9TUFJJVEUwID8KKwkJUExBTkVfU1BSSVRFMSA6IFBMQU5FX1NQUklURTA7CisKKwlp ZiAoY3J0Y19zdGF0ZS0+enBvc1twbGFuZV9pZF0gPT0gMCkKKwkJcmV0dXJuIFNQX0JPVFRPTTsK KwllbHNlIGlmIChjcnRjX3N0YXRlLT56cG9zW3BsYW5lX2lkXSA9PQorCQkgY3J0Y19zdGF0ZS0+ enBvc1tvdGhlcl9wbGFuZV9pZF0gKyAxKQorCQlyZXR1cm4gU1BfWk9SREVSOworCisJcmV0dXJu IDA7Cit9CisKIHN0YXRpYyB2b2lkCiB2bHZfdXBkYXRlX3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFu ZSAqcGxhbmUsCiAJCSBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwK QEAgLTUzOCw2ICs1NTQsOSBAQCB2bHZfdXBkYXRlX3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAq cGxhbmUsCiAKIAlsaW5lYXJfb2Zmc2V0ID0gaW50ZWxfZmJfeHlfdG9fbGluZWFyKHgsIHksIHBs YW5lX3N0YXRlLCAwKTsKIAorCS8qIGZpbmFsIHpwb3MgdmFsdWUgaXMgY29tcHV0ZWQgYWZ0ZXIg dmx2X3Nwcml0ZV9jdGwoKSAqLworCXNwcmN0bCB8PSB2bHZfc3ByY3RsX3pwb3MocGxhbmUsIGNy dGNfc3RhdGUpOworCiAJc3Bpbl9sb2NrX2lycXNhdmUoJmRldl9wcml2LT51bmNvcmUubG9jaywg aXJxZmxhZ3MpOwogCiAJdmx2X3VwZGF0ZV9jbHJjKHBsYW5lX3N0YXRlKTsKQEAgLTE1NTMsNyAr MTU3MiwxMCBAQCBpbnRlbF9zcHJpdGVfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwKIAkJCQkJICBEUk1fQ09MT1JfWUNCQ1JfTElNSVRFRF9SQU5HRSk7CiAK IAl6cG9zID0gcGxhbmUgKyAxOwotCWRybV9wbGFuZV9jcmVhdGVfenBvc19pbW11dGFibGVfcHJv cGVydHkoJmludGVsX3BsYW5lLT5iYXNlLCB6cG9zKTsKKwlpZiAoSVNfVkFMTEVZVklFVyhkZXZf cHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCisJCWRybV9wbGFuZV9jcmVhdGVfenBv c19wcm9wZXJ0eSgmaW50ZWxfcGxhbmUtPmJhc2UsIHpwb3MsIDAsIDIpOworCWVsc2UKKwkJZHJt X3BsYW5lX2NyZWF0ZV96cG9zX2ltbXV0YWJsZV9wcm9wZXJ0eSgmaW50ZWxfcGxhbmUtPmJhc2Us IHpwb3MpOwogCiAJZHJtX3BsYW5lX2hlbHBlcl9hZGQoJmludGVsX3BsYW5lLT5iYXNlLCAmaW50 ZWxfcGxhbmVfaGVscGVyX2Z1bmNzKTsKIAotLSAKMi4xNi4xCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK