From: Matt Roper Subject: [PATCH 4/4] drm/i915: Intel-specific primary plane handling (v8) Date: Thu, 29 May 2014 08:06:54 -0700 Message-ID: <1401376014-24845-5-git-send-email-matthew.d.roper@intel.com> References: <1401376014-24845-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 [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id C47B86E41B for ; Thu, 29 May 2014 08:07:39 -0700 (PDT) In-Reply-To: <1401376014-24845-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 SW50ZWwgaGFyZHdhcmUgYWxsb3dzIHRoZSBwcmltYXJ5IHBsYW5lIHRvIGJlIGRpc2FibGVkIGlu ZGVwZW5kZW50bHkgb2YKdGhlIENSVEMuICBQcm92aWRlIGN1c3RvbSBwcmltYXJ5IHBsYW5lIGhh bmRsaW5nIHRvIGFsbG93IHRoaXMuCgp2ODoKIC0gUGluL3VucGluIHByb3Blcmx5IHdoZW4gY2xp cHBpbmcgY2F1c2VzIHRoZSBwcmltYXJ5IHBsYW5lIHRvIGJlCiAgIGRpc2FibGVkIHdoZW4gaXQg aGFzIHByZXZpb3VzbHkgYmVlbiBlbmFibGVkLgogLSBzL2RybV9wcmltYXJ5X2hlbHBlcl9jaGVj a191cGRhdGUvZHJtX3BsYW5lX2hlbHBlcl9jaGVja191cGRhdGUvCnY3OgogLSBDbGlwIHByaW1h cnkgcGxhbmUgdG8gaW52aXNpYmxlIHdoZW4gY3J0YyBpcyBkaXNhYmxlZCBzaW5jZQogICBpbnRl bF9jcnRjLT5jb25maWcucGlwZV9zcmNfe3csaH0gbWF5IGJlIGdhcmJhZ2Ugb3RoZXJ3aXNlLgog LSBVbnBpbiBvbGQgZmIgYmVmb3JlIHBpbm5pbmcgbmV3IG9uZSBpbiB0aGUgImp1c3QgcGluIGFu ZAogICByZXR1cm4iIGNhc2UgdGhhdCBpcyB1c2VkIHdoZW4gdGhlIGNydGMgaXMgZGlzYWJsZWQu CiAtIERvbid0IHRyZWF0IGltcGxpY2l0IGRpc2FibGluZyBvZiB0aGUgcHJpbWFyeSBwbGFuZSAo Y2F1c2VkIGJ5CiAgIGNsaXBwaW5nKSB0aGUgc2FtZSB3YXkgYXMgZXhwbGljaXQgZGlzYWJsaW5n IChjYXVzZWQgYnkgZmI9MCkuCiAgIEZvciBpbXBsaWNpdCBkaXNhYmxlcywgd2Ugc2hvdWxkIGxl YXZlIHRoZSBmYiBzZXQgYW5kIHBpbm5lZCwKICAgd2hlcmVhcyBmb3IgZXhwbGljaXQgZGlzYWJs ZXMgd2UgbmVlZCB0byB1bnBpbiB0aGUgZmIgYmVmb3JlCiAgIHByaW1hcnktPmZiIGlzIGNsZWFy ZWQuCnY2OgogLSBQYXNzIHJlY3RhbmdsZXMgdG8gcHJpbWFyeSBoZWxwZXIgY2hlY2sgZnVuY3Rp b24gYW5kIGdldCBwbGFuZQogICB2aXNpYmlsaXR5IGJhY2suCiAtIFdhaXQgZm9yIHBlbmRpbmcg cGFnZWZsaXBzIG9uIHByaW1hcnkgcGxhbmUgdXBkYXRlL2Rpc2FibGUuCiAtIEFsbG93IHByaW1h cnkgcGxhbmUgdG8gYmUgdXBkYXRlZCB3aGlsZSB0aGUgY3J0YyBpcyBkaXNhYmxlZCAoY2hhbmdl cwogICB3aWxsIHRha2UgZWZmZWN0IHdoZW4gdGhlIGNydGMgaXMgcmUtZW5hYmxlZCBpZiBtb2Rl c2V0IHBhc3NlcyAtMQogICBmb3IgdGhlIGZiIGlkKS4KIC0gRHJvcCBXQVJOKCkgaWYgd2UgdHJ5 IHRvIGRpc2FibGUgdGhlIHByaW1hcnkgcGxhbmUgd2hlbiBpdCdzCiAgIGFscmVhZHkgYmVlbiBk aXNhYmxlZC4gIFRoaXMgd2lsbCBoYXBwZW4gaWYgdGhlIGNydGMgZ2V0cyBkaXNhYmxlZAogICBh ZnRlciB0aGUgcHJpbWFyeSBwbGFuZSBoYXMgYWxyZWFkeSBiZWVuIGRpc2FibGVkIGluZGVwZW5k ZW50bHkuCnY1OgogLSBVc2UgbmV3IGRybV9wcmltYXJ5X2hlbHBlcl9jaGVja191cGRhdGUoKSBo ZWxwZXIgZnVuY3Rpb24gdG8gY2hlY2sKICAgc2V0cGxhbmUgcGFyYW1ldGVyIHZhbGlkaXR5Lgog LSBTd2FwIHByaW1hcnkgcGxhbmUncyBwaXBlIGZvciBwcmUtZ2VuNCBGQkMgKGNhdWdodCBieSBW aWxsZSBTeXJqw6Rsw6QpCiAtIENsZWFudXAgcHJpbWFyeSBwbGFuZSBwcm9wZXJseSBvbiBjcnRj IGluaXQgZmFpbHVyZQp2NDoKIC0gRG9uJ3QgYWRkIGEgcHJpbWFyeV9wbGFuZSBmaWVsZCB0byBp bnRlbF9jcnRjOyB0aGF0IHdhcyBsZWZ0IG92ZXIKICAgZnJvbSBhIG11Y2ggZWFybGllciBpdGVy YXRpb24gb2YgdGhpcyBwYXRjaCBzZXJpZXMsIGJ1dCBpcyBubyBsb25nZXIKICAgbmVlZGVkL3Vz ZWQgbm93IHRoYXQgdGhlIERSTSBjb3JlIHByaW1hcnkgcGxhbmUgc3VwcG9ydCBoYXMgYmVlbgog ICBtZXJnZWQuCnYzOgogLSBQcm92aWRlIGdlbi1zcGVjaWZpYyBwcmltYXJ5IHBsYW5lIGZvcm1h dCBsaXN0cyAoc3VnZ2VzdGVkIGJ5IERhbmllbAogICBWZXR0ZXIpLgogLSBJZiB0aGUgcHJpbWFy eSBwbGFuZSBpcyBhbHJlYWR5IGVuYWJsZWQsIGdvIGFoZWFkIGFuZCBqdXN0IGNhbGwgdGhlCiAg IHByaW1hcnkgcGxhbmUgaGVscGVyIHRvIGRvIHRoZSB1cGRhdGUgKHN1Z2dlc3RlZCBieSBEYW5p ZWwgVmV0dGVyKS4KIC0gRG9uJ3QgdHJ5IHRvIGRpc2FibGUgdGhlIHByaW1hcnkgcGxhbmUgb24g ZGVzdHJ1Y3Rpb247IHRoZSBEUk0gbGF5ZXIKICAgc2hvdWxkIGhhdmUgYWxyZWFkeSB0YWtlbiBj YXJlIG9mIHRoaXMgZm9yIHVzLgp2MjoKIC0gVW5waW4gZmIgcHJvcGVybHkgb24gcHJpbWFyeSBw bGFuZSBkaXNhYmxlCiAtIFByb3ZpZGUgYW4gSW50ZWwtc3BlY2lmaWMgc2V0IG9mIHByaW1hcnkg cGxhbmUgZm9ybWF0cwogLSBBZGRpdGlvbmFsIHNhbml0eSBjaGVja3Mgb24gc2V0cGxhbmUgKGlu IGxpbmUgd2l0aCB0aGUgY2hlY2tzCiAgIGN1cnJlbnRseSBiZWluZyBkb25lIGJ5IHRoZSBEUk0g Y29yZSBwcmltYXJ5IHBsYW5lIGhlbHBlcikKClJldmlld2VkLWJ5OiBDaG9uIE1pbmcgTGVlIDxj aG9uLm1pbmcubGVlQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhl dy5kLnJvcGVyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMgfCAyMzIgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0KIDEgZmlsZSBj aGFuZ2VkLCAyMjkgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggYzJhZWRhYy4uMGRkZmZhYyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMzksMTAgKzM5LDM3IEBACiAjaW5jbHVkZSAiaTkxNV90 cmFjZS5oIgogI2luY2x1ZGUgPGRybS9kcm1fZHBfaGVscGVyLmg+CiAjaW5jbHVkZSA8ZHJtL2Ry bV9jcnRjX2hlbHBlci5oPgorI2luY2x1ZGUgPGRybS9kcm1fcGxhbmVfaGVscGVyLmg+CisjaW5j bHVkZSA8ZHJtL2RybV9yZWN0Lmg+CiAjaW5jbHVkZSA8bGludXgvZG1hX3JlbWFwcGluZy5oPgog CisvKiBQcmltYXJ5IHBsYW5lIGZvcm1hdHMgc3VwcG9ydGVkIGJ5IGFsbCBnZW4gKi8KKyNkZWZp bmUgQ09NTU9OX1BSSU1BUllfRk9STUFUUyBcCisJRFJNX0ZPUk1BVF9DOCwgXAorCURSTV9GT1JN QVRfUkdCNTY1LCBcCisJRFJNX0ZPUk1BVF9YUkdCODg4OCwgXAorCURSTV9GT1JNQVRfQVJHQjg4 ODgKKworLyogUHJpbWFyeSBwbGFuZSBmb3JtYXRzIGZvciBnZW4gPD0gMyAqLworc3RhdGljIGNv bnN0IHVpbnQzMl90IGludGVsX3ByaW1hcnlfZm9ybWF0c19nZW4yW10gPSB7CisJQ09NTU9OX1BS SU1BUllfRk9STUFUUywKKwlEUk1fRk9STUFUX1hSR0IxNTU1LAorCURSTV9GT1JNQVRfQVJHQjE1 NTUsCit9OworCisvKiBQcmltYXJ5IHBsYW5lIGZvcm1hdHMgZm9yIGdlbiA+PSA0ICovCitzdGF0 aWMgY29uc3QgdWludDMyX3QgaW50ZWxfcHJpbWFyeV9mb3JtYXRzX2dlbjRbXSA9IHsKKwlDT01N T05fUFJJTUFSWV9GT1JNQVRTLCBcCisJRFJNX0ZPUk1BVF9YQkdSODg4OCwKKwlEUk1fRk9STUFU X0FCR1I4ODg4LAorCURSTV9GT1JNQVRfWFJHQjIxMDEwMTAsCisJRFJNX0ZPUk1BVF9BUkdCMjEw MTAxMCwKKwlEUk1fRk9STUFUX1hCR1IyMTAxMDEwLAorCURSTV9GT1JNQVRfQUJHUjIxMDEwMTAs Cit9OworCiAjZGVmaW5lIERJVl9ST1VORF9DTE9TRVNUX1VMTChsbCwgZCkJXAotCSh7IHVuc2ln bmVkIGxvbmcgbG9uZyBfdG1wID0gKGxsKSsoZCkvMjsgZG9fZGl2KF90bXAsIGQpOyBfdG1wOyB9 KQorKHsgdW5zaWduZWQgbG9uZyBsb25nIF90bXAgPSAobGwpKyhkKS8yOyBkb19kaXYoX3RtcCwg ZCk7IF90bXA7IH0pCiAKIHN0YXRpYyB2b2lkIGludGVsX2luY3JlYXNlX3BsbGNsb2NrKHN0cnVj dCBkcm1fY3J0YyAqY3J0Yyk7CiBzdGF0aWMgdm9pZCBpbnRlbF9jcnRjX3VwZGF0ZV9jdXJzb3Io c3RydWN0IGRybV9jcnRjICpjcnRjLCBib29sIG9uKTsKQEAgLTEwOTU5LDE3ICsxMDk4NiwyMTYg QEAgc3RhdGljIHZvaWQgaW50ZWxfc2hhcmVkX2RwbGxfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQogCUJVR19PTihkZXZfcHJpdi0+bnVtX3NoYXJlZF9kcGxsID4gSTkxNV9OVU1fUExMUyk7 CiB9CiAKK3N0YXRpYyBpbnQKK2ludGVsX3ByaW1hcnlfcGxhbmVfZGlzYWJsZShzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZSkKK3sKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcGxhbmUtPmRldjsK KwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwor CXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7 CisJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGM7CisKKwlpZiAoIXBsYW5lLT5mYikKKwkJ cmV0dXJuIDA7CisKKwlCVUdfT04oIXBsYW5lLT5jcnRjKTsKKworCWludGVsX2NydGMgPSB0b19p bnRlbF9jcnRjKHBsYW5lLT5jcnRjKTsKKworCS8qCisJICogRXZlbiB0aG91Z2ggd2UgY2hlY2tl ZCBwbGFuZS0+ZmIgYWJvdmUsIGl0J3Mgc3RpbGwgcG9zc2libGUgdGhhdAorCSAqIHRoZSBwcmlt YXJ5IHBsYW5lIGhhcyBiZWVuIGltcGxpY2l0bHkgZGlzYWJsZWQgYmVjYXVzZSB0aGUgY3J0Ywor CSAqIGNvb3JkaW5hdGVzIGdpdmVuIHdlcmVuJ3QgdmlzaWJsZSwgb3IgYmVjYXVzZSB3ZSBkZXRl Y3RlZAorCSAqIHRoYXQgaXQgd2FzIDEwMCUgY292ZXJlZCBieSBhIHNwcml0ZSBwbGFuZS4gIE9y LCB0aGUgQ1JUQyBtYXkgYmUKKwkgKiBvZmYgYW5kIHdlJ3ZlIHNldCBhIGZiLCBidXQgaGF2ZW4n dCBhY3R1YWxseSB0dXJuZWQgb24gdGhlIENSVEMgeWV0LgorCSAqIEluIGVpdGhlciBjYXNlLCB3 ZSBuZWVkIHRvIHVucGluIHRoZSBGQiBhbmQgbGV0IHRoZSBmYiBwb2ludGVyIGdldAorCSAqIHVw ZGF0ZWQsIGJ1dCBvdGhlcndpc2Ugd2UgZG9uJ3QgbmVlZCB0byB0b3VjaCB0aGUgaGFyZHdhcmUu CisJICovCisJaWYgKCFpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQpCisJCWdvdG8gZGlzYWJs ZV91bnBpbjsKKworCWludGVsX2NydGNfd2FpdF9mb3JfcGVuZGluZ19mbGlwcyhwbGFuZS0+Y3J0 Yyk7CisJaW50ZWxfZGlzYWJsZV9wcmltYXJ5X2h3X3BsYW5lKGRldl9wcml2LCBpbnRlbF9wbGFu ZS0+cGxhbmUsCisJCQkJICAgICAgIGludGVsX3BsYW5lLT5waXBlKTsKKworZGlzYWJsZV91bnBp bjoKKwlpbnRlbF91bnBpbl9mYl9vYmoodG9faW50ZWxfZnJhbWVidWZmZXIocGxhbmUtPmZiKS0+ b2JqKTsKKwlwbGFuZS0+ZmIgPSBOVUxMOworCisJcmV0dXJuIDA7Cit9CisKK3N0YXRpYyBpbnQK K2ludGVsX3ByaW1hcnlfcGxhbmVfc2V0cGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0 cnVjdCBkcm1fY3J0YyAqY3J0YywKKwkJCSAgICAgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIs IGludCBjcnRjX3gsIGludCBjcnRjX3ksCisJCQkgICAgIHVuc2lnbmVkIGludCBjcnRjX3csIHVu c2lnbmVkIGludCBjcnRjX2gsCisJCQkgICAgIHVpbnQzMl90IHNyY194LCB1aW50MzJfdCBzcmNf eSwKKwkJCSAgICAgdWludDMyX3Qgc3JjX3csIHVpbnQzMl90IHNyY19oKQoreworCXN0cnVjdCBk cm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0 YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFu ZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKKwlzdHJ1Y3QgZHJtX3JlY3QgZGVzdCA9IHsKKwkJ LyogaW50ZWdlciBwaXhlbHMgKi8KKwkJLngxID0gY3J0Y194LAorCQkueTEgPSBjcnRjX3ksCisJ CS54MiA9IGNydGNfeCArIGNydGNfdywKKwkJLnkyID0gY3J0Y195ICsgY3J0Y19oLAorCX07CisJ c3RydWN0IGRybV9yZWN0IHNyYyA9IHsKKwkJLyogMTYuMTYgZml4ZWQgcG9pbnQgKi8KKwkJLngx ID0gc3JjX3gsCisJCS55MSA9IHNyY195LAorCQkueDIgPSBzcmNfeCArIHNyY193LAorCQkueTIg PSBzcmNfeSArIHNyY19oLAorCX07CisJY29uc3Qgc3RydWN0IGRybV9yZWN0IGNsaXAgPSB7CisJ CS8qIGludGVnZXIgcGl4ZWxzICovCisJCS54MiA9IGludGVsX2NydGMtPmFjdGl2ZSA/IGludGVs X2NydGMtPmNvbmZpZy5waXBlX3NyY193IDogMCwKKwkJLnkyID0gaW50ZWxfY3J0Yy0+YWN0aXZl ID8gaW50ZWxfY3J0Yy0+Y29uZmlnLnBpcGVfc3JjX2ggOiAwLAorCX07CisJYm9vbCB2aXNpYmxl OworCWludCByZXQ7CisKKwlyZXQgPSBkcm1fcGxhbmVfaGVscGVyX2NoZWNrX3VwZGF0ZShwbGFu ZSwgY3J0YywgZmIsCisJCQkJCSAgICAmc3JjLCAmZGVzdCwgJmNsaXAsCisJCQkJCSAgICBEUk1f UExBTkVfSEVMUEVSX05PX1NDQUxJTkcsCisJCQkJCSAgICBEUk1fUExBTkVfSEVMUEVSX05PX1ND QUxJTkcsCisJCQkJCSAgICBmYWxzZSwgdHJ1ZSwgJnZpc2libGUpOworCisJaWYgKHJldCkKKwkJ cmV0dXJuIHJldDsKKworCS8qCisJICogSWYgdGhlIENSVEMgaXNuJ3QgZW5hYmxlZCwgd2UncmUg anVzdCBwaW5uaW5nIHRoZSBmcmFtZWJ1ZmZlciwKKwkgKiB1cGRhdGluZyB0aGUgZmIgcG9pbnRl ciwgYW5kIHJldHVybmluZyB3aXRob3V0IHRvdWNoaW5nIHRoZQorCSAqIGhhcmR3YXJlLiAgVGhp cyBhbGxvd3MgdXMgdG8gbGF0ZXIgZG8gYSBkcm1Nb2RlU2V0Q3J0YyB3aXRoIGZiPS0xIHRvCisJ ICogdHVybiBvbiB0aGUgZGlzcGxheSB3aXRoIGFsbCBwbGFuZXMgc2V0dXAgYXMgZGVzaXJlZC4K KwkgKi8KKwlpZiAoIWNydGMtPmVuYWJsZWQpIHsKKwkJLyoKKwkJICogSWYgd2UgYWxyZWFkeSBj YWxsZWQgc2V0cGxhbmUgd2hpbGUgdGhlIGNydGMgd2FzIGRpc2FibGVkLAorCQkgKiB3ZSBtYXkg aGF2ZSBhbiBmYiBwaW5uZWQ7IHVucGluIGl0LgorCQkgKi8KKwkJaWYgKHBsYW5lLT5mYikKKwkJ CWludGVsX3VucGluX2ZiX29iaih0b19pbnRlbF9mcmFtZWJ1ZmZlcihwbGFuZS0+ZmIpLT5vYmop OworCisJCS8qIFBpbiBhbmQgcmV0dXJuIHdpdGhvdXQgcHJvZ3JhbW1pbmcgaGFyZHdhcmUgKi8K KwkJcmV0dXJuIGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKGRldiwKKwkJCQkJCSAgdG9faW50 ZWxfZnJhbWVidWZmZXIoZmIpLT5vYmosCisJCQkJCQkgIE5VTEwpOworCX0KKworCWludGVsX2Ny dGNfd2FpdF9mb3JfcGVuZGluZ19mbGlwcyhjcnRjKTsKKworCS8qCisJICogSWYgY2xpcHBpbmcg cmVzdWx0cyBpbiBhIG5vbi12aXNpYmxlIHByaW1hcnkgcGxhbmUsIHdlJ2xsIGRpc2FibGUKKwkg KiB0aGUgcHJpbWFyeSBwbGFuZS4gIE5vdGUgdGhhdCB0aGlzIGlzIGEgYml0IGRpZmZlcmVudCB0 aGFuIHdoYXQKKwkgKiBoYXBwZW5zIGlmIHVzZXJzcGFjZSBleHBsaWNpdGx5IGRpc2FibGVzIHRo ZSBwbGFuZSBieSBwYXNzaW5nIGZiPTAKKwkgKiBiZWNhdXNlIHBsYW5lLT5mYiBzdGlsbCBnZXRz IHNldCBhbmQgcGlubmVkLgorCSAqLworCWlmICghdmlzaWJsZSkgeworCQkvKgorCQkgKiBUcnkg dG8gcGluIHRoZSBuZXcgZmIgZmlyc3Qgc28gdGhhdCB3ZSBjYW4gYmFpbCBvdXQgaWYgd2UKKwkJ ICogZmFpbC4KKwkJICovCisJCWlmIChwbGFuZS0+ZmIgIT0gZmIpIHsKKwkJCXJldCA9IGludGVs X3Bpbl9hbmRfZmVuY2VfZmJfb2JqKGRldiwKKwkJCQkJCQkgdG9faW50ZWxfZnJhbWVidWZmZXIo ZmIpLT5vYmosCisJCQkJCQkJIE5VTEwpOworCQkJaWYgKHJldCkKKwkJCQlyZXR1cm4gcmV0Owor CQl9CisKKwkJaWYgKGludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZCkKKwkJCWludGVsX2Rpc2Fi bGVfcHJpbWFyeV9od19wbGFuZShkZXZfcHJpdiwKKwkJCQkJCSAgICAgICBpbnRlbF9wbGFuZS0+ cGxhbmUsCisJCQkJCQkgICAgICAgaW50ZWxfcGxhbmUtPnBpcGUpOworCisKKwkJaWYgKHBsYW5l LT5mYiAhPSBmYikKKwkJCWlmIChwbGFuZS0+ZmIpCisJCQkJaW50ZWxfdW5waW5fZmJfb2JqKHRv X2ludGVsX2ZyYW1lYnVmZmVyKHBsYW5lLT5mYiktPm9iaik7CisKKwkJcmV0dXJuIDA7CisJfQor CisJcmV0ID0gaW50ZWxfcGlwZV9zZXRfYmFzZShjcnRjLCBzcmMueDEsIHNyYy55MSwgZmIpOwor CWlmIChyZXQpCisJCXJldHVybiByZXQ7CisKKwlpZiAoIWludGVsX2NydGMtPnByaW1hcnlfZW5h YmxlZCkKKwkJaW50ZWxfZW5hYmxlX3ByaW1hcnlfaHdfcGxhbmUoZGV2X3ByaXYsIGludGVsX2Ny dGMtPnBsYW5lLAorCQkJCQkgICAgICBpbnRlbF9jcnRjLT5waXBlKTsKKworCXJldHVybiAwOwor fQorCitzdGF0aWMgdm9pZCBpbnRlbF9wcmltYXJ5X3BsYW5lX2Rlc3Ryb3koc3RydWN0IGRybV9w bGFuZSAqcGxhbmUpCit7CisJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2lu dGVsX3BsYW5lKHBsYW5lKTsKKwlkcm1fcGxhbmVfY2xlYW51cChwbGFuZSk7CisJa2ZyZWUoaW50 ZWxfcGxhbmUpOworfQorCitzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9wbGFuZV9mdW5jcyBpbnRl bF9wcmltYXJ5X3BsYW5lX2Z1bmNzID0geworCS51cGRhdGVfcGxhbmUgPSBpbnRlbF9wcmltYXJ5 X3BsYW5lX3NldHBsYW5lLAorCS5kaXNhYmxlX3BsYW5lID0gaW50ZWxfcHJpbWFyeV9wbGFuZV9k aXNhYmxlLAorCS5kZXN0cm95ID0gaW50ZWxfcHJpbWFyeV9wbGFuZV9kZXN0cm95LAorfTsKKwor c3RhdGljIHN0cnVjdCBkcm1fcGxhbmUgKmludGVsX3ByaW1hcnlfcGxhbmVfY3JlYXRlKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCisJCQkJCQkgICAgaW50IHBpcGUpCit7CisJc3RydWN0IGludGVs X3BsYW5lICpwcmltYXJ5OworCWNvbnN0IHVpbnQzMl90ICppbnRlbF9wcmltYXJ5X2Zvcm1hdHM7 CisJaW50IG51bV9mb3JtYXRzOworCisJcHJpbWFyeSA9IGt6YWxsb2Moc2l6ZW9mKCpwcmltYXJ5 KSwgR0ZQX0tFUk5FTCk7CisJaWYgKHByaW1hcnkgPT0gTlVMTCkKKwkJcmV0dXJuIE5VTEw7CisK KwlwcmltYXJ5LT5jYW5fc2NhbGUgPSBmYWxzZTsKKwlwcmltYXJ5LT5tYXhfZG93bnNjYWxlID0g MTsKKwlwcmltYXJ5LT5waXBlID0gcGlwZTsKKwlwcmltYXJ5LT5wbGFuZSA9IHBpcGU7CisJaWYg KEhBU19GQkMoZGV2KSAmJiBJTlRFTF9JTkZPKGRldiktPmdlbiA8IDQpCisJCXByaW1hcnktPnBs YW5lID0gIXBpcGU7CisKKwlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPD0gMykgeworCQlpbnRl bF9wcmltYXJ5X2Zvcm1hdHMgPSBpbnRlbF9wcmltYXJ5X2Zvcm1hdHNfZ2VuMjsKKwkJbnVtX2Zv cm1hdHMgPSBBUlJBWV9TSVpFKGludGVsX3ByaW1hcnlfZm9ybWF0c19nZW4yKTsKKwl9IGVsc2Ug eworCQlpbnRlbF9wcmltYXJ5X2Zvcm1hdHMgPSBpbnRlbF9wcmltYXJ5X2Zvcm1hdHNfZ2VuNDsK KwkJbnVtX2Zvcm1hdHMgPSBBUlJBWV9TSVpFKGludGVsX3ByaW1hcnlfZm9ybWF0c19nZW40KTsK Kwl9CisKKwlkcm1fdW5pdmVyc2FsX3BsYW5lX2luaXQoZGV2LCAmcHJpbWFyeS0+YmFzZSwgMCwK KwkJCQkgJmludGVsX3ByaW1hcnlfcGxhbmVfZnVuY3MsCisJCQkJIGludGVsX3ByaW1hcnlfZm9y bWF0cywgbnVtX2Zvcm1hdHMsCisJCQkJIERSTV9QTEFORV9UWVBFX1BSSU1BUlkpOworCXJldHVy biAmcHJpbWFyeS0+YmFzZTsKK30KKwogc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19pbml0KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIGludCBwaXBlKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVs X2NydGM7Ci0JaW50IGk7CisJc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeTsKKwlpbnQgaSwgcmV0 OwogCiAJaW50ZWxfY3J0YyA9IGt6YWxsb2Moc2l6ZW9mKCppbnRlbF9jcnRjKSwgR0ZQX0tFUk5F TCk7CiAJaWYgKGludGVsX2NydGMgPT0gTlVMTCkKIAkJcmV0dXJuOwogCi0JZHJtX2NydGNfaW5p dChkZXYsICZpbnRlbF9jcnRjLT5iYXNlLCAmaW50ZWxfY3J0Y19mdW5jcyk7CisJcHJpbWFyeSA9 IGludGVsX3ByaW1hcnlfcGxhbmVfY3JlYXRlKGRldiwgcGlwZSk7CisJcmV0ID0gZHJtX2NydGNf aW5pdF93aXRoX3BsYW5lcyhkZXYsICZpbnRlbF9jcnRjLT5iYXNlLCBwcmltYXJ5LAorCQkJCQlO VUxMLCAmaW50ZWxfY3J0Y19mdW5jcyk7CisJaWYgKHJldCkgeworCQlkcm1fcGxhbmVfY2xlYW51 cChwcmltYXJ5KTsKKwkJa2ZyZWUoaW50ZWxfY3J0Yyk7CisJCXJldHVybjsKKwl9CiAKIAlkcm1f bW9kZV9jcnRjX3NldF9nYW1tYV9zaXplKCZpbnRlbF9jcnRjLT5iYXNlLCAyNTYpOwogCWZvciAo aSA9IDA7IGkgPCAyNTY7IGkrKykgewotLSAKMS44LjUuMQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK