From: Matt Roper Subject: [PATCH 5/7] drm/i915: Prepare for atomic plane helpers (v6) Date: Tue, 9 Dec 2014 11:53:41 -0800 Message-ID: <1418154823-10819-6-git-send-email-matthew.d.roper@intel.com> References: <1418154823-10819-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 [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id C67566E2A2 for ; Tue, 9 Dec 2014 11:54:14 -0800 (PST) In-Reply-To: <1418154823-10819-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 QWRkIHRoZSBuZXcgZHJpdmVyIGVudHJ5cG9pbnRzIHRoYXQgd2lsbCBiZSBjYWxsZWQgYnkgdGhl IGF0b21pYyBwbGFuZQpoZWxwZXJzLgoKVGhpcyBwYXRjaCBkb2VzIG5vdCBhY3R1YWxseSBzd2l0 Y2ggb3ZlciB0byB0aGUgbmV3IHBsYW5lIGhlbHBlcnMgeWV0LApzbyB0aGVyZSBzaG91bGQgYmUg bm8gZnVuY3Rpb25hbCBjaGFuZ2UgaGVyZS4gIEFsc28gbm90ZSB0aGF0IGFsdGhvdWdoCnBsYW5l IHByb2dyYW1taW5nIHdhcyBhbHJlYWR5IHNwbGl0IGludG8gY2hlY2svcHJlcGFyZS9jb21taXQg c3RlcHMsCnNvbWUgb2YgdGhlIHNlbWFudGljcyBvZiB0aG9zZSBpbmRpdmlkdWFsIGZ1bmN0aW9u cyB3aWxsIG5lZWQgdG8gY2hhbmdlCnNsaWdodGx5IHdoZW4gd2UgZG8gbWFrZSB0aGUganVtcCBz byB0aGF0IHRoZXkgbWF0Y2ggdGhlIGJlaGF2aW9yIHRoZQpwbGFuZSBoZWxwZXJzIGV4cGVjdC4K CnYyOgogLSBSZW5hbWVkIGZpbGUgZnJvbSBpbnRlbF9hdG9taWMuYyB0byBpbnRlbF9hdG9taWNf cGxhbmUuYyAoRGFuaWVsKQogLSBGaXggYSBjb3B5L3Bhc3RlIGNvbW1lbnQgbWlzdGFrZSAoQm9i KQoKdjM6CiAtIFVzZSBwcmVwYXJlL2NsZWFudXAgZnVuY3Rpb25zIHRoYXQgd2UndmUgYWxyZWFk eSBmYWN0b3JlZCBvdXQKIC0gVXNlIG5ld2x5IHJlZmFjdG9yZWQgcHJlX2NvbW1pdC9jb21taXQv cG9zdF9jb21taXQgdG8gYXZvaWQgc2xlZXBpbmcKICAgZHVyaW5nIHZibGFuayBldmFzaW9uCgp2 NDoKIC0gUmViYXNlIHRvIGxhdGVzdCBkaS1uaWdodGx5IHJlcXVpcmVzIGFkZGluZyBhbiAnb2xk X3N0YXRlJyBwYXJhbWV0ZXIKICAgdG8gYXRvbWljX3VwZGF0ZTsKCnY1OgogLSBNdXN0IGhhdmUg Ym90Y2hlZCBhIHJlYmFzZSBzb21ld2hlcmUgYW5kIGxvc3Qgc29tZSB3b3JrLiAgUmVzdG9yZQog ICBzdGF0ZSAnZGlydHknIGZsYWcgdG8gbGV0IGJlZ2luL2VuZCBjb2RlIGtub3cgd2hpY2ggcGxh bmVzIHRvCiAgIHJ1biB0aGUgcHJlX2NvbW1pdC9wb3N0X2NvbW1pdCBob29rcyBmb3IuICBUaGlz IHdvdWxkIGhhdmUgYWN0dWFsbHkKICAgc2hvd24gdXAgYXMgYnJva2VuIGluIHRoZSBuZXh0IGNv bW1pdCByYXRoZXIgdGhhbiB0aGlzIG9uZS4KCnY2OgogLSBTcXVhc2gga2VybmVsZG9jIHBhdGNo IGludG8gdGhpcyBvbmUuCiAtIFByZXZpb3VzIHBhdGNoZXMgaGF2ZSBub3cgYWxyZWFkeSB0YWtl biBjYXJlIG9mIG1vc3Qgb2YgdGhlCiAgIGluZnJhc3RydWN0dXJlIHRoYXQgdXNlZCB0byBiZSBp biB0aGlzIHBhdGNoLiAgQWxsIHdlJ3JlIGFkZGluZyBoZXJlCiAgIG5vdyBpcyBzb21lIHRoaW4g d3JhcHBlcnMuCgpTaWduZWQtb2ZmLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50 ZWwuY29tPgotLS0KIERvY3VtZW50YXRpb24vRG9jQm9vay9kcm0udG1wbCAgICAgICAgICAgIHwg ICA1ICsrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9NYWtlZmlsZSAgICAgICAgICAgICB8ICAgMSAr CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYyB8IDE0NSArKysrKysr KysrKysrKysrKysrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYyAgICAgIHwgIDIyICsrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAg ICAgICAgICB8ICAgOCArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgICAg ICAgfCAgIDggKysKIDYgZmlsZXMgY2hhbmdlZCwgMTg4IGluc2VydGlvbnMoKyksIDEgZGVsZXRp b24oLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9t aWNfcGxhbmUuYwoKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vRG9jQm9vay9kcm0udG1wbCBi L0RvY3VtZW50YXRpb24vRG9jQm9vay9kcm0udG1wbAppbmRleCA4NTI4N2NiLi4zZDlmZWY5IDEw MDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL0RvY0Jvb2svZHJtLnRtcGwKKysrIGIvRG9jdW1lbnRh dGlvbi9Eb2NCb29rL2RybS50bXBsCkBAIC0zOTA3LDYgKzM5MDcsMTEgQEAgaW50IG51bV9pb2N0 bHM7PC9zeW5vcHNpcz4KICAgICAgICAgPC9wYXJhPgogICAgICAgPC9zZWN0Mj4KICAgICAgIDxz ZWN0Mj4KKyAgICAgICAgPHRpdGxlPkF0b21pYyBQbGFuZSBIZWxwZXJzPC90aXRsZT4KKyFQZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMgYXRvbWljIHBsYW5lIGhlbHBl cnMKKyFJZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKKyAgICAgIDwv c2VjdDI+CisgICAgICA8c2VjdDI+CiAgICAgICAgIDx0aXRsZT5PdXRwdXQgUHJvYmluZzwvdGl0 bGU+CiAgICAgICAgIDxwYXJhPgogCSAgVGhpcyBzZWN0aW9uIGNvdmVycyBvdXRwdXQgcHJvYmlu ZyBhbmQgcmVsYXRlZCBpbmZyYXN0cnVjdHVyZSBsaWtlIHRoZQpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvTWFrZWZpbGUgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9NYWtlZmlsZQpp bmRleCBlNDA4M2U0Li5mNDRmZTlmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9N YWtlZmlsZQorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9NYWtlZmlsZQpAQCAtNjQsNiArNjQs NyBAQCBpOTE1LXkgKz0gZHZvX2NoNzAxNy5vIFwKIAkgIGR2b19uczI1MDEubyBcCiAJICBkdm9f c2lsMTY0Lm8gXAogCSAgZHZvX3RmcDQxMC5vIFwKKwkgIGludGVsX2F0b21pY19wbGFuZS5vIFwK IAkgIGludGVsX2NydC5vIFwKIAkgIGludGVsX2RkaS5vIFwKIAkgIGludGVsX2RwLm8gXApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYwpuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwLi4zYjA4NjkyCi0tLSAvZGV2L251bGwKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKQEAgLTAsMCArMSwxNDUgQEAKKy8qCisgKiBD b3B5cmlnaHQgwqkgMjAxNCBJbnRlbCBDb3Jwb3JhdGlvbgorICoKKyAqIFBlcm1pc3Npb24gaXMg aGVyZWJ5IGdyYW50ZWQsIGZyZWUgb2YgY2hhcmdlLCB0byBhbnkgcGVyc29uIG9idGFpbmluZyBh CisgKiBjb3B5IG9mIHRoaXMgc29mdHdhcmUgYW5kIGFzc29jaWF0ZWQgZG9jdW1lbnRhdGlvbiBm aWxlcyAodGhlICJTb2Z0d2FyZSIpLAorICogdG8gZGVhbCBpbiB0aGUgU29mdHdhcmUgd2l0aG91 dCByZXN0cmljdGlvbiwgaW5jbHVkaW5nIHdpdGhvdXQgbGltaXRhdGlvbgorICogdGhlIHJpZ2h0 cyB0byB1c2UsIGNvcHksIG1vZGlmeSwgbWVyZ2UsIHB1Ymxpc2gsIGRpc3RyaWJ1dGUsIHN1Ymxp Y2Vuc2UsCisgKiBhbmQvb3Igc2VsbCBjb3BpZXMgb2YgdGhlIFNvZnR3YXJlLCBhbmQgdG8gcGVy bWl0IHBlcnNvbnMgdG8gd2hvbSB0aGUKKyAqIFNvZnR3YXJlIGlzIGZ1cm5pc2hlZCB0byBkbyBz bywgc3ViamVjdCB0byB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnM6CisgKgorICogVGhlIGFib3Zl IGNvcHlyaWdodCBub3RpY2UgYW5kIHRoaXMgcGVybWlzc2lvbiBub3RpY2UgKGluY2x1ZGluZyB0 aGUgbmV4dAorICogcGFyYWdyYXBoKSBzaGFsbCBiZSBpbmNsdWRlZCBpbiBhbGwgY29waWVzIG9y IHN1YnN0YW50aWFsIHBvcnRpb25zIG9mIHRoZQorICogU29mdHdhcmUuCisgKgorICogVEhFIFNP RlRXQVJFIElTIFBST1ZJREVEICJBUyBJUyIsIFdJVEhPVVQgV0FSUkFOVFkgT0YgQU5ZIEtJTkQs IEVYUFJFU1MgT1IKKyAqIElNUExJRUQsIElOQ0xVRElORyBCVVQgTk9UIExJTUlURUQgVE8gVEhF IFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZLAorICogRklUTkVTUyBGT1IgQSBQQVJUSUNV TEFSIFBVUlBPU0UgQU5EIE5PTklORlJJTkdFTUVOVC4gIElOIE5PIEVWRU5UIFNIQUxMCisgKiBU SEUgQVVUSE9SUyBPUiBDT1BZUklHSFQgSE9MREVSUyBCRSBMSUFCTEUgRk9SIEFOWSBDTEFJTSwg REFNQUdFUyBPUiBPVEhFUgorICogTElBQklMSVRZLCBXSEVUSEVSIElOIEFOIEFDVElPTiBPRiBD T05UUkFDVCwgVE9SVCBPUiBPVEhFUldJU0UsIEFSSVNJTkcKKyAqIEZST00sIE9VVCBPRiBPUiBJ TiBDT05ORUNUSU9OIFdJVEggVEhFIFNPRlRXQVJFIE9SIFRIRSBVU0UgT1IgT1RIRVIKKyAqIERF QUxJTkdTIElOIFRIRSBTT0ZUV0FSRS4KKyAqLworCisvKioKKyAqIERPQzogYXRvbWljIHBsYW5l IGhlbHBlciBzdXBwb3J0CisgKgorICogVGhlIGZ1bmN0aW9ucyBoZXJlIGFyZSB1c2VkIGJ5IHRo ZSBhdG9taWMgcGxhbmUgaGVscGVyIGZ1bmN0aW9ucyB0bworICogaW1wbGVtZW50IGxlZ2FjeSBw bGFuZSB1cGRhdGVzIChpLmUuLCBkcm1fcGxhbmUtPnVwZGF0ZV9wbGFuZSgpIGFuZAorICogZHJt X3BsYW5lLT5kaXNhYmxlX3BsYW5lKCkpLiAgVGhpcyBhbGxvd3MgcGxhbmUgdXBkYXRlcyB0byB1 c2UgdGhlCisgKiBhdG9taWMgc3RhdGUgaW5mcmFzdHJ1Y3R1cmUgYW5kIHBlcmZvcm0gcGxhbmUg dXBkYXRlcyBhcyBzZXBhcmF0ZQorICogcHJlcGFyZS9jaGVjay9jb21taXQvY2xlYW51cCBzdGVw cy4KKyAqLworCisjaW5jbHVkZSA8ZHJtL2RybVAuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX2F0b21p Y19oZWxwZXIuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX3BsYW5lX2hlbHBlci5oPgorI2luY2x1ZGUg ImludGVsX2Rydi5oIgorCisvKioKKyAqIGludGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZSAtIGR1 cGxpY2F0ZSBwbGFuZSBzdGF0ZQorICogQHBsYW5lOiBkcm0gcGxhbmUKKyAqCisgKiBBbGxvY2F0 ZXMgYW5kIHJldHVybnMgYSBjb3B5IG9mIHRoZSBwbGFuZSBzdGF0ZSAoYm90aCBjb21tb24gYW5k CisgKiBJbnRlbC1zcGVjaWZpYykgZm9yIHRoZSBzcGVjaWZpZWQgcGxhbmUuCisgKi8KK3N0cnVj dCBkcm1fcGxhbmVfc3RhdGUgKgoraW50ZWxfcGxhbmVfZHVwbGljYXRlX3N0YXRlKHN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lKQoreworCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGU7CisK KwlpZiAocGxhbmUtPnN0YXRlKQorCQlzdGF0ZSA9IGttZW1kdXAocGxhbmUtPnN0YXRlLCBzaXpl b2YoKnN0YXRlKSwgR0ZQX0tFUk5FTCk7CisJZWxzZQorCQlzdGF0ZSA9IGt6YWxsb2Moc2l6ZW9m KCpzdGF0ZSksIEdGUF9LRVJORUwpOworCisJaWYgKHN0YXRlICYmIHN0YXRlLT5iYXNlLmZiKQor CQlkcm1fZnJhbWVidWZmZXJfcmVmZXJlbmNlKHN0YXRlLT5iYXNlLmZiKTsKKworCXJldHVybiAm c3RhdGUtPmJhc2U7Cit9CisKKy8qKgorICogaW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZSAtIGRl c3Ryb3kgcGxhbmUgc3RhdGUKKyAqIEBwbGFuZTogZHJtIHBsYW5lCisgKgorICogRGVzdHJveXMg dGhlIHBsYW5lIHN0YXRlIChib3RoIGNvbW1vbiBhbmQgSW50ZWwtc3BlY2lmaWMpIGZvciB0aGUK KyAqIHNwZWNpZmllZCBwbGFuZS4KKyAqLwordm9pZAoraW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0 ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKKwkJCSAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAq c3RhdGUpCit7CisJZHJtX2F0b21pY19oZWxwZXJfcGxhbmVfZGVzdHJveV9zdGF0ZShwbGFuZSwg c3RhdGUpOworfQorCitzdGF0aWMgaW50IGludGVsX3BsYW5lX2F0b21pY19jaGVjayhzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSwKKwkJCQkgICAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqc3RhdGUp Cit7CisJc3RydWN0IGRybV9jcnRjICpjcnRjID0gc3RhdGUtPmNydGM7CisJc3RydWN0IGludGVs X2NydGMgKmludGVsX2NydGM7CisJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRv X2ludGVsX3BsYW5lKHBsYW5lKTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3N0 YXRlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUoc3RhdGUpOworCisJY3J0YyA9IGNydGMgPyBjcnRj IDogcGxhbmUtPmNydGM7CisJaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisKKwkv KgorCSAqIFRoZSBvcmlnaW5hbCBzcmMvZGVzdCBjb29yZGluYXRlcyBhcmUgc3RvcmVkIGluIHN0 YXRlLT5iYXNlLCBidXQKKwkgKiB3ZSB3YW50IHRvIGtlZXAgYW5vdGhlciBjb3B5IGludGVybmFs IHRvIG91ciBkcml2ZXIgdGhhdCB3ZSBjYW4KKwkgKiBjbGlwL21vZGlmeSBvdXJzZWx2ZXMuCisJ ICovCisJaW50ZWxfc3RhdGUtPnNyYy54MSA9IHN0YXRlLT5zcmNfeDsKKwlpbnRlbF9zdGF0ZS0+ c3JjLnkxID0gc3RhdGUtPnNyY195OworCWludGVsX3N0YXRlLT5zcmMueDIgPSBzdGF0ZS0+c3Jj X3ggKyBzdGF0ZS0+c3JjX3c7CisJaW50ZWxfc3RhdGUtPnNyYy55MiA9IHN0YXRlLT5zcmNfeSAr IHN0YXRlLT5zcmNfaDsKKwlpbnRlbF9zdGF0ZS0+ZHN0LngxID0gc3RhdGUtPmNydGNfeDsKKwlp bnRlbF9zdGF0ZS0+ZHN0LnkxID0gc3RhdGUtPmNydGNfeTsKKwlpbnRlbF9zdGF0ZS0+ZHN0Lngy ID0gc3RhdGUtPmNydGNfeCArIHN0YXRlLT5jcnRjX3c7CisJaW50ZWxfc3RhdGUtPmRzdC55MiA9 IHN0YXRlLT5jcnRjX3kgKyBzdGF0ZS0+Y3J0Y19oOworCisJLyogQ2xpcCBhbGwgcGxhbmVzIHRv IENSVEMgc2l6ZSwgb3IgMHgwIGlmIENSVEMgaXMgZGlzYWJsZWQgKi8KKwlpbnRlbF9zdGF0ZS0+ Y2xpcC54MSA9IDA7CisJaW50ZWxfc3RhdGUtPmNsaXAueTEgPSAwOworCWludGVsX3N0YXRlLT5j bGlwLngyID0KKwkJaW50ZWxfY3J0Yy0+YWN0aXZlID8gaW50ZWxfY3J0Yy0+Y29uZmlnLnBpcGVf c3JjX3cgOiAwOworCWludGVsX3N0YXRlLT5jbGlwLnkyID0KKwkJaW50ZWxfY3J0Yy0+YWN0aXZl ID8gaW50ZWxfY3J0Yy0+Y29uZmlnLnBpcGVfc3JjX2ggOiAwOworCisJLyoKKwkgKiBEaXNhYmxp bmcgYSBwbGFuZSBpcyBhbHdheXMgb2theTsgd2UganVzdCBuZWVkIHRvIHVwZGF0ZQorCSAqIGZi IHRyYWNraW5nIGluIGEgc3BlY2lhbCB3YXkgc2luY2UgY2xlYW51cF9mYigpIHdvbid0CisJICog Z2V0IGNhbGxlZCBieSB0aGUgcGxhbmUgaGVscGVycy4KKwkgKi8KKwlpZiAoc3RhdGUtPmZiID09 IE5VTEwgJiYgcGxhbmUtPnN0YXRlLT5mYiAhPSBOVUxMKSB7CisJCS8qCisJCSAqICdwcmVwYXJl JyBpcyBuZXZlciBjYWxsZWQgd2hlbiBwbGFuZSBpcyBiZWluZyBkaXNhYmxlZCwgc28KKwkJICog d2UgbmVlZCB0byBoYW5kbGUgZnJvbnRidWZmZXIgdHJhY2tpbmcgYXMgYSBzcGVjaWFsIGNhc2UK KwkJICovCisJCWludGVsX2NydGMtPmF0b21pYy50cmFja19mYnMgfD0gKDEgPDwgZHJtX3BsYW5l X2luZGV4KHBsYW5lKSk7CisJfQorCisJcmV0dXJuIGludGVsX3BsYW5lLT5jaGVja19wbGFuZShw bGFuZSwgaW50ZWxfc3RhdGUpOworfQorCitzdGF0aWMgdm9pZCBpbnRlbF9wbGFuZV9hdG9taWNf dXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAorCQkJCSAgICAgIHN0cnVjdCBkcm1fcGxh bmVfc3RhdGUgKm9sZF9zdGF0ZSkKK3sKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5l ID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOworCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqaW50 ZWxfc3RhdGUgPQorCQl0b19pbnRlbF9wbGFuZV9zdGF0ZShwbGFuZS0+c3RhdGUpOworCisJLyog RG9uJ3QgZGlzYWJsZSBhbiBhbHJlYWR5IGRpc2FibGVkIHBsYW5lICovCisJaWYgKCFwbGFuZS0+ c3RhdGUtPmZiICYmICFvbGRfc3RhdGUtPmZiKQorCQlyZXR1cm47CisKKwlpbnRlbF9wbGFuZS0+ Y29tbWl0X3BsYW5lKHBsYW5lLCBpbnRlbF9zdGF0ZSk7Cit9CisKK2NvbnN0IHN0cnVjdCBkcm1f cGxhbmVfaGVscGVyX2Z1bmNzIGludGVsX3BsYW5lX2hlbHBlcl9mdW5jcyA9IHsKKwkucHJlcGFy ZV9mYiA9IGludGVsX3ByZXBhcmVfcGxhbmVfZmIsCisJLmNsZWFudXBfZmIgPSBpbnRlbF9jbGVh bnVwX3BsYW5lX2ZiLAorCS5hdG9taWNfY2hlY2sgPSBpbnRlbF9wbGFuZV9hdG9taWNfY2hlY2ss CisJLmF0b21pY191cGRhdGUgPSBpbnRlbF9wbGFuZV9hdG9taWNfdXBkYXRlLAorfTsKKwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDAzNmY1YjcuLmVhNDc5MjMgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTk4LDYgKzk4LDggQEAgc3RhdGljIHZv aWQgdmx2X3ByZXBhcmVfcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJICAgIGNvbnN0 IHN0cnVjdCBpbnRlbF9jcnRjX2NvbmZpZyAqcGlwZV9jb25maWcpOwogc3RhdGljIHZvaWQgY2h2 X3ByZXBhcmVfcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJICAgIGNvbnN0IHN0cnVj dCBpbnRlbF9jcnRjX2NvbmZpZyAqcGlwZV9jb25maWcpOworc3RhdGljIHZvaWQgaW50ZWxfYmVn aW5fY3J0Y19jb21taXQoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKK3N0YXRpYyB2b2lkIGludGVs X2ZpbmlzaF9jcnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwogCiBzdGF0aWMgc3Ry dWN0IGludGVsX2VuY29kZXIgKmludGVsX2ZpbmRfZW5jb2RlcihzdHJ1Y3QgaW50ZWxfY29ubmVj dG9yICpjb25uZWN0b3IsIGludCBwaXBlKQogewpAQCAtOTc5NCw2ICs5Nzk2LDggQEAgb3V0X2hh bmc6CiBzdGF0aWMgc3RydWN0IGRybV9jcnRjX2hlbHBlcl9mdW5jcyBpbnRlbF9oZWxwZXJfZnVu Y3MgPSB7CiAJLm1vZGVfc2V0X2Jhc2VfYXRvbWljID0gaW50ZWxfcGlwZV9zZXRfYmFzZV9hdG9t aWMsCiAJLmxvYWRfbHV0ID0gaW50ZWxfY3J0Y19sb2FkX2x1dCwKKwkuYXRvbWljX2JlZ2luID0g aW50ZWxfYmVnaW5fY3J0Y19jb21taXQsCisJLmF0b21pY19mbHVzaCA9IGludGVsX2ZpbmlzaF9j cnRjX2NvbW1pdCwKIH07CiAKIC8qKgpAQCAtMTIwMDUsNiArMTIwMDksNyBAQCBpbnRlbF9kaXNh YmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKQogdm9pZCBpbnRlbF9wbGFuZV9kZXN0 cm95KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKQogewogCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50 ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7CisJaW50ZWxfcGxhbmVfZGVzdHJveV9z dGF0ZShwbGFuZSwgcGxhbmUtPnN0YXRlKTsKIAlkcm1fcGxhbmVfY2xlYW51cChwbGFuZSk7CiAJ a2ZyZWUoaW50ZWxfcGxhbmUpOwogfQpAQCAtMTIwMTMsMTMgKzEyMDE4LDE3IEBAIHN0YXRpYyBj b25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIGludGVsX3ByaW1hcnlfcGxhbmVfZnVuY3MgPSB7 CiAJLnVwZGF0ZV9wbGFuZSA9IGludGVsX3VwZGF0ZV9wbGFuZSwKIAkuZGlzYWJsZV9wbGFuZSA9 IGludGVsX2Rpc2FibGVfcGxhbmUsCiAJLmRlc3Ryb3kgPSBpbnRlbF9wbGFuZV9kZXN0cm95LAot CS5zZXRfcHJvcGVydHkgPSBpbnRlbF9wbGFuZV9zZXRfcHJvcGVydHkKKwkuc2V0X3Byb3BlcnR5 ID0gaW50ZWxfcGxhbmVfc2V0X3Byb3BlcnR5LAorCS5hdG9taWNfZHVwbGljYXRlX3N0YXRlID0g aW50ZWxfcGxhbmVfZHVwbGljYXRlX3N0YXRlLAorCS5hdG9taWNfZGVzdHJveV9zdGF0ZSA9IGlu dGVsX3BsYW5lX2Rlc3Ryb3lfc3RhdGUsCisKIH07CiAKIHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5l ICppbnRlbF9wcmltYXJ5X3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJ CQkJICAgIGludCBwaXBlKQogewogCXN0cnVjdCBpbnRlbF9wbGFuZSAqcHJpbWFyeTsKKwlzdHJ1 Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlOwogCWNvbnN0IHVpbnQzMl90ICppbnRlbF9wcmlt YXJ5X2Zvcm1hdHM7CiAJaW50IG51bV9mb3JtYXRzOwogCkBAIC0xMjAyNyw2ICsxMjAzNiw4IEBA IHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lICppbnRlbF9wcmltYXJ5X3BsYW5lX2NyZWF0ZShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAogCWlmIChwcmltYXJ5ID09IE5VTEwpCiAJCXJldHVybiBOVUxM OwogCisJcHJpbWFyeS0+YmFzZS5zdGF0ZSA9IGludGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZSgm cHJpbWFyeS0+YmFzZSk7CisJc3RhdGUgPSB0b19pbnRlbF9wbGFuZV9zdGF0ZShwcmltYXJ5LT5i YXNlLnN0YXRlKTsKIAlwcmltYXJ5LT5jYW5fc2NhbGUgPSBmYWxzZTsKIAlwcmltYXJ5LT5tYXhf ZG93bnNjYWxlID0gMTsKIAlwcmltYXJ5LT5waXBlID0gcGlwZTsKQEAgLTEyMDYyLDYgKzEyMDcz LDggQEAgc3RhdGljIHN0cnVjdCBkcm1fcGxhbmUgKmludGVsX3ByaW1hcnlfcGxhbmVfY3JlYXRl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJcHJpbWFyeS0+cm90YXRpb24pOwogCX0KIAor CWRybV9wbGFuZV9oZWxwZXJfYWRkKCZwcmltYXJ5LT5iYXNlLCAmaW50ZWxfcGxhbmVfaGVscGVy X2Z1bmNzKTsKKwogCXJldHVybiAmcHJpbWFyeS0+YmFzZTsKIH0KIApAQCAtMTIxODIsMTcgKzEy MTk1LDIyIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIGludGVsX2N1cnNv cl9wbGFuZV9mdW5jcyA9IHsKIAkuZGlzYWJsZV9wbGFuZSA9IGludGVsX2Rpc2FibGVfcGxhbmUs CiAJLmRlc3Ryb3kgPSBpbnRlbF9wbGFuZV9kZXN0cm95LAogCS5zZXRfcHJvcGVydHkgPSBpbnRl bF9wbGFuZV9zZXRfcHJvcGVydHksCisJLmF0b21pY19kdXBsaWNhdGVfc3RhdGUgPSBpbnRlbF9w bGFuZV9kdXBsaWNhdGVfc3RhdGUsCisJLmF0b21pY19kZXN0cm95X3N0YXRlID0gaW50ZWxfcGxh bmVfZGVzdHJveV9zdGF0ZSwKIH07CiAKIHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lICppbnRlbF9j dXJzb3JfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJCQkgICBpbnQg cGlwZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmN1cnNvcjsKKwlzdHJ1Y3QgaW50ZWxfcGxh bmVfc3RhdGUgKnN0YXRlOwogCiAJY3Vyc29yID0ga3phbGxvYyhzaXplb2YoKmN1cnNvciksIEdG UF9LRVJORUwpOwogCWlmIChjdXJzb3IgPT0gTlVMTCkKIAkJcmV0dXJuIE5VTEw7CiAKKwljdXJz b3ItPmJhc2Uuc3RhdGUgPSBpbnRlbF9wbGFuZV9kdXBsaWNhdGVfc3RhdGUoJmN1cnNvci0+YmFz ZSk7CisJc3RhdGUgPSB0b19pbnRlbF9wbGFuZV9zdGF0ZShjdXJzb3ItPmJhc2Uuc3RhdGUpOwog CWN1cnNvci0+Y2FuX3NjYWxlID0gZmFsc2U7CiAJY3Vyc29yLT5tYXhfZG93bnNjYWxlID0gMTsK IAljdXJzb3ItPnBpcGUgPSBwaXBlOwpAQCAtMTIyMTksNiArMTIyMzcsOCBAQCBzdGF0aWMgc3Ry dWN0IGRybV9wbGFuZSAqaW50ZWxfY3Vyc29yX3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAogCQkJCWN1cnNvci0+cm90YXRpb24pOwogCX0KIAorCWRybV9wbGFuZV9oZWxwZXJf YWRkKCZjdXJzb3ItPmJhc2UsICZpbnRlbF9wbGFuZV9oZWxwZXJfZnVuY3MpOworCiAJcmV0dXJu ICZjdXJzb3ItPmJhc2U7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggN2NiODM3 ZC4uYWJiODBlMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTQzNyw2ICs0MzcsNyBA QCBzdHJ1Y3QgaW50ZWxfY3J0Y19hdG9taWNfY29tbWl0IHsKIAlib29sIGRpc2FibGVfZmJjOwog CWJvb2wgcHJlX2Rpc2FibGVfcHJpbWFyeTsKIAlib29sIHVwZGF0ZV93bTsKKwl1bnNpZ25lZCB0 cmFja19mYnM7CiAKIAkvKiBTbGVlcGFibGUgb3BlcmF0aW9ucyB0byBwZXJmb3JtIGFmdGVyIGNv bW1pdCAqLwogCXVuc2lnbmVkIGZiX2JpdHM7CkBAIC01NzQsNiArNTc1LDcgQEAgc3RydWN0IGN4 c3JfbGF0ZW5jeSB7CiAjZGVmaW5lIHRvX2ludGVsX2VuY29kZXIoeCkgY29udGFpbmVyX29mKHgs IHN0cnVjdCBpbnRlbF9lbmNvZGVyLCBiYXNlKQogI2RlZmluZSB0b19pbnRlbF9mcmFtZWJ1ZmZl cih4KSBjb250YWluZXJfb2YoeCwgc3RydWN0IGludGVsX2ZyYW1lYnVmZmVyLCBiYXNlKQogI2Rl ZmluZSB0b19pbnRlbF9wbGFuZSh4KSBjb250YWluZXJfb2YoeCwgc3RydWN0IGludGVsX3BsYW5l LCBiYXNlKQorI2RlZmluZSB0b19pbnRlbF9wbGFuZV9zdGF0ZSh4KSBjb250YWluZXJfb2YoeCwg c3RydWN0IGludGVsX3BsYW5lX3N0YXRlLCBiYXNlKQogI2RlZmluZSBpbnRlbF9mYl9vYmooeCkg KHggPyB0b19pbnRlbF9mcmFtZWJ1ZmZlcih4KS0+b2JqIDogTlVMTCkKIAogc3RydWN0IGludGVs X2hkbWkgewpAQCAtMTI0Nyw0ICsxMjQ5LDEwIEBAIHZvaWQgaW50ZWxfcHJlX2Rpc2FibGVfcHJp bWFyeShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwogLyogaW50ZWxfdHYuYyAqLwogdm9pZCBpbnRl bF90dl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogCisvKiBpbnRlbF9hdG9taWMuYyAq Lworc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqaW50ZWxfcGxhbmVfZHVwbGljYXRlX3N0YXRlKHN0 cnVjdCBkcm1fcGxhbmUgKnBsYW5lKTsKK3ZvaWQgaW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZShz dHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKKwkJCSAgICAgICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRl ICpzdGF0ZSk7CitleHRlcm4gY29uc3Qgc3RydWN0IGRybV9wbGFuZV9oZWxwZXJfZnVuY3MgaW50 ZWxfcGxhbmVfaGVscGVyX2Z1bmNzOworCiAjZW5kaWYgLyogX19JTlRFTF9EUlZfSF9fICovCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IDA5ZjdiZTkuLjk0NmZmMTAgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSA8 ZHJtL2RybV9jcnRjLmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9mb3VyY2MuaD4KICNpbmNsdWRlIDxk cm0vZHJtX3JlY3QuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX3BsYW5lX2hlbHBlci5oPgogI2luY2x1 ZGUgImludGVsX2Rydi5oIgogI2luY2x1ZGUgPGRybS9pOTE1X2RybS5oPgogI2luY2x1ZGUgImk5 MTVfZHJ2LmgiCkBAIC0xMzkyLDYgKzEzOTMsOCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9w bGFuZV9mdW5jcyBpbnRlbF9wbGFuZV9mdW5jcyA9IHsKIAkuZGlzYWJsZV9wbGFuZSA9IGludGVs X2Rpc2FibGVfcGxhbmUsCiAJLmRlc3Ryb3kgPSBpbnRlbF9wbGFuZV9kZXN0cm95LAogCS5zZXRf cHJvcGVydHkgPSBpbnRlbF9wbGFuZV9zZXRfcHJvcGVydHksCisJLmF0b21pY19kdXBsaWNhdGVf c3RhdGUgPSBpbnRlbF9wbGFuZV9kdXBsaWNhdGVfc3RhdGUsCisJLmF0b21pY19kZXN0cm95X3N0 YXRlID0gaW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZSwKIH07CiAKIHN0YXRpYyB1aW50MzJfdCBp bGtfcGxhbmVfZm9ybWF0c1tdID0gewpAQCAtMTQ1Myw2ICsxNDU2LDkgQEAgaW50ZWxfcGxhbmVf aW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBlbnVtIHBpcGUgcGlwZSwgaW50IHBsYW5lKQog CWlmICghaW50ZWxfcGxhbmUpCiAJCXJldHVybiAtRU5PTUVNOwogCisJaW50ZWxfcGxhbmUtPmJh c2Uuc3RhdGUgPQorCQlpbnRlbF9wbGFuZV9kdXBsaWNhdGVfc3RhdGUoJmludGVsX3BsYW5lLT5i YXNlKTsKKwogCXN3aXRjaCAoSU5URUxfSU5GTyhkZXYpLT5nZW4pIHsKIAljYXNlIDU6CiAJY2Fz ZSA2OgpAQCAtMTU0Niw2ICsxNTUyLDggQEAgaW50ZWxfcGxhbmVfaW5pdChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LCBlbnVtIHBpcGUgcGlwZSwgaW50IHBsYW5lKQogCQkJCQkgICBkZXYtPm1vZGVf Y29uZmlnLnJvdGF0aW9uX3Byb3BlcnR5LAogCQkJCQkgICBpbnRlbF9wbGFuZS0+cm90YXRpb24p OwogCisJZHJtX3BsYW5lX2hlbHBlcl9hZGQoJmludGVsX3BsYW5lLT5iYXNlLCAmaW50ZWxfcGxh bmVfaGVscGVyX2Z1bmNzKTsKKwogIG91dDoKIAlyZXR1cm4gcmV0OwogfQotLSAKMS44LjUuMQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK