From: Daniel Vetter Subject: Re: [PATCH 1/2] drm/i915: Use enabled value from crtc_state rather than crtc (v2) Date: Thu, 26 Feb 2015 00:14:54 +0100 Message-ID: <20150225231454.GH24485@phenom.ffwll.local> References: <20150225204855.GW24485@phenom.ffwll.local> <1424898736-16418-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 mail-wg0-f46.google.com (mail-wg0-f46.google.com [74.125.82.46]) by gabe.freedesktop.org (Postfix) with ESMTP id 896206E176 for ; Wed, 25 Feb 2015 15:13:17 -0800 (PST) Received: by wghk14 with SMTP id k14so6743219wgh.3 for ; Wed, 25 Feb 2015 15:13:16 -0800 (PST) Content-Disposition: inline In-Reply-To: <1424898736-16418-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: Matt Roper Cc: Ander Conselvan de Oliveira , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCBGZWIgMjUsIDIwMTUgYXQgMDE6MTI6MTZQTSAtMDgwMCwgTWF0dCBSb3BlciB3cm90 ZToKPiBBcyB2ZW5kb3JzIHRyYW5zaXRpb24gdGhlaXIgZHJpdmVycyBmcm9tIGxlZ2FjeSB0byBh dG9taWMgdGhlcmUncyBzb21lCj4gZHVwbGljYXRpb24gb2YgZGF0YSBiZXR3ZWVuIGRybV9jcnRj IGFuZCBkcm1fY3J0Y19zdGF0ZSAoc2luY2UKPiB1bmNvbnZlcnRlZCBkcml2ZXJzIGxpa2VseSB3 b24ndCBoYXZlIGEgc3RhdGUgc3RydWN0dXJlKS4KPiAKPiBpOTE1IGlzIHBhcnRpYWxseSBjb252 ZXJ0ZWQgYW5kIGRvZXMgaGF2ZSBhIGNydGMtPnN0YXRlIHN0cnVjdHVyZSwgYnV0Cj4gc3RpbGwg dXNlcyBkaXJlY3QgY3J0YyBmaWVsZHMgaW50ZXJuYWxseSBpbiBtYW55IHBsYWNlcywgd2hpY2gg Y2F1c2VzCj4gdGhlIHR3byBzZXRzIG9mIGRhdGEgdG8gZ2V0IG91dCBvZiBzeW5jLiAgQXMgb2Yg Y29tbWl0Cj4gCj4gICAgICAgICBjb21taXQgMzFjOTQ2ZTg1Y2U2YjQ4Y2UwZjI1ZTNjZGNhODM2 MmU0ZmU4YjMwMAo+ICAgICAgICAgQXV0aG9yOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVy QGZmd2xsLmNoPgo+ICAgICAgICAgRGF0ZTogICBTdW4gRmViIDIyIDEyOjI0OjE3IDIwMTUgKzAx MDAKPiAKPiAgICAgICAgICAgICBkcm06IElmIGF2YWlsYWJsZSB1c2UgYXRvbWljIHN0YXRlIGlu IGdldGNydGMgaW9jdGwKPiAKPiAgICAgICAgICAgICBUaGlzIHdheSBkcml2ZXJzIGZ1bGx5IGNv bnZlcnRlZCB0byBhdG9taWMgZG9uJ3QgbmVlZCB0byB1cGRhdGUgdGhlc2UKPiAgICAgICAgICAg ICBsZWdhY3kgc3RhdGUgdmFyaWFibGVzIGluIHRoZWlyIG1vZGVzZXQgY29kZSBhbnkgbW9yZS4K PiAKPiAgICAgICAgICAgICBSZXZpZXdlZC1ieTogUm9iIENsYXJrIDxyb2JkY2xhcmtAZ21haWwu Y29tPgo+ICAgICAgICAgICAgIFNpZ25lZC1vZmYtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52 ZXR0ZXJAaW50ZWwuY29tPgo+IAo+IHRoZSBEUk0gY29yZSBzdGFydHMgYXNzdW1pbmcgdGhhdCB0 aGUgcHJlc2VuY2Ugb2YgYSAtPnN0YXRlIHN0cnVjdHVyZQo+IGltcGxpZXMgdGhhdCBpdCBzaG91 bGQgbWFrZSB1c2Ugb2YgdGhlIHZhbHVlcyBzdG9yZWQgdGhlcmUgd2hpY2gsIG9uCj4gaTkxNSwg bGVhZHMgdG8gdGhlIGNvcmUgY29kZSB1c2luZyBzdGFsZSB2YWx1ZXMgZm9yIENSVEMgJ2VuYWJs ZWQnCj4gc3RhdHVzLgo+IAo+IExldCdzIHN3aXRjaCBvdmVyIHRvIHVzaW5nIHRoZSBzdGF0ZSB2 YWx1ZSBvZiAnZW5hYmxlJyBpbnRlcm5hbGx5IHJhdGhlcgo+IHRoYW4gdXNpbmcgdGhlIGRybV9j cnRjIGZpZWxkLiAgVGhpcyBlbnN1cmVzIHRoYXQgb3VyIGRyaXZlciBpbnRlcm5hbHMKPiBhcmUg d29ya2luZyBmcm9tIHRoZSBzYW1lIGRhdGEgdGhhdCB0aGUgRFJNIGNvcmUgaXMsIGF2b2lkaW5n Cj4gbWlzbWF0Y2hlcy4KPiAKPiBUaGlzIHBhdGNoIHdhcyBnZW5lcmF0ZWQgd2l0aCBDb2NjaW5l bGxlIHVzaW5nIHRoZSBmb2xsb3dpbmcgc2VtYW50aWMKPiBwYXRjaDoKPiAKPiAgICAgICAgIDxz bXBsPgo+ICAgICAgICAgQEAKPiAgICAgICAgIHN0cnVjdCBkcm1fY3J0YyBDOwo+ICAgICAgICAg c3RydWN0IGRybV9jcnRjICpDUDsKPiAgICAgICAgIEBACj4gICAgICAgICAoCj4gICAgICAgICAt IEMuZW5hYmxlZAo+ICAgICAgICAgKyBDLnN0YXRlLT5lbmFibGUKPiAgICAgICAgIHwKPiAgICAg ICAgIC0gQ1AtPmVuYWJsZWQKPiAgICAgICAgICsgQ1AtPnN0YXRlLT5lbmFibGUKPiAgICAgICAg ICkKPiAKPiAgICAgICAgIC8vIEZvciBhc3NpZ25tZW50cywgd2Ugc3RpbGwgdXBkYXRlIHRoZSBs ZWdhY3kgdmFsdWUgYXMgd2VsbCBhcyB0aGUgc3RhdGUgdmFsdWUKPiAgICAgICAgIC8vIHNvIGFk ZCBhbiBleHRyYSBhc3NpZ25tZW50IHN0YXRlbWVudCBmb3IgdGhhdC4KPiAgICAgICAgIEBACj4g ICAgICAgICBzdHJ1Y3QgZHJtX2NydGMgQzsKPiAgICAgICAgIHN0cnVjdCBkcm1fY3J0YyAqQ1A7 Cj4gICAgICAgICBleHByZXNzaW9uIEU7Cj4gICAgICAgICBAQAo+ICAgICAgICAgKAo+ICAgICAg ICAgICBDLnN0YXRlLT5lbmFibGUgPSBFOwo+ICAgICAgICAgKyBDLmVuYWJsZWQgPSBFOwo+ICAg ICAgICAgfAo+ICAgICAgICAgICBDUC0+c3RhdGUtPmVuYWJsZSA9IEU7Cj4gICAgICAgICArIENQ LT5lbmFibGVkID0gRTsKPiAgICAgICAgICkKPiAgICAgICAgIDwvc21wbD4KPiAKPiBUaGUgY3J0 Yy0+bW9kZSBhbmQgY3J0Yy0+aHdtb2RlIGZpZWxkcyBzaG91bGQgcHJvYmFibHkgYmUgdHJhbnNp dGlvbmVkCj4gb3ZlciBhcyB3ZWxsIGV2ZW50dWFsbHksIGJ1dCB3ZSBzZWVtIHRvIGRvIGFuIG9r YXkgam9iIG9mIGtlZXBpbmcgdGhvc2UKPiB1cC10by1kYXRlIGFscmVhZHkgc28gSSB3YW50IHRv IG1pbmltaXplIHRoZSBjaGFuZ2VzIHRoYXQgd2lsbCBjbGFzaAo+IHdpdGggQW5kZXIncyBpbi1w cm9ncmVzcyBhdG9taWMgd29yay4KPiAKPiB2MjogRG9uJ3QgcmVtb3ZlIHRoZSBhc3NpZ25tZW50 cyB0byB0aGUgbGVnYWN5IHZhbHVlIHdoZW4gd2UgYXNzaWduIHRvCj4gICAgIHRoZSBzdGF0ZSB2 YWx1ZS4gIEEgc2Vjb25kIGNvY2NpIHN0YW56YSB0YWtlcyBjYXJlIG9mIGFkZGluZyB0aGUKPiAg ICAgbGVnYWN5IGFzc2lnbm1lbnQgYmFjayB3aGVyZSBhcHByb3ByaWF0ZS4gIChEYW5pZWwpCj4g Cj4gQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbEBmZndsbC5jaD4KPiBDYzogQW5kZXIgQ29uc2Vs dmFuIGRlIE9saXZlaXJhIDxhbmRlci5jb25zZWx2YW4uZGUub2xpdmVpcmFAaW50ZWwuY29tPgo+ IFNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+CgpC b3RoIHBhdGNoZXMgYXBwbGllZCwgdGhhbmtzLgotRGFuaWVsCgo+IC0tLQo+ICBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2lycS5jICAgICAgfCAgMiArLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgfCA1OCArKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0t LS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5jICAgIHwgIDIgKy0KPiAgMyBm aWxlcyBjaGFuZ2VkLCAzNCBpbnNlcnRpb25zKCspLCAyOCBkZWxldGlvbnMoLSkKPiAKPiBkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfaXJxLmMKPiBpbmRleCAwN2UyNTdjLi45YmFlY2I3IDEwMDY0NAo+IC0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2lycS5jCj4gQEAgLTc5MSw3ICs3OTEsNyBAQCBzdGF0aWMgaW50IGk5MTVfZ2V0 X3ZibGFua190aW1lc3RhbXAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHBpcGUsCj4gIAkJ cmV0dXJuIC1FSU5WQUw7Cj4gIAl9Cj4gIAo+IC0JaWYgKCFjcnRjLT5lbmFibGVkKSB7Cj4gKwlp ZiAoIWNydGMtPnN0YXRlLT5lbmFibGUpIHsKPiAgCQlEUk1fREVCVUdfS01TKCJjcnRjICVkIGlz IGRpc2FibGVkXG4iLCBwaXBlKTsKPiAgCQlyZXR1cm4gLUVCVVNZOwo+ICAJfQo+IGRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBpbmRleCA5YmM1NGNjLi5hY2JiMzYyIDEwMDY0NAo+ IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+ICsrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+IEBAIC0zMDc3LDcgKzMwNzcsNyBAQCBz dGF0aWMgdm9pZCBpbnRlbF9mZGlfbm9ybWFsX3RyYWluKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykK PiAgCj4gIHN0YXRpYyBib29sIHBpcGVfaGFzX2VuYWJsZWRfcGNoKHN0cnVjdCBpbnRlbF9jcnRj ICpjcnRjKQo+ICB7Cj4gLQlyZXR1cm4gY3J0Yy0+YmFzZS5lbmFibGVkICYmIGNydGMtPmFjdGl2 ZSAmJgo+ICsJcmV0dXJuIGNydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSAmJiBjcnRjLT5hY3RpdmUg JiYKPiAgCQljcnRjLT5jb25maWctPmhhc19wY2hfZW5jb2RlcjsKPiAgfQo+ICAKPiBAQCAtNDIx NSw3ICs0MjE1LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19sb2FkX2x1dChzdHJ1Y3QgZHJt X2NydGMgKmNydGMpCj4gIAlib29sIHJlZW5hYmxlX2lwcyA9IGZhbHNlOwo+ICAKPiAgCS8qIFRo ZSBjbG9ja3MgaGF2ZSB0byBiZSBvbiB0byBsb2FkIHRoZSBwYWxldHRlLiAqLwo+IC0JaWYgKCFj cnRjLT5lbmFibGVkIHx8ICFpbnRlbF9jcnRjLT5hY3RpdmUpCj4gKwlpZiAoIWNydGMtPnN0YXRl LT5lbmFibGUgfHwgIWludGVsX2NydGMtPmFjdGl2ZSkKPiAgCQlyZXR1cm47Cj4gIAo+ICAJaWYg KCFIQVNfUENIX1NQTElUKGRldl9wcml2LT5kZXYpKSB7Cj4gQEAgLTQzMjgsNyArNDMyOCw3IEBA IHN0YXRpYyB2b2lkIGlyb25sYWtlX2NydGNfZW5hYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykK PiAgCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyOwo+ICAJaW50IHBpcGUgPSBpbnRlbF9j cnRjLT5waXBlOwo+ICAKPiAtCVdBUk5fT04oIWNydGMtPmVuYWJsZWQpOwo+ICsJV0FSTl9PTigh Y3J0Yy0+c3RhdGUtPmVuYWJsZSk7Cj4gIAo+ICAJaWYgKGludGVsX2NydGMtPmFjdGl2ZSkKPiAg CQlyZXR1cm47Cj4gQEAgLTQ0MzYsNyArNDQzNiw3IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxfY3J0 Y19lbmFibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQo+ICAJc3RydWN0IGludGVsX2VuY29kZXIg KmVuY29kZXI7Cj4gIAlpbnQgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7Cj4gIAo+IC0JV0FSTl9P TighY3J0Yy0+ZW5hYmxlZCk7Cj4gKwlXQVJOX09OKCFjcnRjLT5zdGF0ZS0+ZW5hYmxlKTsKPiAg Cj4gIAlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKQo+ICAJCXJldHVybjsKPiBAQCAtNDc4Myw3ICs0 NzgzLDcgQEAgc3RhdGljIHZvaWQgbW9kZXNldF91cGRhdGVfY3J0Y19wb3dlcl9kb21haW5zKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0Yykg ewo+ICAJCWVudW0gaW50ZWxfZGlzcGxheV9wb3dlcl9kb21haW4gZG9tYWluOwo+ICAKPiAtCQlp ZiAoIWNydGMtPmJhc2UuZW5hYmxlZCkKPiArCQlpZiAoIWNydGMtPmJhc2Uuc3RhdGUtPmVuYWJs ZSkKPiAgCQkJY29udGludWU7Cj4gIAo+ICAJCXBpcGVfZG9tYWluc1tjcnRjLT5waXBlXSA9IGdl dF9jcnRjX3Bvd2VyX2RvbWFpbnMoJmNydGMtPmJhc2UpOwo+IEBAIC01MDA0LDcgKzUwMDQsNyBA QCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X21vZGVzZXRfZ2xvYmFsX3BpcGVzKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsCj4gIAo+ICAJLyogZGlzYWJsZS9lbmFibGUgYWxsIGN1cnJlbnRseSBhY3Rp dmUgcGlwZXMgd2hpbGUgd2UgY2hhbmdlIGNkY2xrICovCj4gIAlmb3JfZWFjaF9pbnRlbF9jcnRj KGRldiwgaW50ZWxfY3J0YykKPiAtCQlpZiAoaW50ZWxfY3J0Yy0+YmFzZS5lbmFibGVkKQo+ICsJ CWlmIChpbnRlbF9jcnRjLT5iYXNlLnN0YXRlLT5lbmFibGUpCj4gIAkJCSpwcmVwYXJlX3BpcGVz IHw9ICgxIDw8IGludGVsX2NydGMtPnBpcGUpOwo+ICB9Cj4gIAo+IEBAIC01MDQ0LDcgKzUwNDQs NyBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X2NydGNfZW5hYmxlKHN0cnVjdCBkcm1fY3J0YyAq Y3J0YykKPiAgCWludCBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKPiAgCWJvb2wgaXNfZHNpOwo+ ICAKPiAtCVdBUk5fT04oIWNydGMtPmVuYWJsZWQpOwo+ICsJV0FSTl9PTighY3J0Yy0+c3RhdGUt PmVuYWJsZSk7Cj4gIAo+ICAJaWYgKGludGVsX2NydGMtPmFjdGl2ZSkKPiAgCQlyZXR1cm47Cj4g QEAgLTUxMjcsNyArNTEyNyw3IEBAIHN0YXRpYyB2b2lkIGk5eHhfY3J0Y19lbmFibGUoc3RydWN0 IGRybV9jcnRjICpjcnRjKQo+ICAJc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXI7Cj4gIAlp bnQgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7Cj4gIAo+IC0JV0FSTl9PTighY3J0Yy0+ZW5hYmxl ZCk7Cj4gKwlXQVJOX09OKCFjcnRjLT5zdGF0ZS0+ZW5hYmxlKTsKPiAgCj4gIAlpZiAoaW50ZWxf Y3J0Yy0+YWN0aXZlKQo+ICAJCXJldHVybjsKPiBAQCAtNTMyNiw3ICs1MzI2LDcgQEAgc3RhdGlj IHZvaWQgaW50ZWxfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKPiAgCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Cj4gIAo+ICAJ LyogY3J0YyBzaG91bGQgc3RpbGwgYmUgZW5hYmxlZCB3aGVuIHdlIGRpc2FibGUgaXQuICovCj4g LQlXQVJOX09OKCFjcnRjLT5lbmFibGVkKTsKPiArCVdBUk5fT04oIWNydGMtPnN0YXRlLT5lbmFi bGUpOwo+ICAKPiAgCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZGlzYWJsZShjcnRjKTsKPiAgCWRl dl9wcml2LT5kaXNwbGF5Lm9mZihjcnRjKTsKPiBAQCAtNTQwNCw3ICs1NDA0LDggQEAgc3RhdGlj IHZvaWQgaW50ZWxfY29ubmVjdG9yX2NoZWNrX3N0YXRlKHN0cnVjdCBpbnRlbF9jb25uZWN0b3Ig KmNvbm5lY3RvcikKPiAgCj4gIAkJCWNydGMgPSBlbmNvZGVyLT5iYXNlLmNydGM7Cj4gIAo+IC0J CQlJOTE1X1NUQVRFX1dBUk4oIWNydGMtPmVuYWJsZWQsICJjcnRjIG5vdCBlbmFibGVkXG4iKTsK PiArCQkJSTkxNV9TVEFURV9XQVJOKCFjcnRjLT5zdGF0ZS0+ZW5hYmxlLAo+ICsJCQkJCSJjcnRj IG5vdCBlbmFibGVkXG4iKTsKPiAgCQkJSTkxNV9TVEFURV9XQVJOKCF0b19pbnRlbF9jcnRjKGNy dGMpLT5hY3RpdmUsICJjcnRjIG5vdCBhY3RpdmVcbiIpOwo+ICAJCQlJOTE1X1NUQVRFX1dBUk4o cGlwZSAhPSB0b19pbnRlbF9jcnRjKGNydGMpLT5waXBlLAo+ICAJCQkgICAgICJlbmNvZGVyIGFj dGl2ZSBvbiB0aGUgd3JvbmcgcGlwZVxuIik7Cj4gQEAgLTg3MTcsNyArODcxOCw3IEBAIHJldHJ5 Ogo+ICAJCWkrKzsKPiAgCQlpZiAoIShlbmNvZGVyLT5wb3NzaWJsZV9jcnRjcyAmICgxIDw8IGkp KSkKPiAgCQkJY29udGludWU7Cj4gLQkJaWYgKHBvc3NpYmxlX2NydGMtPmVuYWJsZWQpCj4gKwkJ aWYgKHBvc3NpYmxlX2NydGMtPnN0YXRlLT5lbmFibGUpCj4gIAkJCWNvbnRpbnVlOwo+ICAJCS8q IFRoaXMgY2FuIG9jY3VyIHdoZW4gYXBwbHlpbmcgdGhlIHBpcGUgQSBxdWlyayBvbiByZXN1bWUu ICovCj4gIAkJaWYgKHRvX2ludGVsX2NydGMocG9zc2libGVfY3J0YyktPm5ld19lbmFibGVkKQo+ IEBAIC04Nzg1LDcgKzg3ODYsNyBAQCByZXRyeToKPiAgCXJldHVybiB0cnVlOwo+ICAKPiAgIGZh aWw6Cj4gLQlpbnRlbF9jcnRjLT5uZXdfZW5hYmxlZCA9IGNydGMtPmVuYWJsZWQ7Cj4gKwlpbnRl bF9jcnRjLT5uZXdfZW5hYmxlZCA9IGNydGMtPnN0YXRlLT5lbmFibGU7Cj4gIAlpZiAoaW50ZWxf Y3J0Yy0+bmV3X2VuYWJsZWQpCj4gIAkJaW50ZWxfY3J0Yy0+bmV3X2NvbmZpZyA9IGludGVsX2Ny dGMtPmNvbmZpZzsKPiAgCWVsc2UKPiBAQCAtOTk0NSw3ICs5OTQ2LDcgQEAgc3RhdGljIHZvaWQg aW50ZWxfbW9kZXNldF91cGRhdGVfc3RhZ2VkX291dHB1dF9zdGF0ZShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQo+ICAJfQo+ICAKPiAgCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBjcnRjKSB7Cj4g LQkJY3J0Yy0+bmV3X2VuYWJsZWQgPSBjcnRjLT5iYXNlLmVuYWJsZWQ7Cj4gKwkJY3J0Yy0+bmV3 X2VuYWJsZWQgPSBjcnRjLT5iYXNlLnN0YXRlLT5lbmFibGU7Cj4gIAo+ICAJCWlmIChjcnRjLT5u ZXdfZW5hYmxlZCkKPiAgCQkJY3J0Yy0+bmV3X2NvbmZpZyA9IGNydGMtPmNvbmZpZzsKPiBAQCAt OTk3NSw2ICs5OTc2LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF9jb21taXRfb3V0cHV0 X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gIAl9Cj4gIAo+ICAJZm9yX2VhY2hfaW50 ZWxfY3J0YyhkZXYsIGNydGMpIHsKPiArCQljcnRjLT5iYXNlLnN0YXRlLT5lbmFibGUgPSBjcnRj LT5uZXdfZW5hYmxlZDsKPiAgCQljcnRjLT5iYXNlLmVuYWJsZWQgPSBjcnRjLT5uZXdfZW5hYmxl ZDsKPiAgCX0KPiAgfQo+IEBAIC0xMDM4Niw3ICsxMDM4OCw3IEBAIGludGVsX21vZGVzZXRfYWZm ZWN0ZWRfcGlwZXMoc3RydWN0IGRybV9jcnRjICpjcnRjLCB1bnNpZ25lZCAqbW9kZXNldF9waXBl cywKPiAgCj4gIAkvKiBDaGVjayBmb3IgcGlwZXMgdGhhdCB3aWxsIGJlIGVuYWJsZWQvZGlzYWJs ZWQgLi4uICovCj4gIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgaW50ZWxfY3J0Yykgewo+IC0J CWlmIChpbnRlbF9jcnRjLT5iYXNlLmVuYWJsZWQgPT0gaW50ZWxfY3J0Yy0+bmV3X2VuYWJsZWQp Cj4gKwkJaWYgKGludGVsX2NydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSA9PSBpbnRlbF9jcnRjLT5u ZXdfZW5hYmxlZCkKPiAgCQkJY29udGludWU7Cj4gIAo+ICAJCWlmICghaW50ZWxfY3J0Yy0+bmV3 X2VuYWJsZWQpCj4gQEAgLTEwNDYxLDEwICsxMDQ2MywxMCBAQCBpbnRlbF9tb2Rlc2V0X3VwZGF0 ZV9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBwcmVwYXJlX3BpcGVzKQo+ ICAKPiAgCS8qIERvdWJsZSBjaGVjayBzdGF0ZS4gKi8KPiAgCWZvcl9lYWNoX2ludGVsX2NydGMo ZGV2LCBpbnRlbF9jcnRjKSB7Cj4gLQkJV0FSTl9PTihpbnRlbF9jcnRjLT5iYXNlLmVuYWJsZWQg IT0gaW50ZWxfY3J0Y19pbl91c2UoJmludGVsX2NydGMtPmJhc2UpKTsKPiArCQlXQVJOX09OKGlu dGVsX2NydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSAhPSBpbnRlbF9jcnRjX2luX3VzZSgmaW50ZWxf Y3J0Yy0+YmFzZSkpOwo+ICAJCVdBUk5fT04oaW50ZWxfY3J0Yy0+bmV3X2NvbmZpZyAmJgo+ICAJ CQlpbnRlbF9jcnRjLT5uZXdfY29uZmlnICE9IGludGVsX2NydGMtPmNvbmZpZyk7Cj4gLQkJV0FS Tl9PTihpbnRlbF9jcnRjLT5iYXNlLmVuYWJsZWQgIT0gISFpbnRlbF9jcnRjLT5uZXdfY29uZmln KTsKPiArCQlXQVJOX09OKGludGVsX2NydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSAhPSAhIWludGVs X2NydGMtPm5ld19jb25maWcpOwo+ICAJfQo+ICAKPiAgCWxpc3RfZm9yX2VhY2hfZW50cnkoY29u bmVjdG9yLCAmZGV2LT5tb2RlX2NvbmZpZy5jb25uZWN0b3JfbGlzdCwgaGVhZCkgewo+IEBAIC0x MDg1MSw3ICsxMDg1Myw3IEBAIGNoZWNrX2NydGNfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKPiAgCQlEUk1fREVCVUdfS01TKCJbQ1JUQzolZF1cbiIsCj4gIAkJCSAgICAgIGNydGMtPmJh c2UuYmFzZS5pZCk7Cj4gIAo+IC0JCUk5MTVfU1RBVEVfV0FSTihjcnRjLT5hY3RpdmUgJiYgIWNy dGMtPmJhc2UuZW5hYmxlZCwKPiArCQlJOTE1X1NUQVRFX1dBUk4oY3J0Yy0+YWN0aXZlICYmICFj cnRjLT5iYXNlLnN0YXRlLT5lbmFibGUsCj4gIAkJICAgICAiYWN0aXZlIGNydGMsIGJ1dCBub3Qg ZW5hYmxlZCBpbiBzdyB0cmFja2luZ1xuIik7Cj4gIAo+ICAJCWZvcl9lYWNoX2ludGVsX2VuY29k ZXIoZGV2LCBlbmNvZGVyKSB7Cj4gQEAgLTEwODY1LDkgKzEwODY3LDEwIEBAIGNoZWNrX2NydGNf c3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAgCQlJOTE1X1NUQVRFX1dBUk4oYWN0aXZl ICE9IGNydGMtPmFjdGl2ZSwKPiAgCQkgICAgICJjcnRjJ3MgY29tcHV0ZWQgYWN0aXZlIHN0YXRl IGRvZXNuJ3QgbWF0Y2ggdHJhY2tlZCBhY3RpdmUgc3RhdGUgIgo+ICAJCSAgICAgIihleHBlY3Rl ZCAlaSwgZm91bmQgJWkpXG4iLCBhY3RpdmUsIGNydGMtPmFjdGl2ZSk7Cj4gLQkJSTkxNV9TVEFU RV9XQVJOKGVuYWJsZWQgIT0gY3J0Yy0+YmFzZS5lbmFibGVkLAo+ICsJCUk5MTVfU1RBVEVfV0FS TihlbmFibGVkICE9IGNydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSwKPiAgCQkgICAgICJjcnRjJ3Mg Y29tcHV0ZWQgZW5hYmxlZCBzdGF0ZSBkb2Vzbid0IG1hdGNoIHRyYWNrZWQgZW5hYmxlZCBzdGF0 ZSAiCj4gLQkJICAgICAiKGV4cGVjdGVkICVpLCBmb3VuZCAlaSlcbiIsIGVuYWJsZWQsIGNydGMt PmJhc2UuZW5hYmxlZCk7Cj4gKwkJICAgICAiKGV4cGVjdGVkICVpLCBmb3VuZCAlaSlcbiIsIGVu YWJsZWQsCj4gKwkJCQljcnRjLT5iYXNlLnN0YXRlLT5lbmFibGUpOwo+ICAKPiAgCQlhY3RpdmUg PSBkZXZfcHJpdi0+ZGlzcGxheS5nZXRfcGlwZV9jb25maWcoY3J0YywKPiAgCQkJCQkJCSAgICZw aXBlX2NvbmZpZyk7Cj4gQEAgLTEwOTMxLDcgKzEwOTM0LDcgQEAgY2hlY2tfc2hhcmVkX2RwbGxf c3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAgCQkgICAgIHBsbC0+b24sIGFjdGl2ZSk7 Cj4gIAo+ICAJCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBjcnRjKSB7Cj4gLQkJCWlmIChjcnRj LT5iYXNlLmVuYWJsZWQgJiYgaW50ZWxfY3J0Y190b19zaGFyZWRfZHBsbChjcnRjKSA9PSBwbGwp Cj4gKwkJCWlmIChjcnRjLT5iYXNlLnN0YXRlLT5lbmFibGUgJiYgaW50ZWxfY3J0Y190b19zaGFy ZWRfZHBsbChjcnRjKSA9PSBwbGwpCj4gIAkJCQllbmFibGVkX2NydGNzKys7Cj4gIAkJCWlmIChj cnRjLT5hY3RpdmUgJiYgaW50ZWxfY3J0Y190b19zaGFyZWRfZHBsbChjcnRjKSA9PSBwbGwpCj4g IAkJCQlhY3RpdmVfY3J0Y3MrKzsKPiBAQCAtMTExMTcsNyArMTExMjAsNyBAQCBzdGF0aWMgaW50 IF9faW50ZWxfc2V0X21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAo+ICAJCWludGVsX2NydGNf ZGlzYWJsZSgmaW50ZWxfY3J0Yy0+YmFzZSk7Cj4gIAo+ICAJZm9yX2VhY2hfaW50ZWxfY3J0Y19t YXNrZWQoZGV2LCBwcmVwYXJlX3BpcGVzLCBpbnRlbF9jcnRjKSB7Cj4gLQkJaWYgKGludGVsX2Ny dGMtPmJhc2UuZW5hYmxlZCkKPiArCQlpZiAoaW50ZWxfY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxl KQo+ICAJCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2Rpc2FibGUoJmludGVsX2NydGMtPmJhc2Up Owo+ICAJfQo+ICAKPiBAQCAtMTExNzMsNyArMTExNzYsNyBAQCBzdGF0aWMgaW50IF9faW50ZWxf c2V0X21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAo+ICAKPiAgCS8qIEZJWE1FOiBhZGQgc3Vi cGl4ZWwgb3JkZXIgKi8KPiAgZG9uZToKPiAtCWlmIChyZXQgJiYgY3J0Yy0+ZW5hYmxlZCkKPiAr CWlmIChyZXQgJiYgY3J0Yy0+c3RhdGUtPmVuYWJsZSkKPiAgCQljcnRjLT5tb2RlID0gKnNhdmVk X21vZGU7Cj4gIAo+ICAJa2ZyZWUoc2F2ZWRfbW9kZSk7Cj4gQEAgLTExMjY5LDcgKzExMjcyLDcg QEAgc3RhdGljIGludCBpbnRlbF9zZXRfY29uZmlnX3NhdmVfc3RhdGUoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKPiAgCSAqLwo+ICAJY291bnQgPSAwOwo+ICAJZm9yX2VhY2hfY3J0YyhkZXYsIGNy dGMpIHsKPiAtCQljb25maWctPnNhdmVfY3J0Y19lbmFibGVkW2NvdW50KytdID0gY3J0Yy0+ZW5h YmxlZDsKPiArCQljb25maWctPnNhdmVfY3J0Y19lbmFibGVkW2NvdW50KytdID0gY3J0Yy0+c3Rh dGUtPmVuYWJsZTsKPiAgCX0KPiAgCj4gIAljb3VudCA9IDA7Cj4gQEAgLTExNTAzLDcgKzExNTA2 LDcgQEAgaW50ZWxfbW9kZXNldF9zdGFnZV9vdXRwdXRfc3RhdGUoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKPiAgCQkJfQo+ICAJCX0KPiAgCj4gLQkJaWYgKGNydGMtPm5ld19lbmFibGVkICE9IGNy dGMtPmJhc2UuZW5hYmxlZCkgewo+ICsJCWlmIChjcnRjLT5uZXdfZW5hYmxlZCAhPSBjcnRjLT5i YXNlLnN0YXRlLT5lbmFibGUpIHsKPiAgCQkJRFJNX0RFQlVHX0tNUygiY3J0YyAlc2FibGVkLCBm dWxsIG1vZGUgc3dpdGNoXG4iLAo+ICAJCQkJICAgICAgY3J0Yy0+bmV3X2VuYWJsZWQgPyAiZW4i IDogImRpcyIpOwo+ICAJCQljb25maWctPm1vZGVfY2hhbmdlZCA9IHRydWU7Cj4gQEAgLTEzMzky LDYgKzEzMzk1LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2FuaXRpemVfY3J0YyhzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YykKPiAgCQkJfQo+ICAKPiAgCQlXQVJOX09OKGNydGMtPmFjdGl2ZSk7Cj4g KwkJY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlID0gZmFsc2U7Cj4gIAkJY3J0Yy0+YmFzZS5lbmFi bGVkID0gZmFsc2U7Cj4gIAl9Cj4gIAo+IEBAIC0xMzQwOCw3ICsxMzQxMiw3IEBAIHN0YXRpYyB2 b2lkIGludGVsX3Nhbml0aXplX2NydGMoc3RydWN0IGludGVsX2NydGMgKmNydGMpCj4gIAkgKiBo YXZlIGFjdGl2ZSBjb25uZWN0b3JzL2VuY29kZXJzLiAqLwo+ICAJaW50ZWxfY3J0Y191cGRhdGVf ZHBtcygmY3J0Yy0+YmFzZSk7Cj4gIAo+IC0JaWYgKGNydGMtPmFjdGl2ZSAhPSBjcnRjLT5iYXNl LmVuYWJsZWQpIHsKPiArCWlmIChjcnRjLT5hY3RpdmUgIT0gY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5h YmxlKSB7Cj4gIAkJc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXI7Cj4gIAo+ICAJCS8qIFRo aXMgY2FuIGhhcHBlbiBlaXRoZXIgZHVlIHRvIGJ1Z3MgaW4gdGhlIGdldF9od19zdGF0ZQo+IEBA IC0xMzQxNiw5ICsxMzQyMCwxMCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zYW5pdGl6ZV9jcnRjKHN0 cnVjdCBpbnRlbF9jcnRjICpjcnRjKQo+ICAJCSAqIHBpcGUgQSBxdWlyay4gKi8KPiAgCQlEUk1f REVCVUdfS01TKCJbQ1JUQzolZF0gaHcgc3RhdGUgYWRqdXN0ZWQsIHdhcyAlcywgbm93ICVzXG4i LAo+ICAJCQkgICAgICBjcnRjLT5iYXNlLmJhc2UuaWQsCj4gLQkJCSAgICAgIGNydGMtPmJhc2Uu ZW5hYmxlZCA/ICJlbmFibGVkIiA6ICJkaXNhYmxlZCIsCj4gKwkJCSAgICAgIGNydGMtPmJhc2Uu c3RhdGUtPmVuYWJsZSA/ICJlbmFibGVkIiA6ICJkaXNhYmxlZCIsCj4gIAkJCSAgICAgIGNydGMt PmFjdGl2ZSA/ICJlbmFibGVkIiA6ICJkaXNhYmxlZCIpOwo+ICAKPiArCQljcnRjLT5iYXNlLnN0 YXRlLT5lbmFibGUgPSBjcnRjLT5hY3RpdmU7Cj4gIAkJY3J0Yy0+YmFzZS5lbmFibGVkID0gY3J0 Yy0+YWN0aXZlOwo+ICAKPiAgCQkvKiBCZWNhdXNlIHdlIG9ubHkgZXN0YWJsaXNoIHRoZSBjb25u ZWN0b3IgLT4gZW5jb2RlciAtPgo+IEBAIC0xMzU1NSw2ICsxMzU2MCw3IEBAIHN0YXRpYyB2b2lk IGludGVsX21vZGVzZXRfcmVhZG91dF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ ICAJCWNydGMtPmFjdGl2ZSA9IGRldl9wcml2LT5kaXNwbGF5LmdldF9waXBlX2NvbmZpZyhjcnRj LAo+ICAJCQkJCQkJCSBjcnRjLT5jb25maWcpOwo+ICAKPiArCQljcnRjLT5iYXNlLnN0YXRlLT5l bmFibGUgPSBjcnRjLT5hY3RpdmU7Cj4gIAkJY3J0Yy0+YmFzZS5lbmFibGVkID0gY3J0Yy0+YWN0 aXZlOwo+ICAJCWNydGMtPnByaW1hcnlfZW5hYmxlZCA9IHByaW1hcnlfZ2V0X2h3X3N0YXRlKGNy dGMpOwo+ICAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5jCj4gaW5kZXggMDcxYjk2ZC4uMjRl ODczMCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9sdmRzLmMKPiAr KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9sdmRzLmMKPiBAQCAtNTA5LDcgKzUwOSw3 IEBAIHN0YXRpYyBpbnQgaW50ZWxfbHZkc19zZXRfcHJvcGVydHkoc3RydWN0IGRybV9jb25uZWN0 b3IgKmNvbm5lY3RvciwKPiAgCQlpbnRlbF9jb25uZWN0b3ItPnBhbmVsLmZpdHRpbmdfbW9kZSA9 IHZhbHVlOwo+ICAKPiAgCQljcnRjID0gaW50ZWxfYXR0YWNoZWRfZW5jb2Rlcihjb25uZWN0b3Ip LT5iYXNlLmNydGM7Cj4gLQkJaWYgKGNydGMgJiYgY3J0Yy0+ZW5hYmxlZCkgewo+ICsJCWlmIChj cnRjICYmIGNydGMtPnN0YXRlLT5lbmFibGUpIHsKPiAgCQkJLyoKPiAgCQkJICogSWYgdGhlIENS VEMgaXMgZW5hYmxlZCwgdGhlIGRpc3BsYXkgd2lsbCBiZSBjaGFuZ2VkCj4gIAkJCSAqIGFjY29y ZGluZyB0byB0aGUgbmV3IHBhbmVsIGZpdHRpbmcgbW9kZS4KPiAtLSAKPiAxLjguNS4xCj4gCgot LSAKRGFuaWVsIFZldHRlcgpTb2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KKzQx ICgwKSA3OSAzNjUgNTcgNDggLSBodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=