From: Matt Roper Subject: [PATCH 4/4] drm/i915: Intel-specific primary plane handling (v8) Date: Mon, 19 May 2014 14:48:23 -0700 Message-ID: <1400536103-18953-1-git-send-email-matthew.d.roper@intel.com> References: <1400181719-7394-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id CC99489133 for ; Mon, 19 May 2014 14:47:35 -0700 (PDT) In-Reply-To: <1400181719-7394-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 Y29yZSBwcmltYXJ5IHBsYW5lIGhlbHBlcikKClNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1h dHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jIHwgMjMyICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystCiAxIGZp bGUgY2hhbmdlZCwgMjI5IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGNlNzE3MTcuLjgwOWUwM2IgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTM5LDEwICszOSwzNyBAQAogI2luY2x1ZGUgImk5 MTVfdHJhY2UuaCIKICNpbmNsdWRlIDxkcm0vZHJtX2RwX2hlbHBlci5oPgogI2luY2x1ZGUgPGRy bS9kcm1fY3J0Y19oZWxwZXIuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX3BsYW5lX2hlbHBlci5oPgor I2luY2x1ZGUgPGRybS9kcm1fcmVjdC5oPgogI2luY2x1ZGUgPGxpbnV4L2RtYV9yZW1hcHBpbmcu aD4KIAorLyogUHJpbWFyeSBwbGFuZSBmb3JtYXRzIHN1cHBvcnRlZCBieSBhbGwgZ2VuICovCisj ZGVmaW5lIENPTU1PTl9QUklNQVJZX0ZPUk1BVFMgXAorCURSTV9GT1JNQVRfQzgsIFwKKwlEUk1f Rk9STUFUX1JHQjU2NSwgXAorCURSTV9GT1JNQVRfWFJHQjg4ODgsIFwKKwlEUk1fRk9STUFUX0FS R0I4ODg4CisKKy8qIFByaW1hcnkgcGxhbmUgZm9ybWF0cyBmb3IgZ2VuIDw9IDMgKi8KK3N0YXRp YyBjb25zdCB1aW50MzJfdCBpbnRlbF9wcmltYXJ5X2Zvcm1hdHNfZ2VuMltdID0geworCUNPTU1P Tl9QUklNQVJZX0ZPUk1BVFMsCisJRFJNX0ZPUk1BVF9YUkdCMTU1NSwKKwlEUk1fRk9STUFUX0FS R0IxNTU1LAorfTsKKworLyogUHJpbWFyeSBwbGFuZSBmb3JtYXRzIGZvciBnZW4gPj0gNCAqLwor c3RhdGljIGNvbnN0IHVpbnQzMl90IGludGVsX3ByaW1hcnlfZm9ybWF0c19nZW40W10gPSB7CisJ Q09NTU9OX1BSSU1BUllfRk9STUFUUywgXAorCURSTV9GT1JNQVRfWEJHUjg4ODgsCisJRFJNX0ZP Uk1BVF9BQkdSODg4OCwKKwlEUk1fRk9STUFUX1hSR0IyMTAxMDEwLAorCURSTV9GT1JNQVRfQVJH QjIxMDEwMTAsCisJRFJNX0ZPUk1BVF9YQkdSMjEwMTAxMCwKKwlEUk1fRk9STUFUX0FCR1IyMTAx MDEwLAorfTsKKwogI2RlZmluZSBESVZfUk9VTkRfQ0xPU0VTVF9VTEwobGwsIGQpCVwKLQkoeyB1 bnNpZ25lZCBsb25nIGxvbmcgX3RtcCA9IChsbCkrKGQpLzI7IGRvX2RpdihfdG1wLCBkKTsgX3Rt cDsgfSkKKyh7IHVuc2lnbmVkIGxvbmcgbG9uZyBfdG1wID0gKGxsKSsoZCkvMjsgZG9fZGl2KF90 bXAsIGQpOyBfdG1wOyB9KQogCiBzdGF0aWMgdm9pZCBpbnRlbF9pbmNyZWFzZV9wbGxjbG9jayhz dHJ1Y3QgZHJtX2NydGMgKmNydGMpOwogc3RhdGljIHZvaWQgaW50ZWxfY3J0Y191cGRhdGVfY3Vy c29yKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgYm9vbCBvbik7CkBAIC0xMDgyNCwxNyArMTA4NTEs MjE2IEBAIHN0YXRpYyB2b2lkIGludGVsX3NoYXJlZF9kcGxsX2luaXQoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIAlCVUdfT04oZGV2X3ByaXYtPm51bV9zaGFyZWRfZHBsbCA+IEk5MTVfTlVNX1BM TFMpOwogfQogCitzdGF0aWMgaW50CitpbnRlbF9wcmltYXJ5X3BsYW5lX2Rpc2FibGUoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUpCit7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5lLT5k ZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0 ZTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxh bmUpOworCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjOworCisJaWYgKCFwbGFuZS0+ZmIp CisJCXJldHVybiAwOworCisJQlVHX09OKCFwbGFuZS0+Y3J0Yyk7CisKKwlpbnRlbF9jcnRjID0g dG9faW50ZWxfY3J0YyhwbGFuZS0+Y3J0Yyk7CisKKwkvKgorCSAqIEV2ZW4gdGhvdWdoIHdlIGNo ZWNrZWQgcGxhbmUtPmZiIGFib3ZlLCBpdCdzIHN0aWxsIHBvc3NpYmxlIHRoYXQKKwkgKiB0aGUg cHJpbWFyeSBwbGFuZSBoYXMgYmVlbiBpbXBsaWNpdGx5IGRpc2FibGVkIGJlY2F1c2UgdGhlIGNy dGMKKwkgKiBjb29yZGluYXRlcyBnaXZlbiB3ZXJlbid0IHZpc2libGUsIG9yIGJlY2F1c2Ugd2Ug ZGV0ZWN0ZWQKKwkgKiB0aGF0IGl0IHdhcyAxMDAlIGNvdmVyZWQgYnkgYSBzcHJpdGUgcGxhbmUu ICBPciwgdGhlIENSVEMgbWF5IGJlCisJICogb2ZmIGFuZCB3ZSd2ZSBzZXQgYSBmYiwgYnV0IGhh dmVuJ3QgYWN0dWFsbHkgdHVybmVkIG9uIHRoZSBDUlRDIHlldC4KKwkgKiBJbiBlaXRoZXIgY2Fz ZSwgd2UgbmVlZCB0byB1bnBpbiB0aGUgRkIgYW5kIGxldCB0aGUgZmIgcG9pbnRlciBnZXQKKwkg KiB1cGRhdGVkLCBidXQgb3RoZXJ3aXNlIHdlIGRvbid0IG5lZWQgdG8gdG91Y2ggdGhlIGhhcmR3 YXJlLgorCSAqLworCWlmICghaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkKQorCQlnb3RvIGRp c2FibGVfdW5waW47CisKKwlpbnRlbF9jcnRjX3dhaXRfZm9yX3BlbmRpbmdfZmxpcHMocGxhbmUt PmNydGMpOworCWludGVsX2Rpc2FibGVfcHJpbWFyeV9od19wbGFuZShkZXZfcHJpdiwgaW50ZWxf cGxhbmUtPnBsYW5lLAorCQkJCSAgICAgICBpbnRlbF9wbGFuZS0+cGlwZSk7CisKK2Rpc2FibGVf dW5waW46CisJaW50ZWxfdW5waW5fZmJfb2JqKHRvX2ludGVsX2ZyYW1lYnVmZmVyKHBsYW5lLT5m YiktPm9iaik7CisJcGxhbmUtPmZiID0gTlVMTDsKKworCXJldHVybiAwOworfQorCitzdGF0aWMg aW50CitpbnRlbF9wcmltYXJ5X3BsYW5lX3NldHBsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5l LCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCisJCQkgICAgIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIg KmZiLCBpbnQgY3J0Y194LCBpbnQgY3J0Y195LAorCQkJICAgICB1bnNpZ25lZCBpbnQgY3J0Y193 LCB1bnNpZ25lZCBpbnQgY3J0Y19oLAorCQkJICAgICB1aW50MzJfdCBzcmNfeCwgdWludDMyX3Qg c3JjX3ksCisJCQkgICAgIHVpbnQzMl90IHNyY193LCB1aW50MzJfdCBzcmNfaCkKK3sKKwlzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGludGVsX2NydGMgKmludGVs X2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOworCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxf cGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7CisJc3RydWN0IGRybV9yZWN0IGRlc3QgPSB7 CisJCS8qIGludGVnZXIgcGl4ZWxzICovCisJCS54MSA9IGNydGNfeCwKKwkJLnkxID0gY3J0Y195 LAorCQkueDIgPSBjcnRjX3ggKyBjcnRjX3csCisJCS55MiA9IGNydGNfeSArIGNydGNfaCwKKwl9 OworCXN0cnVjdCBkcm1fcmVjdCBzcmMgPSB7CisJCS8qIDE2LjE2IGZpeGVkIHBvaW50ICovCisJ CS54MSA9IHNyY194LAorCQkueTEgPSBzcmNfeSwKKwkJLngyID0gc3JjX3ggKyBzcmNfdywKKwkJ LnkyID0gc3JjX3kgKyBzcmNfaCwKKwl9OworCWNvbnN0IHN0cnVjdCBkcm1fcmVjdCBjbGlwID0g eworCQkvKiBpbnRlZ2VyIHBpeGVscyAqLworCQkueDIgPSBpbnRlbF9jcnRjLT5hY3RpdmUgPyBp bnRlbF9jcnRjLT5jb25maWcucGlwZV9zcmNfdyA6IDAsCisJCS55MiA9IGludGVsX2NydGMtPmFj dGl2ZSA/IGludGVsX2NydGMtPmNvbmZpZy5waXBlX3NyY19oIDogMCwKKwl9OworCWJvb2wgdmlz aWJsZTsKKwlpbnQgcmV0OworCisJcmV0ID0gZHJtX3BsYW5lX2hlbHBlcl9jaGVja191cGRhdGUo cGxhbmUsIGNydGMsIGZiLAorCQkJCQkgICAgJnNyYywgJmRlc3QsICZjbGlwLAorCQkJCQkgICAg RFJNX1BMQU5FX0hFTFBFUl9OT19TQ0FMSU5HLAorCQkJCQkgICAgRFJNX1BMQU5FX0hFTFBFUl9O T19TQ0FMSU5HLAorCQkJCQkgICAgZmFsc2UsIHRydWUsICZ2aXNpYmxlKTsKKworCWlmIChyZXQp CisJCXJldHVybiByZXQ7CisKKwkvKgorCSAqIElmIHRoZSBDUlRDIGlzbid0IGVuYWJsZWQsIHdl J3JlIGp1c3QgcGlubmluZyB0aGUgZnJhbWVidWZmZXIsCisJICogdXBkYXRpbmcgdGhlIGZiIHBv aW50ZXIsIGFuZCByZXR1cm5pbmcgd2l0aG91dCB0b3VjaGluZyB0aGUKKwkgKiBoYXJkd2FyZS4g IFRoaXMgYWxsb3dzIHVzIHRvIGxhdGVyIGRvIGEgZHJtTW9kZVNldENydGMgd2l0aCBmYj0tMSB0 bworCSAqIHR1cm4gb24gdGhlIGRpc3BsYXkgd2l0aCBhbGwgcGxhbmVzIHNldHVwIGFzIGRlc2ly ZWQuCisJICovCisJaWYgKCFjcnRjLT5lbmFibGVkKSB7CisJCS8qCisJCSAqIElmIHdlIGFscmVh ZHkgY2FsbGVkIHNldHBsYW5lIHdoaWxlIHRoZSBjcnRjIHdhcyBkaXNhYmxlZCwKKwkJICogd2Ug bWF5IGhhdmUgYW4gZmIgcGlubmVkOyB1bnBpbiBpdC4KKwkJICovCisJCWlmIChwbGFuZS0+ZmIp CisJCQlpbnRlbF91bnBpbl9mYl9vYmoodG9faW50ZWxfZnJhbWVidWZmZXIocGxhbmUtPmZiKS0+ b2JqKTsKKworCQkvKiBQaW4gYW5kIHJldHVybiB3aXRob3V0IHByb2dyYW1taW5nIGhhcmR3YXJl ICovCisJCXJldHVybiBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihkZXYsCisJCQkJCQkgIHRv X2ludGVsX2ZyYW1lYnVmZmVyKGZiKS0+b2JqLAorCQkJCQkJICBOVUxMKTsKKwl9CisKKwlpbnRl bF9jcnRjX3dhaXRfZm9yX3BlbmRpbmdfZmxpcHMoY3J0Yyk7CisKKwkvKgorCSAqIElmIGNsaXBw aW5nIHJlc3VsdHMgaW4gYSBub24tdmlzaWJsZSBwcmltYXJ5IHBsYW5lLCB3ZSdsbCBkaXNhYmxl CisJICogdGhlIHByaW1hcnkgcGxhbmUuICBOb3RlIHRoYXQgdGhpcyBpcyBhIGJpdCBkaWZmZXJl bnQgdGhhbiB3aGF0CisJICogaGFwcGVucyBpZiB1c2Vyc3BhY2UgZXhwbGljaXRseSBkaXNhYmxl cyB0aGUgcGxhbmUgYnkgcGFzc2luZyBmYj0wCisJICogYmVjYXVzZSBwbGFuZS0+ZmIgc3RpbGwg Z2V0cyBzZXQgYW5kIHBpbm5lZC4KKwkgKi8KKwlpZiAoIXZpc2libGUpIHsKKwkJLyoKKwkJICog VHJ5IHRvIHBpbiB0aGUgbmV3IGZiIGZpcnN0IHNvIHRoYXQgd2UgY2FuIGJhaWwgb3V0IGlmIHdl CisJCSAqIGZhaWwuCisJCSAqLworCQlpZiAocGxhbmUtPmZiICE9IGZiKSB7CisJCQlyZXQgPSBp bnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihkZXYsCisJCQkJCQkJIHRvX2ludGVsX2ZyYW1lYnVm ZmVyKGZiKS0+b2JqLAorCQkJCQkJCSBOVUxMKTsKKwkJCWlmIChyZXQpCisJCQkJcmV0dXJuIHJl dDsKKwkJfQorCisJCWlmIChpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQpCisJCQlpbnRlbF9k aXNhYmxlX3ByaW1hcnlfaHdfcGxhbmUoZGV2X3ByaXYsCisJCQkJCQkgICAgICAgaW50ZWxfcGxh bmUtPnBsYW5lLAorCQkJCQkJICAgICAgIGludGVsX3BsYW5lLT5waXBlKTsKKworCisJCWlmIChw bGFuZS0+ZmIgIT0gZmIpCisJCQlpZiAocGxhbmUtPmZiKQorCQkJCWludGVsX3VucGluX2ZiX29i aih0b19pbnRlbF9mcmFtZWJ1ZmZlcihwbGFuZS0+ZmIpLT5vYmopOworCisJCXJldHVybiAwOwor CX0KKworCXJldCA9IGludGVsX3BpcGVfc2V0X2Jhc2UoY3J0Yywgc3JjLngxLCBzcmMueTEsIGZi KTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCisJaWYgKCFpbnRlbF9jcnRjLT5wcmltYXJ5 X2VuYWJsZWQpCisJCWludGVsX2VuYWJsZV9wcmltYXJ5X2h3X3BsYW5lKGRldl9wcml2LCBpbnRl bF9jcnRjLT5wbGFuZSwKKwkJCQkJICAgICAgaW50ZWxfY3J0Yy0+cGlwZSk7CisKKwlyZXR1cm4g MDsKK30KKworc3RhdGljIHZvaWQgaW50ZWxfcHJpbWFyeV9wbGFuZV9kZXN0cm95KHN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lKQoreworCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0 b19pbnRlbF9wbGFuZShwbGFuZSk7CisJZHJtX3BsYW5lX2NsZWFudXAocGxhbmUpOworCWtmcmVl KGludGVsX3BsYW5lKTsKK30KKworc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfZnVuY3Mg aW50ZWxfcHJpbWFyeV9wbGFuZV9mdW5jcyA9IHsKKwkudXBkYXRlX3BsYW5lID0gaW50ZWxfcHJp bWFyeV9wbGFuZV9zZXRwbGFuZSwKKwkuZGlzYWJsZV9wbGFuZSA9IGludGVsX3ByaW1hcnlfcGxh bmVfZGlzYWJsZSwKKwkuZGVzdHJveSA9IGludGVsX3ByaW1hcnlfcGxhbmVfZGVzdHJveSwKK307 CisKK3N0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lICppbnRlbF9wcmltYXJ5X3BsYW5lX2NyZWF0ZShz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAorCQkJCQkJICAgIGludCBwaXBlKQoreworCXN0cnVjdCBp bnRlbF9wbGFuZSAqcHJpbWFyeTsKKwljb25zdCB1aW50MzJfdCAqaW50ZWxfcHJpbWFyeV9mb3Jt YXRzOworCWludCBudW1fZm9ybWF0czsKKworCXByaW1hcnkgPSBremFsbG9jKHNpemVvZigqcHJp bWFyeSksIEdGUF9LRVJORUwpOworCWlmIChwcmltYXJ5ID09IE5VTEwpCisJCXJldHVybiBOVUxM OworCisJcHJpbWFyeS0+Y2FuX3NjYWxlID0gZmFsc2U7CisJcHJpbWFyeS0+bWF4X2Rvd25zY2Fs ZSA9IDE7CisJcHJpbWFyeS0+cGlwZSA9IHBpcGU7CisJcHJpbWFyeS0+cGxhbmUgPSBwaXBlOwor CWlmIChIQVNfRkJDKGRldikgJiYgSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA0KQorCQlwcmltYXJ5 LT5wbGFuZSA9ICFwaXBlOworCisJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDw9IDMpIHsKKwkJ aW50ZWxfcHJpbWFyeV9mb3JtYXRzID0gaW50ZWxfcHJpbWFyeV9mb3JtYXRzX2dlbjI7CisJCW51 bV9mb3JtYXRzID0gQVJSQVlfU0laRShpbnRlbF9wcmltYXJ5X2Zvcm1hdHNfZ2VuMik7CisJfSBl bHNlIHsKKwkJaW50ZWxfcHJpbWFyeV9mb3JtYXRzID0gaW50ZWxfcHJpbWFyeV9mb3JtYXRzX2dl bjQ7CisJCW51bV9mb3JtYXRzID0gQVJSQVlfU0laRShpbnRlbF9wcmltYXJ5X2Zvcm1hdHNfZ2Vu NCk7CisJfQorCisJZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KGRldiwgJnByaW1hcnktPmJhc2Us IDAsCisJCQkJICZpbnRlbF9wcmltYXJ5X3BsYW5lX2Z1bmNzLAorCQkJCSBpbnRlbF9wcmltYXJ5 X2Zvcm1hdHMsIG51bV9mb3JtYXRzLAorCQkJCSBEUk1fUExBTkVfVFlQRV9QUklNQVJZKTsKKwly ZXR1cm4gJnByaW1hcnktPmJhc2U7Cit9CisKIHN0YXRpYyB2b2lkIGludGVsX2NydGNfaW5pdChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgcGlwZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9jcnRjICpp bnRlbF9jcnRjOwotCWludCBpOworCXN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnk7CisJaW50IGks IHJldDsKIAogCWludGVsX2NydGMgPSBremFsbG9jKHNpemVvZigqaW50ZWxfY3J0YyksIEdGUF9L RVJORUwpOwogCWlmIChpbnRlbF9jcnRjID09IE5VTEwpCiAJCXJldHVybjsKIAotCWRybV9jcnRj X2luaXQoZGV2LCAmaW50ZWxfY3J0Yy0+YmFzZSwgJmludGVsX2NydGNfZnVuY3MpOworCXByaW1h cnkgPSBpbnRlbF9wcmltYXJ5X3BsYW5lX2NyZWF0ZShkZXYsIHBpcGUpOworCXJldCA9IGRybV9j cnRjX2luaXRfd2l0aF9wbGFuZXMoZGV2LCAmaW50ZWxfY3J0Yy0+YmFzZSwgcHJpbWFyeSwKKwkJ CQkJTlVMTCwgJmludGVsX2NydGNfZnVuY3MpOworCWlmIChyZXQpIHsKKwkJZHJtX3BsYW5lX2Ns ZWFudXAocHJpbWFyeSk7CisJCWtmcmVlKGludGVsX2NydGMpOworCQlyZXR1cm47CisJfQogCiAJ ZHJtX21vZGVfY3J0Y19zZXRfZ2FtbWFfc2l6ZSgmaW50ZWxfY3J0Yy0+YmFzZSwgMjU2KTsKIAlm b3IgKGkgPSAwOyBpIDwgMjU2OyBpKyspIHsKLS0gCjEuOC41LjEKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==