From: Daniel Vetter Subject: Re: [PATCH 1/2] drm/i915: Use enabled value from crtc_state rather than crtc Date: Wed, 25 Feb 2015 21:48:55 +0100 Message-ID: <20150225204855.GW24485@phenom.ffwll.local> References: <1424893406-14634-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-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by gabe.freedesktop.org (Postfix) with ESMTP id 66C556E6CB for ; Wed, 25 Feb 2015 12:47:17 -0800 (PST) Received: by mail-wi0-f172.google.com with SMTP id l15so36333186wiw.5 for ; Wed, 25 Feb 2015 12:47:16 -0800 (PST) Content-Disposition: inline In-Reply-To: <1424893406-14634-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 T24gV2VkLCBGZWIgMjUsIDIwMTUgYXQgMTE6NDM6MjVBTSAtMDgwMCwgTWF0dCBSb3BlciB3cm90 ZToKPiBBcyB2ZW5kb3JzIHRyYW5zaXRpb24gdGhlaXIgZHJpdmVycyBmcm9tIGxlZ2FjeSB0byBh dG9taWMgdGhlcmUncyBzb21lCj4gZHVwbGljYXRpb24gb2YgZGF0YSBiZXR3ZWVuIGRybV9jcnRj IGFuZCBkcm1fY3J0Y19zdGF0ZSAoc2luY2UKPiB1bmNvbnZlcnRlZCBkcml2ZXJzIGxpa2VseSB3 b24ndCBoYXZlIGEgc3RhdGUgc3RydWN0dXJlKS4KPiAKPiBpOTE1IGlzIHBhcnRpYWxseSBjb252 ZXJ0ZWQgYW5kIGRvZXMgaGF2ZSBoYXZlIGEgY3J0Yy0+c3RhdGUgc3RydWN0dXJlLAo+IGJ1dCBz dGlsbCB1c2VzIGRpcmVjdCBjcnRjIGZpZWxkcyBpbnRlcm5hbGx5IGluIG1hbnkgcGxhY2VzLCB3 aGljaAo+IGNhdXNlcyB0aGUgdHdvIHNldHMgb2YgZGF0YSB0byBnZXQgb3V0IG9mIHN5bmMuICBB cyBvZiBjb21taXQKPiAKPiAgICAgICAgIGNvbW1pdCAzMWM5NDZlODVjZTZiNDhjZTBmMjVlM2Nk Y2E4MzYyZTRmZThiMzAwCj4gICAgICAgICBBdXRob3I6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52 ZXR0ZXJAZmZ3bGwuY2g+Cj4gICAgICAgICBEYXRlOiAgIFN1biBGZWIgMjIgMTI6MjQ6MTcgMjAx NSArMDEwMAo+IAo+ICAgICAgICAgICAgIGRybTogSWYgYXZhaWxhYmxlIHVzZSBhdG9taWMgc3Rh dGUgaW4gZ2V0Y3J0YyBpb2N0bAo+IAo+ICAgICAgICAgICAgIFRoaXMgd2F5IGRyaXZlcnMgZnVs bHkgY29udmVydGVkIHRvIGF0b21pYyBkb24ndCBuZWVkIHRvIHVwZGF0ZSB0aGVzZQo+ICAgICAg ICAgICAgIGxlZ2FjeSBzdGF0ZSB2YXJpYWJsZXMgaW4gdGhlaXIgbW9kZXNldCBjb2RlIGFueSBt b3JlLgo+IAo+ICAgICAgICAgICAgIFJldmlld2VkLWJ5OiBSb2IgQ2xhcmsgPHJvYmRjbGFya0Bn bWFpbC5jb20+Cj4gICAgICAgICAgICAgU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8ZGFu aWVsLnZldHRlckBpbnRlbC5jb20+Cj4gCj4gdGhlIERSTSBjb3JlIHN0YXJ0cyBhc3N1bWluZyB0 aGF0IHRoZSBwcmVzZW5jZSBvZiBhIC0+c3RhdGUgc3RydWN0dXJlCj4gaW1wbGllcyB0aGF0IGl0 IHNob3VsZCBtYWtlIHVzZSBvZiB0aGUgdmFsdWVzIHN0b3JlZCB0aGVyZSB3aGljaCwgb24KPiBp OTE1LCBsZWFkcyB0byB0aGUgY29yZSBjb2RlIHVzaW5nIHN0YWxlIHZhbHVlcyBmb3IgQ1JUQyAn ZW5hYmxlZCcKPiBzdGF0dXMuCj4gCj4gTGV0J3Mgc3dpdGNoIG92ZXIgdG8gdXNpbmcgdGhlIHN0 YXRlIHZhbHVlIG9mICdlbmFibGUnIGludGVybmFsbHkgcmF0aGVyCj4gdGhhbiB1c2luZyB0aGUg ZHJtX2NydGMgZmllbGQuICBUaGlzIGVuc3VyZXMgdGhhdCBvdXIgZHJpdmVyIGludGVybmFscwo+ IGFyZSB3b3JraW5nIGZyb20gdGhlIHNhbWUgZGF0YSB0aGF0IHRoZSBEUk0gY29yZSBpcywgYXZv aWRpbmcKPiBtaXNtYXRjaGVzLgo+IAo+IFRoaXMgcGF0Y2ggd2FzIGdlbmVyYXRlZCB3aXRoIENv Y2NpbmVsbGUgdXNpbmcgdGhlIGZvbGxvd2luZyBzZW1hbnRpYwo+IHBhdGNoOgo+IAo+ICAgICAg ICAgPHNtcGw+Cj4gICAgICAgICBAQAo+ICAgICAgICAgc3RydWN0IGRybV9jcnRjIEM7Cj4gICAg ICAgICBzdHJ1Y3QgZHJtX2NydGMgKkNQOwo+ICAgICAgICAgQEAKPiAgICAgICAgICgKPiAgICAg ICAgIC0gQy5lbmFibGVkCj4gICAgICAgICArIEMuc3RhdGUtPmVuYWJsZQo+ICAgICAgICAgfAo+ ICAgICAgICAgLSBDUC0+ZW5hYmxlZAo+ICAgICAgICAgKyBDUC0+c3RhdGUtPmVuYWJsZQo+ICAg ICAgICAgKQo+ICAgICAgICAgPC9zbXBsPgo+IAo+IFRoZSBjcnRjLT5tb2RlIGFuZCBjcnRjLT5o d21vZGUgZmllbGRzIHNob3VsZCBwcm9iYWJseSBiZSB0cmFuc2l0aW9uZWQKPiBvdmVyIGFzIHdl bGwgZXZlbnR1YWxseSwgYnV0IHdlIHNlZW0gdG8gZG8gYW4gb2theSBqb2Igb2Yga2VlcGluZyB0 aG9zZQo+IHVwLXRvLWRhdGUgYWxyZWFkeSBzbyBJIHdhbnQgdG8gbWluaW1pemUgdGhlIGNoYW5n ZXMgdGhhdCB3aWxsIGNsYXNoCj4gd2l0aCBBbmRlcidzIGluLXByb2dyZXNzIGF0b21pYyB3b3Jr Lgo+IAo+IEFzIGlzLCB0aGlzIHBhdGNoIHNob3VsZCBmaXggYSBidW5jaCBvZiBpLWctdCByZWdy ZXNzaW9ucyB0aGF0IHdlcmUgaW50cm9kdWNlZAo+IGJ5IERhbmllbCdzIHBhdGNoIGFib3ZlLgo+ IAo+IENjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+Cj4gQ2M6IEFuZGVyIENvbnNl bHZhbiBkZSBPbGl2ZWlyYSA8YW5kZXIuY29uc2VsdmFuLmRlLm9saXZlaXJhQGludGVsLmNvbT4K PiBTaWduZWQtb2ZmLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgoK SSB0aGluayB3ZSBjYW4ndCBvdXRyaWdodCBzd2l0Y2ggb3ZlciBlaXRoZXIgeWV0LCBhdCBsZWFz dCBpdCBzZWVtcyBhIGJpdApyaXNreS4gRm9yIG5vdyBJIHRoaW5rIHdlIG5lZWQgdG8ga2VlcCBi b3RoIGNydGMtPmJhc2UuZW5hYmxlZCBhbmQKY3J0Yy0+YmFzZS0+c3RhdGUuZW5hYmxlIHVwZGF0 ZWQuCgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jICAgICAgfCAgMiAr LQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA2MiArKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHZkcy5jICAgIHwgIDIgKy0KPiAgMyBmaWxlcyBjaGFuZ2VkLCAzNCBpbnNlcnRpb25zKCspLCAz MiBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKPiBpbmRleCAwN2UyNTdj Li45YmFlY2I3IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMK PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCj4gQEAgLTc5MSw3ICs3OTEs NyBAQCBzdGF0aWMgaW50IGk5MTVfZ2V0X3ZibGFua190aW1lc3RhbXAoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgaW50IHBpcGUsCj4gIAkJcmV0dXJuIC1FSU5WQUw7Cj4gIAl9Cj4gIAo+IC0JaWYg KCFjcnRjLT5lbmFibGVkKSB7Cj4gKwlpZiAoIWNydGMtPnN0YXRlLT5lbmFibGUpIHsKPiAgCQlE Uk1fREVCVUdfS01TKCJjcnRjICVkIGlzIGRpc2FibGVkXG4iLCBwaXBlKTsKPiAgCQlyZXR1cm4g LUVCVVNZOwo+ICAJfQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBpbmRleCA5 YmM1NGNjLi41MmYzYWE0IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+ IEBAIC0zMDc3LDcgKzMwNzcsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9mZGlfbm9ybWFsX3RyYWlu KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKPiAgCj4gIHN0YXRpYyBib29sIHBpcGVfaGFzX2VuYWJs ZWRfcGNoKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQo+ICB7Cj4gLQlyZXR1cm4gY3J0Yy0+YmFz ZS5lbmFibGVkICYmIGNydGMtPmFjdGl2ZSAmJgo+ICsJcmV0dXJuIGNydGMtPmJhc2Uuc3RhdGUt PmVuYWJsZSAmJiBjcnRjLT5hY3RpdmUgJiYKPiAgCQljcnRjLT5jb25maWctPmhhc19wY2hfZW5j b2RlcjsKPiAgfQo+ICAKPiBAQCAtNDIxNSw3ICs0MjE1LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxf Y3J0Y19sb2FkX2x1dChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCj4gIAlib29sIHJlZW5hYmxlX2lw cyA9IGZhbHNlOwo+ICAKPiAgCS8qIFRoZSBjbG9ja3MgaGF2ZSB0byBiZSBvbiB0byBsb2FkIHRo ZSBwYWxldHRlLiAqLwo+IC0JaWYgKCFjcnRjLT5lbmFibGVkIHx8ICFpbnRlbF9jcnRjLT5hY3Rp dmUpCj4gKwlpZiAoIWNydGMtPnN0YXRlLT5lbmFibGUgfHwgIWludGVsX2NydGMtPmFjdGl2ZSkK PiAgCQlyZXR1cm47Cj4gIAo+ICAJaWYgKCFIQVNfUENIX1NQTElUKGRldl9wcml2LT5kZXYpKSB7 Cj4gQEAgLTQzMjgsNyArNDMyOCw3IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX2NydGNfZW5hYmxl KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKPiAgCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVy Owo+ICAJaW50IHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwo+ICAKPiAtCVdBUk5fT04oIWNydGMt PmVuYWJsZWQpOwo+ICsJV0FSTl9PTighY3J0Yy0+c3RhdGUtPmVuYWJsZSk7Cj4gIAo+ICAJaWYg KGludGVsX2NydGMtPmFjdGl2ZSkKPiAgCQlyZXR1cm47Cj4gQEAgLTQ0MzYsNyArNDQzNiw3IEBA IHN0YXRpYyB2b2lkIGhhc3dlbGxfY3J0Y19lbmFibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQo+ ICAJc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXI7Cj4gIAlpbnQgcGlwZSA9IGludGVsX2Ny dGMtPnBpcGU7Cj4gIAo+IC0JV0FSTl9PTighY3J0Yy0+ZW5hYmxlZCk7Cj4gKwlXQVJOX09OKCFj cnRjLT5zdGF0ZS0+ZW5hYmxlKTsKPiAgCj4gIAlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKQo+ICAJ CXJldHVybjsKPiBAQCAtNDc4Myw3ICs0NzgzLDcgQEAgc3RhdGljIHZvaWQgbW9kZXNldF91cGRh dGVfY3J0Y19wb3dlcl9kb21haW5zKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gIAlmb3JfZWFj aF9pbnRlbF9jcnRjKGRldiwgY3J0Yykgewo+ICAJCWVudW0gaW50ZWxfZGlzcGxheV9wb3dlcl9k b21haW4gZG9tYWluOwo+ICAKPiAtCQlpZiAoIWNydGMtPmJhc2UuZW5hYmxlZCkKPiArCQlpZiAo IWNydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSkKPiAgCQkJY29udGludWU7Cj4gIAo+ICAJCXBpcGVf ZG9tYWluc1tjcnRjLT5waXBlXSA9IGdldF9jcnRjX3Bvd2VyX2RvbWFpbnMoJmNydGMtPmJhc2Up Owo+IEBAIC01MDA0LDcgKzUwMDQsNyBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X21vZGVzZXRf Z2xvYmFsX3BpcGVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gIAo+ICAJLyogZGlzYWJsZS9l bmFibGUgYWxsIGN1cnJlbnRseSBhY3RpdmUgcGlwZXMgd2hpbGUgd2UgY2hhbmdlIGNkY2xrICov Cj4gIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgaW50ZWxfY3J0YykKPiAtCQlpZiAoaW50ZWxf Y3J0Yy0+YmFzZS5lbmFibGVkKQo+ICsJCWlmIChpbnRlbF9jcnRjLT5iYXNlLnN0YXRlLT5lbmFi bGUpCj4gIAkJCSpwcmVwYXJlX3BpcGVzIHw9ICgxIDw8IGludGVsX2NydGMtPnBpcGUpOwo+ICB9 Cj4gIAo+IEBAIC01MDQ0LDcgKzUwNDQsNyBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X2NydGNf ZW5hYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKPiAgCWludCBwaXBlID0gaW50ZWxfY3J0Yy0+ cGlwZTsKPiAgCWJvb2wgaXNfZHNpOwo+ICAKPiAtCVdBUk5fT04oIWNydGMtPmVuYWJsZWQpOwo+ ICsJV0FSTl9PTighY3J0Yy0+c3RhdGUtPmVuYWJsZSk7Cj4gIAo+ICAJaWYgKGludGVsX2NydGMt PmFjdGl2ZSkKPiAgCQlyZXR1cm47Cj4gQEAgLTUxMjcsNyArNTEyNyw3IEBAIHN0YXRpYyB2b2lk IGk5eHhfY3J0Y19lbmFibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQo+ICAJc3RydWN0IGludGVs X2VuY29kZXIgKmVuY29kZXI7Cj4gIAlpbnQgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7Cj4gIAo+ IC0JV0FSTl9PTighY3J0Yy0+ZW5hYmxlZCk7Cj4gKwlXQVJOX09OKCFjcnRjLT5zdGF0ZS0+ZW5h YmxlKTsKPiAgCj4gIAlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKQo+ICAJCXJldHVybjsKPiBAQCAt NTMyNiw3ICs1MzI2LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19kaXNhYmxlKHN0cnVjdCBk cm1fY3J0YyAqY3J0YykKPiAgCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRl di0+ZGV2X3ByaXZhdGU7Cj4gIAo+ICAJLyogY3J0YyBzaG91bGQgc3RpbGwgYmUgZW5hYmxlZCB3 aGVuIHdlIGRpc2FibGUgaXQuICovCj4gLQlXQVJOX09OKCFjcnRjLT5lbmFibGVkKTsKPiArCVdB Uk5fT04oIWNydGMtPnN0YXRlLT5lbmFibGUpOwo+ICAKPiAgCWRldl9wcml2LT5kaXNwbGF5LmNy dGNfZGlzYWJsZShjcnRjKTsKPiAgCWRldl9wcml2LT5kaXNwbGF5Lm9mZihjcnRjKTsKPiBAQCAt NTQwNCw3ICs1NDA0LDggQEAgc3RhdGljIHZvaWQgaW50ZWxfY29ubmVjdG9yX2NoZWNrX3N0YXRl KHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvcikKPiAgCj4gIAkJCWNydGMgPSBlbmNv ZGVyLT5iYXNlLmNydGM7Cj4gIAo+IC0JCQlJOTE1X1NUQVRFX1dBUk4oIWNydGMtPmVuYWJsZWQs ICJjcnRjIG5vdCBlbmFibGVkXG4iKTsKPiArCQkJSTkxNV9TVEFURV9XQVJOKCFjcnRjLT5zdGF0 ZS0+ZW5hYmxlLAo+ICsJCQkJCSJjcnRjIG5vdCBlbmFibGVkXG4iKTsKPiAgCQkJSTkxNV9TVEFU RV9XQVJOKCF0b19pbnRlbF9jcnRjKGNydGMpLT5hY3RpdmUsICJjcnRjIG5vdCBhY3RpdmVcbiIp Owo+ICAJCQlJOTE1X1NUQVRFX1dBUk4ocGlwZSAhPSB0b19pbnRlbF9jcnRjKGNydGMpLT5waXBl LAo+ICAJCQkgICAgICJlbmNvZGVyIGFjdGl2ZSBvbiB0aGUgd3JvbmcgcGlwZVxuIik7Cj4gQEAg LTg3MTcsNyArODcxOCw3IEBAIHJldHJ5Ogo+ICAJCWkrKzsKPiAgCQlpZiAoIShlbmNvZGVyLT5w b3NzaWJsZV9jcnRjcyAmICgxIDw8IGkpKSkKPiAgCQkJY29udGludWU7Cj4gLQkJaWYgKHBvc3Np YmxlX2NydGMtPmVuYWJsZWQpCj4gKwkJaWYgKHBvc3NpYmxlX2NydGMtPnN0YXRlLT5lbmFibGUp Cj4gIAkJCWNvbnRpbnVlOwo+ICAJCS8qIFRoaXMgY2FuIG9jY3VyIHdoZW4gYXBwbHlpbmcgdGhl IHBpcGUgQSBxdWlyayBvbiByZXN1bWUuICovCj4gIAkJaWYgKHRvX2ludGVsX2NydGMocG9zc2li bGVfY3J0YyktPm5ld19lbmFibGVkKQo+IEBAIC04Nzg1LDcgKzg3ODYsNyBAQCByZXRyeToKPiAg CXJldHVybiB0cnVlOwo+ICAKPiAgIGZhaWw6Cj4gLQlpbnRlbF9jcnRjLT5uZXdfZW5hYmxlZCA9 IGNydGMtPmVuYWJsZWQ7Cj4gKwlpbnRlbF9jcnRjLT5uZXdfZW5hYmxlZCA9IGNydGMtPnN0YXRl LT5lbmFibGU7Cj4gIAlpZiAoaW50ZWxfY3J0Yy0+bmV3X2VuYWJsZWQpCj4gIAkJaW50ZWxfY3J0 Yy0+bmV3X2NvbmZpZyA9IGludGVsX2NydGMtPmNvbmZpZzsKPiAgCWVsc2UKPiBAQCAtOTk0NSw3 ICs5OTQ2LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF91cGRhdGVfc3RhZ2VkX291dHB1 dF9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAJfQo+ICAKPiAgCWZvcl9lYWNoX2lu dGVsX2NydGMoZGV2LCBjcnRjKSB7Cj4gLQkJY3J0Yy0+bmV3X2VuYWJsZWQgPSBjcnRjLT5iYXNl LmVuYWJsZWQ7Cj4gKwkJY3J0Yy0+bmV3X2VuYWJsZWQgPSBjcnRjLT5iYXNlLnN0YXRlLT5lbmFi bGU7Cj4gIAo+ICAJCWlmIChjcnRjLT5uZXdfZW5hYmxlZCkKPiAgCQkJY3J0Yy0+bmV3X2NvbmZp ZyA9IGNydGMtPmNvbmZpZzsKPiBAQCAtOTk3NSw3ICs5OTc2LDcgQEAgc3RhdGljIHZvaWQgaW50 ZWxfbW9kZXNldF9jb21taXRfb3V0cHV0X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4g IAl9Cj4gIAo+ICAJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGNydGMpIHsKPiAtCQljcnRjLT5i YXNlLmVuYWJsZWQgPSBjcnRjLT5uZXdfZW5hYmxlZDsKCkkuZS4gd2UnZCBuZWVkIHRvIGtlZXAg dGhpcyBsaW5lLgoKPiArCQljcnRjLT5iYXNlLnN0YXRlLT5lbmFibGUgPSBjcnRjLT5uZXdfZW5h YmxlZDsKPiAgCX0KPiAgfQo+ICAKPiBAQCAtMTAzODYsNyArMTAzODcsNyBAQCBpbnRlbF9tb2Rl c2V0X2FmZmVjdGVkX3BpcGVzKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgdW5zaWduZWQgKm1vZGVz ZXRfcGlwZXMsCj4gIAo+ICAJLyogQ2hlY2sgZm9yIHBpcGVzIHRoYXQgd2lsbCBiZSBlbmFibGVk L2Rpc2FibGVkIC4uLiAqLwo+ICAJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGludGVsX2NydGMp IHsKPiAtCQlpZiAoaW50ZWxfY3J0Yy0+YmFzZS5lbmFibGVkID09IGludGVsX2NydGMtPm5ld19l bmFibGVkKQo+ICsJCWlmIChpbnRlbF9jcnRjLT5iYXNlLnN0YXRlLT5lbmFibGUgPT0gaW50ZWxf Y3J0Yy0+bmV3X2VuYWJsZWQpCj4gIAkJCWNvbnRpbnVlOwo+ICAKPiAgCQlpZiAoIWludGVsX2Ny dGMtPm5ld19lbmFibGVkKQo+IEBAIC0xMDQ2MSwxMCArMTA0NjIsMTAgQEAgaW50ZWxfbW9kZXNl dF91cGRhdGVfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgcHJlcGFyZV9w aXBlcykKPiAgCj4gIAkvKiBEb3VibGUgY2hlY2sgc3RhdGUuICovCj4gIAlmb3JfZWFjaF9pbnRl bF9jcnRjKGRldiwgaW50ZWxfY3J0Yykgewo+IC0JCVdBUk5fT04oaW50ZWxfY3J0Yy0+YmFzZS5l bmFibGVkICE9IGludGVsX2NydGNfaW5fdXNlKCZpbnRlbF9jcnRjLT5iYXNlKSk7Cj4gKwkJV0FS Tl9PTihpbnRlbF9jcnRjLT5iYXNlLnN0YXRlLT5lbmFibGUgIT0gaW50ZWxfY3J0Y19pbl91c2Uo JmludGVsX2NydGMtPmJhc2UpKTsKPiAgCQlXQVJOX09OKGludGVsX2NydGMtPm5ld19jb25maWcg JiYKPiAgCQkJaW50ZWxfY3J0Yy0+bmV3X2NvbmZpZyAhPSBpbnRlbF9jcnRjLT5jb25maWcpOwo+ IC0JCVdBUk5fT04oaW50ZWxfY3J0Yy0+YmFzZS5lbmFibGVkICE9ICEhaW50ZWxfY3J0Yy0+bmV3 X2NvbmZpZyk7Cj4gKwkJV0FSTl9PTihpbnRlbF9jcnRjLT5iYXNlLnN0YXRlLT5lbmFibGUgIT0g ISFpbnRlbF9jcnRjLT5uZXdfY29uZmlnKTsKPiAgCX0KPiAgCj4gIAlsaXN0X2Zvcl9lYWNoX2Vu dHJ5KGNvbm5lY3RvciwgJmRldi0+bW9kZV9jb25maWcuY29ubmVjdG9yX2xpc3QsIGhlYWQpIHsK PiBAQCAtMTA4NTEsNyArMTA4NTIsNyBAQCBjaGVja19jcnRjX3N0YXRlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCj4gIAkJRFJNX0RFQlVHX0tNUygiW0NSVEM6JWRdXG4iLAo+ICAJCQkgICAgICBj cnRjLT5iYXNlLmJhc2UuaWQpOwo+ICAKPiAtCQlJOTE1X1NUQVRFX1dBUk4oY3J0Yy0+YWN0aXZl ICYmICFjcnRjLT5iYXNlLmVuYWJsZWQsCj4gKwkJSTkxNV9TVEFURV9XQVJOKGNydGMtPmFjdGl2 ZSAmJiAhY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlLAo+ICAJCSAgICAgImFjdGl2ZSBjcnRjLCBi dXQgbm90IGVuYWJsZWQgaW4gc3cgdHJhY2tpbmdcbiIpOwo+ICAKPiAgCQlmb3JfZWFjaF9pbnRl bF9lbmNvZGVyKGRldiwgZW5jb2Rlcikgewo+IEBAIC0xMDg2NSw5ICsxMDg2NiwxMCBAQCBjaGVj a19jcnRjX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gIAkJSTkxNV9TVEFURV9XQVJO KGFjdGl2ZSAhPSBjcnRjLT5hY3RpdmUsCj4gIAkJICAgICAiY3J0YydzIGNvbXB1dGVkIGFjdGl2 ZSBzdGF0ZSBkb2Vzbid0IG1hdGNoIHRyYWNrZWQgYWN0aXZlIHN0YXRlICIKPiAgCQkgICAgICIo ZXhwZWN0ZWQgJWksIGZvdW5kICVpKVxuIiwgYWN0aXZlLCBjcnRjLT5hY3RpdmUpOwo+IC0JCUk5 MTVfU1RBVEVfV0FSTihlbmFibGVkICE9IGNydGMtPmJhc2UuZW5hYmxlZCwKPiArCQlJOTE1X1NU QVRFX1dBUk4oZW5hYmxlZCAhPSBjcnRjLT5iYXNlLnN0YXRlLT5lbmFibGUsCj4gIAkJICAgICAi Y3J0YydzIGNvbXB1dGVkIGVuYWJsZWQgc3RhdGUgZG9lc24ndCBtYXRjaCB0cmFja2VkIGVuYWJs ZWQgc3RhdGUgIgo+IC0JCSAgICAgIihleHBlY3RlZCAlaSwgZm91bmQgJWkpXG4iLCBlbmFibGVk LCBjcnRjLT5iYXNlLmVuYWJsZWQpOwo+ICsJCSAgICAgIihleHBlY3RlZCAlaSwgZm91bmQgJWkp XG4iLCBlbmFibGVkLAo+ICsJCQkJY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlKTsKPiAgCj4gIAkJ YWN0aXZlID0gZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X3BpcGVfY29uZmlnKGNydGMsCj4gIAkJCQkJ CQkgICAmcGlwZV9jb25maWcpOwo+IEBAIC0xMDkzMSw3ICsxMDkzMyw3IEBAIGNoZWNrX3NoYXJl ZF9kcGxsX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gIAkJICAgICBwbGwtPm9uLCBh Y3RpdmUpOwo+ICAKPiAgCQlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0Yykgewo+IC0JCQlp ZiAoY3J0Yy0+YmFzZS5lbmFibGVkICYmIGludGVsX2NydGNfdG9fc2hhcmVkX2RwbGwoY3J0Yykg PT0gcGxsKQo+ICsJCQlpZiAoY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlICYmIGludGVsX2NydGNf dG9fc2hhcmVkX2RwbGwoY3J0YykgPT0gcGxsKQo+ICAJCQkJZW5hYmxlZF9jcnRjcysrOwo+ICAJ CQlpZiAoY3J0Yy0+YWN0aXZlICYmIGludGVsX2NydGNfdG9fc2hhcmVkX2RwbGwoY3J0YykgPT0g cGxsKQo+ICAJCQkJYWN0aXZlX2NydGNzKys7Cj4gQEAgLTExMTE3LDcgKzExMTE5LDcgQEAgc3Rh dGljIGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKPiAgCQlpbnRl bF9jcnRjX2Rpc2FibGUoJmludGVsX2NydGMtPmJhc2UpOwo+ICAKPiAgCWZvcl9lYWNoX2ludGVs X2NydGNfbWFza2VkKGRldiwgcHJlcGFyZV9waXBlcywgaW50ZWxfY3J0Yykgewo+IC0JCWlmIChp bnRlbF9jcnRjLT5iYXNlLmVuYWJsZWQpCj4gKwkJaWYgKGludGVsX2NydGMtPmJhc2Uuc3RhdGUt PmVuYWJsZSkKPiAgCQkJZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19kaXNhYmxlKCZpbnRlbF9jcnRj LT5iYXNlKTsKPiAgCX0KPiAgCj4gQEAgLTExMTczLDcgKzExMTc1LDcgQEAgc3RhdGljIGludCBf X2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKPiAgCj4gIAkvKiBGSVhNRTog YWRkIHN1YnBpeGVsIG9yZGVyICovCj4gIGRvbmU6Cj4gLQlpZiAocmV0ICYmIGNydGMtPmVuYWJs ZWQpCj4gKwlpZiAocmV0ICYmIGNydGMtPnN0YXRlLT5lbmFibGUpCj4gIAkJY3J0Yy0+bW9kZSA9 ICpzYXZlZF9tb2RlOwo+ICAKPiAgCWtmcmVlKHNhdmVkX21vZGUpOwo+IEBAIC0xMTI2OSw3ICsx MTI3MSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfc2V0X2NvbmZpZ19zYXZlX3N0YXRlKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCj4gIAkgKi8KPiAgCWNvdW50ID0gMDsKPiAgCWZvcl9lYWNoX2NydGMo ZGV2LCBjcnRjKSB7Cj4gLQkJY29uZmlnLT5zYXZlX2NydGNfZW5hYmxlZFtjb3VudCsrXSA9IGNy dGMtPmVuYWJsZWQ7Cj4gKwkJY29uZmlnLT5zYXZlX2NydGNfZW5hYmxlZFtjb3VudCsrXSA9IGNy dGMtPnN0YXRlLT5lbmFibGU7Cj4gIAl9Cj4gIAo+ICAJY291bnQgPSAwOwo+IEBAIC0xMTUwMyw3 ICsxMTUwNSw3IEBAIGludGVsX21vZGVzZXRfc3RhZ2Vfb3V0cHV0X3N0YXRlKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsCj4gIAkJCX0KPiAgCQl9Cj4gIAo+IC0JCWlmIChjcnRjLT5uZXdfZW5hYmxl ZCAhPSBjcnRjLT5iYXNlLmVuYWJsZWQpIHsKPiArCQlpZiAoY3J0Yy0+bmV3X2VuYWJsZWQgIT0g Y3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlKSB7Cj4gIAkJCURSTV9ERUJVR19LTVMoImNydGMgJXNh YmxlZCwgZnVsbCBtb2RlIHN3aXRjaFxuIiwKPiAgCQkJCSAgICAgIGNydGMtPm5ld19lbmFibGVk ID8gImVuIiA6ICJkaXMiKTsKPiAgCQkJY29uZmlnLT5tb2RlX2NoYW5nZWQgPSB0cnVlOwo+IEBA IC0xMzM5Miw3ICsxMzM5NCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3Nhbml0aXplX2NydGMoc3Ry dWN0IGludGVsX2NydGMgKmNydGMpCj4gIAkJCX0KPiAgCj4gIAkJV0FSTl9PTihjcnRjLT5hY3Rp dmUpOwo+IC0JCWNydGMtPmJhc2UuZW5hYmxlZCA9IGZhbHNlOwoKQW5kIHRoaXMuCgo+ICsJCWNy dGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSA9IGZhbHNlOwo+ICAJfQo+ICAKPiAgCWlmIChkZXZfcHJp di0+cXVpcmtzICYgUVVJUktfUElQRUFfRk9SQ0UgJiYKPiBAQCAtMTM0MDgsNyArMTM0MTAsNyBA QCBzdGF0aWMgdm9pZCBpbnRlbF9zYW5pdGl6ZV9jcnRjKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRj KQo+ICAJICogaGF2ZSBhY3RpdmUgY29ubmVjdG9ycy9lbmNvZGVycy4gKi8KPiAgCWludGVsX2Ny dGNfdXBkYXRlX2RwbXMoJmNydGMtPmJhc2UpOwo+ICAKPiAtCWlmIChjcnRjLT5hY3RpdmUgIT0g Y3J0Yy0+YmFzZS5lbmFibGVkKSB7Cj4gKwlpZiAoY3J0Yy0+YWN0aXZlICE9IGNydGMtPmJhc2Uu c3RhdGUtPmVuYWJsZSkgewo+ICAJCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyOwo+ICAK PiAgCQkvKiBUaGlzIGNhbiBoYXBwZW4gZWl0aGVyIGR1ZSB0byBidWdzIGluIHRoZSBnZXRfaHdf c3RhdGUKPiBAQCAtMTM0MTYsMTAgKzEzNDE4LDEwIEBAIHN0YXRpYyB2b2lkIGludGVsX3Nhbml0 aXplX2NydGMoc3RydWN0IGludGVsX2NydGMgKmNydGMpCj4gIAkJICogcGlwZSBBIHF1aXJrLiAq Lwo+ICAJCURSTV9ERUJVR19LTVMoIltDUlRDOiVkXSBodyBzdGF0ZSBhZGp1c3RlZCwgd2FzICVz LCBub3cgJXNcbiIsCj4gIAkJCSAgICAgIGNydGMtPmJhc2UuYmFzZS5pZCwKPiAtCQkJICAgICAg Y3J0Yy0+YmFzZS5lbmFibGVkID8gImVuYWJsZWQiIDogImRpc2FibGVkIiwKPiArCQkJICAgICAg Y3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlID8gImVuYWJsZWQiIDogImRpc2FibGVkIiwKPiAgCQkJ ICAgICAgY3J0Yy0+YWN0aXZlID8gImVuYWJsZWQiIDogImRpc2FibGVkIik7Cj4gIAo+IC0JCWNy dGMtPmJhc2UuZW5hYmxlZCA9IGNydGMtPmFjdGl2ZTsKCkFuZCB0aGlzLgoKPiArCQljcnRjLT5i YXNlLnN0YXRlLT5lbmFibGUgPSBjcnRjLT5hY3RpdmU7Cj4gIAo+ICAJCS8qIEJlY2F1c2Ugd2Ug b25seSBlc3RhYmxpc2ggdGhlIGNvbm5lY3RvciAtPiBlbmNvZGVyIC0+Cj4gIAkJICogY3J0YyBs aW5rcyBpZiBzb21ldGhpbmcgaXMgYWN0aXZlLCB0aGlzIG1lYW5zIHRoZQo+IEBAIC0xMzU1NSw3 ICsxMzU1Nyw3IEBAIHN0YXRpYyB2b2lkIGludGVsX21vZGVzZXRfcmVhZG91dF9od19zdGF0ZShz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAJCWNydGMtPmFjdGl2ZSA9IGRldl9wcml2LT5kaXNw bGF5LmdldF9waXBlX2NvbmZpZyhjcnRjLAo+ICAJCQkJCQkJCSBjcnRjLT5jb25maWcpOwo+ICAK PiAtCQljcnRjLT5iYXNlLmVuYWJsZWQgPSBjcnRjLT5hY3RpdmU7CgpBbmQgYWxzbyB0aGlzIG9u ZS4KClRoYXQgd291bGQgdGhlbiBtYXRjaCB3aGF0IHRoZSBhdG9taWMgaGVscGVycyBlbmQgdXAg ZG9pbmcsIHdoaWNoIGFsc28Ka2VlcCBib3RoIGxlZ2FjeSBhbmQgbmV3IHN0YXRlIHVwZGF0ZWQu CgpPbmNlIGV2ZXJ5dGhpbmcgaGFzIHNldHRsZWQgZG93biBhIGJpdCBJIHRoaW5rIHdlIGNhbiBy ZWF1ZGl0IHRoZSBkcm0gY29yZQpmb3IgYW55IGFjY2VzcyB0byBsZWdhY3kgc3RhdGUgbGVmdCBi ZWhpbmQgKHRoZXJlJ3Mgc3RpbGwgc29tZSBJJ3ZlCm5vdGljZWQpIGFuZCB0aGVuIHJpcCB0aGlz IGFsbCBvdXQgZnJvbSBib3QgaTkxNSBtb2Rlc2V0IGNvZGUgYW5kIGF0b21pYwpoZWxwZXJzLgoK Q2hlZXJzLCBEYW5pZWwKCj4gKwkJY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlID0gY3J0Yy0+YWN0 aXZlOwo+ICAJCWNydGMtPnByaW1hcnlfZW5hYmxlZCA9IHByaW1hcnlfZ2V0X2h3X3N0YXRlKGNy dGMpOwo+ICAKPiAgCQlEUk1fREVCVUdfS01TKCJbQ1JUQzolZF0gaHcgc3RhdGUgcmVhZG91dDog JXNcbiIsCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2ZHMuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2ZHMuYwo+IGluZGV4IDA3MWI5NmQuLjI0ZTg3 MzAgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5jCj4gKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5jCj4gQEAgLTUwOSw3ICs1MDksNyBA QCBzdGF0aWMgaW50IGludGVsX2x2ZHNfc2V0X3Byb3BlcnR5KHN0cnVjdCBkcm1fY29ubmVjdG9y ICpjb25uZWN0b3IsCj4gIAkJaW50ZWxfY29ubmVjdG9yLT5wYW5lbC5maXR0aW5nX21vZGUgPSB2 YWx1ZTsKPiAgCj4gIAkJY3J0YyA9IGludGVsX2F0dGFjaGVkX2VuY29kZXIoY29ubmVjdG9yKS0+ YmFzZS5jcnRjOwo+IC0JCWlmIChjcnRjICYmIGNydGMtPmVuYWJsZWQpIHsKPiArCQlpZiAoY3J0 YyAmJiBjcnRjLT5zdGF0ZS0+ZW5hYmxlKSB7Cj4gIAkJCS8qCj4gIAkJCSAqIElmIHRoZSBDUlRD IGlzIGVuYWJsZWQsIHRoZSBkaXNwbGF5IHdpbGwgYmUgY2hhbmdlZAo+ICAJCQkgKiBhY2NvcmRp bmcgdG8gdGhlIG5ldyBwYW5lbCBmaXR0aW5nIG1vZGUuCj4gLS0gCj4gMS44LjUuMQo+IAoKLS0g CkRhbmllbCBWZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIsIEludGVsIENvcnBvcmF0aW9uCis0MSAo MCkgNzkgMzY1IDU3IDQ4IC0gaHR0cDovL2Jsb2cuZmZ3bGwuY2gKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK