From: Matt Roper Subject: [PATCH 4/4] drm/i915: Intel-specific primary plane handling (v7) Date: Thu, 15 May 2014 12:21:59 -0700 Message-ID: <1400181719-7394-1-git-send-email-matthew.d.roper@intel.com> References: <1398877623-16930-5-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id C92946E1C9 for ; Thu, 15 May 2014 12:21:22 -0700 (PDT) In-Reply-To: <1398877623-16930-5-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 bmRsaW5nIHRvIGFsbG93IHRoaXMuCgp2NzoKIC0gQ2xpcCBwcmltYXJ5IHBsYW5lIHRvIGludmlz aWJsZSB3aGVuIGNydGMgaXMgZGlzYWJsZWQgc2luY2UKICAgaW50ZWxfY3J0Yy0+Y29uZmlnLnBp cGVfc3JjX3t3LGh9IG1heSBiZSBnYXJiYWdlIG90aGVyd2lzZS4KIC0gVW5waW4gb2xkIGZiIGJl Zm9yZSBwaW5uaW5nIG5ldyBvbmUgaW4gdGhlICJqdXN0IHBpbiBhbmQKICAgcmV0dXJuIiBjYXNl IHRoYXQgaXMgdXNlZCB3aGVuIHRoZSBjcnRjIGlzIGRpc2FibGVkLgogLSBEb24ndCB0cmVhdCBp bXBsaWNpdCBkaXNhYmxpbmcgb2YgdGhlIHByaW1hcnkgcGxhbmUgKGNhdXNlZCBieQogICBjbGlw cGluZykgdGhlIHNhbWUgd2F5IGFzIGV4cGxpY2l0IGRpc2FibGluZyAoY2F1c2VkIGJ5IGZiPTAp LgogICBGb3IgaW1wbGljaXQgZGlzYWJsZXMsIHdlIHNob3VsZCBsZWF2ZSB0aGUgZmIgc2V0IGFu ZCBwaW5uZWQsCiAgIHdoZXJlYXMgZm9yIGV4cGxpY2l0IGRpc2FibGVzIHdlIG5lZWQgdG8gdW5w aW4gdGhlIGZiIGJlZm9yZQogICBwcmltYXJ5LT5mYiBpcyBjbGVhcmVkLgp2NjoKIC0gUGFzcyBy ZWN0YW5nbGVzIHRvIHByaW1hcnkgaGVscGVyIGNoZWNrIGZ1bmN0aW9uIGFuZCBnZXQgcGxhbmUK ICAgdmlzaWJpbGl0eSBiYWNrLgogLSBXYWl0IGZvciBwZW5kaW5nIHBhZ2VmbGlwcyBvbiBwcmlt YXJ5IHBsYW5lIHVwZGF0ZS9kaXNhYmxlLgogLSBBbGxvdyBwcmltYXJ5IHBsYW5lIHRvIGJlIHVw ZGF0ZWQgd2hpbGUgdGhlIGNydGMgaXMgZGlzYWJsZWQgKGNoYW5nZXMKICAgd2lsbCB0YWtlIGVm ZmVjdCB3aGVuIHRoZSBjcnRjIGlzIHJlLWVuYWJsZWQgaWYgbW9kZXNldCBwYXNzZXMgLTEKICAg Zm9yIHRoZSBmYiBpZCkuCiAtIERyb3AgV0FSTigpIGlmIHdlIHRyeSB0byBkaXNhYmxlIHRoZSBw cmltYXJ5IHBsYW5lIHdoZW4gaXQncwogICBhbHJlYWR5IGJlZW4gZGlzYWJsZWQuICBUaGlzIHdp bGwgaGFwcGVuIGlmIHRoZSBjcnRjIGdldHMgZGlzYWJsZWQKICAgYWZ0ZXIgdGhlIHByaW1hcnkg cGxhbmUgaGFzIGFscmVhZHkgYmVlbiBkaXNhYmxlZCBpbmRlcGVuZGVudGx5Lgp2NToKIC0gVXNl IG5ldyBkcm1fcHJpbWFyeV9oZWxwZXJfY2hlY2tfdXBkYXRlKCkgaGVscGVyIGZ1bmN0aW9uIHRv IGNoZWNrCiAgIHNldHBsYW5lIHBhcmFtZXRlciB2YWxpZGl0eS4KIC0gU3dhcCBwcmltYXJ5IHBs YW5lJ3MgcGlwZSBmb3IgcHJlLWdlbjQgRkJDIChjYXVnaHQgYnkgVmlsbGUgU3lyasOkbMOkKQog LSBDbGVhbnVwIHByaW1hcnkgcGxhbmUgcHJvcGVybHkgb24gY3J0YyBpbml0IGZhaWx1cmUKdjQ6 CiAtIERvbid0IGFkZCBhIHByaW1hcnlfcGxhbmUgZmllbGQgdG8gaW50ZWxfY3J0YzsgdGhhdCB3 YXMgbGVmdCBvdmVyCiAgIGZyb20gYSBtdWNoIGVhcmxpZXIgaXRlcmF0aW9uIG9mIHRoaXMgcGF0 Y2ggc2VyaWVzLCBidXQgaXMgbm8gbG9uZ2VyCiAgIG5lZWRlZC91c2VkIG5vdyB0aGF0IHRoZSBE Uk0gY29yZSBwcmltYXJ5IHBsYW5lIHN1cHBvcnQgaGFzIGJlZW4KICAgbWVyZ2VkLgp2MzoKIC0g UHJvdmlkZSBnZW4tc3BlY2lmaWMgcHJpbWFyeSBwbGFuZSBmb3JtYXQgbGlzdHMgKHN1Z2dlc3Rl ZCBieSBEYW5pZWwKICAgVmV0dGVyKS4KIC0gSWYgdGhlIHByaW1hcnkgcGxhbmUgaXMgYWxyZWFk eSBlbmFibGVkLCBnbyBhaGVhZCBhbmQganVzdCBjYWxsIHRoZQogICBwcmltYXJ5IHBsYW5lIGhl bHBlciB0byBkbyB0aGUgdXBkYXRlIChzdWdnZXN0ZWQgYnkgRGFuaWVsIFZldHRlcikuCiAtIERv bid0IHRyeSB0byBkaXNhYmxlIHRoZSBwcmltYXJ5IHBsYW5lIG9uIGRlc3RydWN0aW9uOyB0aGUg RFJNIGxheWVyCiAgIHNob3VsZCBoYXZlIGFscmVhZHkgdGFrZW4gY2FyZSBvZiB0aGlzIGZvciB1 cy4KdjI6CiAtIFVucGluIGZiIHByb3Blcmx5IG9uIHByaW1hcnkgcGxhbmUgZGlzYWJsZQogLSBQ cm92aWRlIGFuIEludGVsLXNwZWNpZmljIHNldCBvZiBwcmltYXJ5IHBsYW5lIGZvcm1hdHMKIC0g QWRkaXRpb25hbCBzYW5pdHkgY2hlY2tzIG9uIHNldHBsYW5lIChpbiBsaW5lIHdpdGggdGhlIGNo ZWNrcwogICBjdXJyZW50bHkgYmVpbmcgZG9uZSBieSB0aGUgRFJNIGNvcmUgcHJpbWFyeSBwbGFu ZSBoZWxwZXIpCgpTaWduZWQtb2ZmLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50 ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDIxMiAr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLQogMSBmaWxlIGNoYW5nZWQsIDIwOSBp bnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYwppbmRleCAzYWVkYzY0Li5lOWYxOTZlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCkBAIC0zOSwxMCArMzksMzcgQEAKICNpbmNsdWRlICJpOTE1X3RyYWNlLmgiCiAjaW5j bHVkZSA8ZHJtL2RybV9kcF9oZWxwZXIuaD4KICNpbmNsdWRlIDxkcm0vZHJtX2NydGNfaGVscGVy Lmg+CisjaW5jbHVkZSA8ZHJtL2RybV9wbGFuZV9oZWxwZXIuaD4KKyNpbmNsdWRlIDxkcm0vZHJt X3JlY3QuaD4KICNpbmNsdWRlIDxsaW51eC9kbWFfcmVtYXBwaW5nLmg+CiAKKy8qIFByaW1hcnkg cGxhbmUgZm9ybWF0cyBzdXBwb3J0ZWQgYnkgYWxsIGdlbiAqLworI2RlZmluZSBDT01NT05fUFJJ TUFSWV9GT1JNQVRTIFwKKwlEUk1fRk9STUFUX0M4LCBcCisJRFJNX0ZPUk1BVF9SR0I1NjUsIFwK KwlEUk1fRk9STUFUX1hSR0I4ODg4LCBcCisJRFJNX0ZPUk1BVF9BUkdCODg4OAorCisvKiBQcmlt YXJ5IHBsYW5lIGZvcm1hdHMgZm9yIGdlbiA8PSAzICovCitzdGF0aWMgY29uc3QgdWludDMyX3Qg aW50ZWxfcHJpbWFyeV9mb3JtYXRzX2dlbjJbXSA9IHsKKwlDT01NT05fUFJJTUFSWV9GT1JNQVRT LAorCURSTV9GT1JNQVRfWFJHQjE1NTUsCisJRFJNX0ZPUk1BVF9BUkdCMTU1NSwKK307CisKKy8q IFByaW1hcnkgcGxhbmUgZm9ybWF0cyBmb3IgZ2VuID49IDQgKi8KK3N0YXRpYyBjb25zdCB1aW50 MzJfdCBpbnRlbF9wcmltYXJ5X2Zvcm1hdHNfZ2VuNFtdID0geworCUNPTU1PTl9QUklNQVJZX0ZP Uk1BVFMsIFwKKwlEUk1fRk9STUFUX1hCR1I4ODg4LAorCURSTV9GT1JNQVRfQUJHUjg4ODgsCisJ RFJNX0ZPUk1BVF9YUkdCMjEwMTAxMCwKKwlEUk1fRk9STUFUX0FSR0IyMTAxMDEwLAorCURSTV9G T1JNQVRfWEJHUjIxMDEwMTAsCisJRFJNX0ZPUk1BVF9BQkdSMjEwMTAxMCwKK307CisKICNkZWZp bmUgRElWX1JPVU5EX0NMT1NFU1RfVUxMKGxsLCBkKQlcCi0JKHsgdW5zaWduZWQgbG9uZyBsb25n IF90bXAgPSAobGwpKyhkKS8yOyBkb19kaXYoX3RtcCwgZCk7IF90bXA7IH0pCisoeyB1bnNpZ25l ZCBsb25nIGxvbmcgX3RtcCA9IChsbCkrKGQpLzI7IGRvX2RpdihfdG1wLCBkKTsgX3RtcDsgfSkK IAogc3RhdGljIHZvaWQgaW50ZWxfaW5jcmVhc2VfcGxsY2xvY2soc3RydWN0IGRybV9jcnRjICpj cnRjKTsKIHN0YXRpYyB2b2lkIGludGVsX2NydGNfdXBkYXRlX2N1cnNvcihzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMsIGJvb2wgb24pOwpAQCAtMTA4MzIsMTcgKzEwODU5LDE5NiBAQCBzdGF0aWMgdm9p ZCBpbnRlbF9zaGFyZWRfZHBsbF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJQlVHX09O KGRldl9wcml2LT5udW1fc2hhcmVkX2RwbGwgPiBJOTE1X05VTV9QTExTKTsKIH0KIAorc3RhdGlj IGludAoraW50ZWxfcHJpbWFyeV9wbGFuZV9kaXNhYmxlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5l KQoreworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2OworCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGludGVs X3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKKwlzdHJ1Y3QgaW50 ZWxfY3J0YyAqaW50ZWxfY3J0YzsKKworCWlmICghcGxhbmUtPmZiKQorCQlyZXR1cm4gMDsKKwor CUJVR19PTighcGxhbmUtPmNydGMpOworCisJaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMocGxh bmUtPmNydGMpOworCisJLyoKKwkgKiBFdmVuIHRob3VnaCB3ZSBjaGVja2VkIHBsYW5lLT5mYiBh Ym92ZSwgaXQncyBzdGlsbCBwb3NzaWJsZSB0aGF0CisJICogdGhlIHByaW1hcnkgcGxhbmUgaGFz IGJlZW4gaW1wbGljaXRseSBkaXNhYmxlZCBiZWNhdXNlIHRoZSBjcnRjCisJICogY29vcmRpbmF0 ZXMgZ2l2ZW4gd2VyZW4ndCB2aXNpYmxlLCBvciBiZWNhdXNlIHdlIGRldGVjdGVkCisJICogdGhh dCBpdCB3YXMgMTAwJSBjb3ZlcmVkIGJ5IGEgc3ByaXRlIHBsYW5lLiAgT3IsIHRoZSBDUlRDIG1h eSBiZQorCSAqIG9mZiBhbmQgd2UndmUgc2V0IGEgZmIsIGJ1dCBoYXZlbid0IGFjdHVhbGx5IHR1 cm5lZCBvbiB0aGUgQ1JUQyB5ZXQuCisJICogSW4gZWl0aGVyIGNhc2UsIHdlIG5lZWQgdG8gdW5w aW4gdGhlIEZCIGFuZCBsZXQgdGhlIGZiIHBvaW50ZXIgZ2V0CisJICogdXBkYXRlZCwgYnV0IG90 aGVyd2lzZSB3ZSBkb24ndCBuZWVkIHRvIHRvdWNoIHRoZSBoYXJkd2FyZS4KKwkgKi8KKwlpZiAo IWludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZCkKKwkJZ290byBkaXNhYmxlX3VucGluOworCisJ aW50ZWxfY3J0Y193YWl0X2Zvcl9wZW5kaW5nX2ZsaXBzKHBsYW5lLT5jcnRjKTsKKwlpbnRlbF9k aXNhYmxlX3ByaW1hcnlfaHdfcGxhbmUoZGV2X3ByaXYsIGludGVsX3BsYW5lLT5wbGFuZSwKKwkJ CQkgICAgICAgaW50ZWxfcGxhbmUtPnBpcGUpOworCitkaXNhYmxlX3VucGluOgorCWludGVsX3Vu cGluX2ZiX29iaih0b19pbnRlbF9mcmFtZWJ1ZmZlcihwbGFuZS0+ZmIpLT5vYmopOworCXBsYW5l LT5mYiA9IE5VTEw7CisKKwlyZXR1cm4gMDsKK30KKworc3RhdGljIGludAoraW50ZWxfcHJpbWFy eV9wbGFuZV9zZXRwbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRj ICpjcnRjLAorCQkJICAgICBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwgaW50IGNydGNfeCwg aW50IGNydGNfeSwKKwkJCSAgICAgdW5zaWduZWQgaW50IGNydGNfdywgdW5zaWduZWQgaW50IGNy dGNfaCwKKwkJCSAgICAgdWludDMyX3Qgc3JjX3gsIHVpbnQzMl90IHNyY195LAorCQkJICAgICB1 aW50MzJfdCBzcmNfdywgdWludDMyX3Qgc3JjX2gpCit7CisJc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IGNydGMtPmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYt PmRldl9wcml2YXRlOworCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxf Y3J0YyhjcnRjKTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxf cGxhbmUocGxhbmUpOworCXN0cnVjdCBkcm1fcmVjdCBkZXN0ID0geworCQkvKiBpbnRlZ2VyIHBp eGVscyAqLworCQkueDEgPSBjcnRjX3gsCisJCS55MSA9IGNydGNfeSwKKwkJLngyID0gY3J0Y194 ICsgY3J0Y193LAorCQkueTIgPSBjcnRjX3kgKyBjcnRjX2gsCisJfTsKKwlzdHJ1Y3QgZHJtX3Jl Y3Qgc3JjID0geworCQkvKiAxNi4xNiBmaXhlZCBwb2ludCAqLworCQkueDEgPSBzcmNfeCwKKwkJ LnkxID0gc3JjX3ksCisJCS54MiA9IHNyY194ICsgc3JjX3csCisJCS55MiA9IHNyY195ICsgc3Jj X2gsCisJfTsKKwljb25zdCBzdHJ1Y3QgZHJtX3JlY3QgY2xpcCA9IHsKKwkJLyogaW50ZWdlciBw aXhlbHMgKi8KKwkJLngyID0gaW50ZWxfY3J0Yy0+YWN0aXZlID8gaW50ZWxfY3J0Yy0+Y29uZmln LnBpcGVfc3JjX3cgOiAwLAorCQkueTIgPSBpbnRlbF9jcnRjLT5hY3RpdmUgPyBpbnRlbF9jcnRj LT5jb25maWcucGlwZV9zcmNfaCA6IDAsCisJfTsKKwlib29sIHZpc2libGU7CisJaW50IHJldDsK KworCXJldCA9IGRybV9wcmltYXJ5X2hlbHBlcl9jaGVja191cGRhdGUocGxhbmUsIGNydGMsIGZi LAorCQkJCQkgICAgICAmc3JjLCAmZGVzdCwgJmNsaXAsCisJCQkJCSAgICAgIERSTV9QTEFORV9I RUxQRVJfTk9fU0NBTElORywKKwkJCQkJICAgICAgRFJNX1BMQU5FX0hFTFBFUl9OT19TQ0FMSU5H LAorCQkJCQkgICAgICBmYWxzZSwgdHJ1ZSwgJnZpc2libGUpOworCisJaWYgKHJldCkKKwkJcmV0 dXJuIHJldDsKKworCS8qCisJICogSWYgdGhlIENSVEMgaXNuJ3QgZW5hYmxlZCwgd2UncmUganVz dCBwaW5uaW5nIHRoZSBmcmFtZWJ1ZmZlciwKKwkgKiB1cGRhdGluZyB0aGUgZmIgcG9pbnRlciwg YW5kIHJldHVybmluZyB3aXRob3V0IHRvdWNoaW5nIHRoZQorCSAqIGhhcmR3YXJlLiAgVGhpcyBh bGxvd3MgdXMgdG8gbGF0ZXIgZG8gYSBkcm1Nb2RlU2V0Q3J0YyB3aXRoIGZiPS0xIHRvCisJICog dHVybiBvbiB0aGUgZGlzcGxheSB3aXRoIGFsbCBwbGFuZXMgc2V0dXAgYXMgZGVzaXJlZC4KKwkg Ki8KKwlpZiAoIWNydGMtPmVuYWJsZWQpIHsKKwkJLyoKKwkJICogSWYgd2UgYWxyZWFkeSBjYWxs ZWQgc2V0cGxhbmUgd2hpbGUgdGhlIGNydGMgd2FzIGRpc2FibGVkLAorCQkgKiB3ZSBtYXkgaGF2 ZSBhbiBmYiBwaW5uZWQ7IHVucGluIGl0LgorCQkgKi8KKwkJaWYgKHBsYW5lLT5mYikKKwkJCWlu dGVsX3VucGluX2ZiX29iaih0b19pbnRlbF9mcmFtZWJ1ZmZlcihwbGFuZS0+ZmIpLT5vYmopOwor CisJCS8qIFBpbiBhbmQgcmV0dXJuIHdpdGhvdXQgcHJvZ3JhbW1pbmcgaGFyZHdhcmUgKi8KKwkJ cmV0dXJuIGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKGRldiwKKwkJCQkJCSAgdG9faW50ZWxf ZnJhbWVidWZmZXIoZmIpLT5vYmosCisJCQkJCQkgIE5VTEwpOworCX0KKworCWludGVsX2NydGNf d2FpdF9mb3JfcGVuZGluZ19mbGlwcyhjcnRjKTsKKworCS8qCisJICogSWYgY2xpcHBpbmcgcmVz dWx0cyBpbiBhIG5vbi12aXNpYmxlIHByaW1hcnkgcGxhbmUsIGp1c3QgZGlzYWJsZSB0aGUKKwkg KiBwbGFuZSBoYXJkd2FyZS4gIE5vdGUgdGhhdCB0aGlzIGlzIGEgYml0IGRpZmZlcmVudCB0aGFu IGlmIHVzZXJzcGFjZQorCSAqIGV4cGxpY2l0bHkgZGlzYWJsZXMgdGhlIHBsYW5lIGJ5IHBhc3Np bmcgZmI9MCBiZWNhdXNlIHBsYW5lLT5mYgorCSAqIHJlbWFpbnMgc2V0IGFuZCBwaW5uZWQgdW50 aWwgd2Ugc3dpdGNoIHRvIGEgZGlmZmVyZW50IGZiLgorCSAqLworCWlmICghdmlzaWJsZSAmJiBp bnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQpIHsKKwkJaW50ZWxfZGlzYWJsZV9wcmltYXJ5X2h3 X3BsYW5lKGRldl9wcml2LCBpbnRlbF9wbGFuZS0+cGxhbmUsCisJCQkJCSAgICAgICBpbnRlbF9w bGFuZS0+cGlwZSk7CisJCXJldHVybiAwOworCX0KKworCXJldCA9IGludGVsX3BpcGVfc2V0X2Jh c2UoY3J0Yywgc3JjLngxLCBzcmMueTEsIGZiKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0Owor CisJaWYgKCFpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQpCisJCWludGVsX2VuYWJsZV9wcmlt YXJ5X2h3X3BsYW5lKGRldl9wcml2LCBpbnRlbF9jcnRjLT5wbGFuZSwKKwkJCQkJICAgICAgaW50 ZWxfY3J0Yy0+cGlwZSk7CisKKwlyZXR1cm4gMDsKK30KKworc3RhdGljIHZvaWQgaW50ZWxfcHJp bWFyeV9wbGFuZV9kZXN0cm95KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKQoreworCXN0cnVjdCBp bnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7CisJZHJtX3Bs YW5lX2NsZWFudXAocGxhbmUpOworCWtmcmVlKGludGVsX3BsYW5lKTsKK30KKworc3RhdGljIGNv bnN0IHN0cnVjdCBkcm1fcGxhbmVfZnVuY3MgaW50ZWxfcHJpbWFyeV9wbGFuZV9mdW5jcyA9IHsK KwkudXBkYXRlX3BsYW5lID0gaW50ZWxfcHJpbWFyeV9wbGFuZV9zZXRwbGFuZSwKKwkuZGlzYWJs ZV9wbGFuZSA9IGludGVsX3ByaW1hcnlfcGxhbmVfZGlzYWJsZSwKKwkuZGVzdHJveSA9IGludGVs X3ByaW1hcnlfcGxhbmVfZGVzdHJveSwKK307CisKK3N0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lICpp bnRlbF9wcmltYXJ5X3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAorCQkJCQkJ ICAgIGludCBwaXBlKQoreworCXN0cnVjdCBpbnRlbF9wbGFuZSAqcHJpbWFyeTsKKwljb25zdCB1 aW50MzJfdCAqaW50ZWxfcHJpbWFyeV9mb3JtYXRzOworCWludCBudW1fZm9ybWF0czsKKworCXBy aW1hcnkgPSBremFsbG9jKHNpemVvZigqcHJpbWFyeSksIEdGUF9LRVJORUwpOworCWlmIChwcmlt YXJ5ID09IE5VTEwpCisJCXJldHVybiBOVUxMOworCisJcHJpbWFyeS0+Y2FuX3NjYWxlID0gZmFs c2U7CisJcHJpbWFyeS0+bWF4X2Rvd25zY2FsZSA9IDE7CisJcHJpbWFyeS0+cGlwZSA9IHBpcGU7 CisJcHJpbWFyeS0+cGxhbmUgPSBwaXBlOworCWlmIChIQVNfRkJDKGRldikgJiYgSU5URUxfSU5G TyhkZXYpLT5nZW4gPCA0KQorCQlwcmltYXJ5LT5wbGFuZSA9ICFwaXBlOworCisJaWYgKElOVEVM X0lORk8oZGV2KS0+Z2VuIDw9IDMpIHsKKwkJaW50ZWxfcHJpbWFyeV9mb3JtYXRzID0gaW50ZWxf cHJpbWFyeV9mb3JtYXRzX2dlbjI7CisJCW51bV9mb3JtYXRzID0gQVJSQVlfU0laRShpbnRlbF9w cmltYXJ5X2Zvcm1hdHNfZ2VuMik7CisJfSBlbHNlIHsKKwkJaW50ZWxfcHJpbWFyeV9mb3JtYXRz ID0gaW50ZWxfcHJpbWFyeV9mb3JtYXRzX2dlbjQ7CisJCW51bV9mb3JtYXRzID0gQVJSQVlfU0la RShpbnRlbF9wcmltYXJ5X2Zvcm1hdHNfZ2VuNCk7CisJfQorCisJZHJtX3VuaXZlcnNhbF9wbGFu ZV9pbml0KGRldiwgJnByaW1hcnktPmJhc2UsIDAsCisJCQkJICZpbnRlbF9wcmltYXJ5X3BsYW5l X2Z1bmNzLAorCQkJCSBpbnRlbF9wcmltYXJ5X2Zvcm1hdHMsIG51bV9mb3JtYXRzLAorCQkJCSBE Uk1fUExBTkVfVFlQRV9QUklNQVJZKTsKKwlyZXR1cm4gJnByaW1hcnktPmJhc2U7Cit9CisKIHN0 YXRpYyB2b2lkIGludGVsX2NydGNfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgcGlw ZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2 YXRlOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjOwotCWludCBpOworCXN0cnVjdCBk cm1fcGxhbmUgKnByaW1hcnk7CisJaW50IGksIHJldDsKIAogCWludGVsX2NydGMgPSBremFsbG9j KHNpemVvZigqaW50ZWxfY3J0YyksIEdGUF9LRVJORUwpOwogCWlmIChpbnRlbF9jcnRjID09IE5V TEwpCiAJCXJldHVybjsKIAotCWRybV9jcnRjX2luaXQoZGV2LCAmaW50ZWxfY3J0Yy0+YmFzZSwg JmludGVsX2NydGNfZnVuY3MpOworCXByaW1hcnkgPSBpbnRlbF9wcmltYXJ5X3BsYW5lX2NyZWF0 ZShkZXYsIHBpcGUpOworCXJldCA9IGRybV9jcnRjX2luaXRfd2l0aF9wbGFuZXMoZGV2LCAmaW50 ZWxfY3J0Yy0+YmFzZSwgcHJpbWFyeSwKKwkJCQkJTlVMTCwgJmludGVsX2NydGNfZnVuY3MpOwor CWlmIChyZXQpIHsKKwkJZHJtX3BsYW5lX2NsZWFudXAocHJpbWFyeSk7CisJCWtmcmVlKGludGVs X2NydGMpOworCQlyZXR1cm47CisJfQogCiAJZHJtX21vZGVfY3J0Y19zZXRfZ2FtbWFfc2l6ZSgm aW50ZWxfY3J0Yy0+YmFzZSwgMjU2KTsKIAlmb3IgKGkgPSAwOyBpIDwgMjU2OyBpKyspIHsKLS0g CjEuOC41LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==