From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: Re: [PATCH v4 4/5] drm/atomic: Convert get_existing_state callers to get_old/new_state, v3. Date: Wed, 01 Mar 2017 03:04:01 +0200 Message-ID: <33099096.olWWpuyW68@avalon> References: <1487256430-7625-1-git-send-email-maarten.lankhorst@linux.intel.com> <1487256430-7625-5-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1487256430-7625-5-git-send-email-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org SGkgTWFhcnRlbiwKClRoYW5rIHlvdSBmb3IgdGhlIHBhdGNoLgoKT24gVGh1cnNkYXkgMTYgRmVi IDIwMTcgMTU6NDc6MDkgTWFhcnRlbiBMYW5raG9yc3Qgd3JvdGU6Cj4gVGhpcyBpcyBhIHN0cmFp Z2h0Zm9yd2FyZCBjb252ZXJzaW9uIHRoYXQgY29udmVydHMgYWxsIHRoZSB1c2VycyBvZgo+IGdl dF9leGlzdGluZ19zdGF0ZSBpbiBhdG9taWMgY29yZSB0byB1c2UgZ2V0X29sZF9zdGF0ZSBvciBn ZXRfbmV3X3N0YXRlCj4gCj4gQ2hhbmdlcyBzaW5jZSB2MToKPiAtIEZpeCB1c2luZyB0aGUgd3Jv bmcgc3RhdGUgaW4KPiBkcm1fYXRvbWljX2hlbHBlcl91cGRhdGVfbGVnYWN5X21vZGVzZXRfc3Rh dGUuIENoYW5nZXMgc2luY2UgdjI6Cj4gLSBVc2UgdGhlIGNvcnJlY3Qgc3RhdGUgaW4gZGlzYWJs ZV9vdXRwdXRzKCkKPiAKPiBTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRl bi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vZHJt X2F0b21pYy5jICAgICAgICAgICAgfCAgNiArKy0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0 b21pY19oZWxwZXIuYyAgICAgfCA0MyArKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KPiAg ZHJpdmVycy9ncHUvZHJtL2RybV9ibGVuZC5jICAgICAgICAgICAgIHwgIDMgKy0tCj4gIGRyaXZl cnMvZ3B1L2RybS9kcm1fc2ltcGxlX2ttc19oZWxwZXIuYyB8ICA0ICstLQo+ICA0IGZpbGVzIGNo YW5nZWQsIDI4IGluc2VydGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9t aWMuYwo+IGluZGV4IGFmZWM1MzgzMjE0NS4uYzlhYWM5Y2JmMTExIDEwMDY0NAo+IC0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0 b21pYy5jCj4gQEAgLTEzNTgsOCArMTM1OCw4IEBAIGRybV9hdG9taWNfc2V0X2NydGNfZm9yX2Nv bm5lY3RvcihzdHJ1Y3QKPiBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlLCByZXR1cm4g MDsKPiAKPiAgCWlmIChjb25uX3N0YXRlLT5jcnRjKSB7Cj4gLQkJY3J0Y19zdGF0ZSA9IGRybV9h dG9taWNfZ2V0X2V4aXN0aW5nX2NydGNfc3RhdGUoY29ubl9zdGF0ZS0KPnN0YXRlLAo+IC0JCQkJ CQkJCWNvbm5fc3RhdGUtCj5jcnRjKTsKPiArCQljcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRf bmV3X2NydGNfc3RhdGUoY29ubl9zdGF0ZS0+c3RhdGUsCj4gKwkJCQkJCQkgICBjb25uX3N0YXRl LT5jcnRjKTsKCkkgYmVsaWV2ZSBtb3JlICpfc3RhdGUgLT4gKl8obmV3fG9sZClfc3RhdGUgcmVu YW1lcyBjb3VsZCBiZSB1c2VmdWwsIGJ1dCB0aGF0IApjYW4gYmUgYWRkcmVzc2VkIGFzIGEgc3Vi c2VxdWVudCBwYXRjaCwgc28KClJldmlld2VkLWJ5OiBMYXVyZW50IFBpbmNoYXJ0IDxsYXVyZW50 LnBpbmNoYXJ0QGlkZWFzb25ib2FyZC5jb20+Cgo+ICAJCWNydGNfc3RhdGUtPmNvbm5lY3Rvcl9t YXNrICY9Cj4gIAkJCX4oMSA8PCBkcm1fY29ubmVjdG9yX2luZGV4KGNvbm5fc3RhdGUtPmNvbm5l Y3RvcikpOwo+IEBAIC0xNDc2LDcgKzE0NzYsNyBAQCBkcm1fYXRvbWljX2FkZF9hZmZlY3RlZF9w bGFuZXMoc3RydWN0IGRybV9hdG9taWNfc3RhdGUKPiAqc3RhdGUsIHsKPiAgCXN0cnVjdCBkcm1f cGxhbmUgKnBsYW5lOwo+IAo+IC0JV0FSTl9PTighZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfY3J0 Y19zdGF0ZShzdGF0ZSwgY3J0YykpOwo+ICsJV0FSTl9PTighZHJtX2F0b21pY19nZXRfbmV3X2Ny dGNfc3RhdGUoc3RhdGUsIGNydGMpKTsKPiAKPiAgCWRybV9mb3JfZWFjaF9wbGFuZV9tYXNrKHBs YW5lLCBzdGF0ZS0+ZGV2LCBjcnRjLT5zdGF0ZS0+cGxhbmVfbWFzaykgewo+ICAJCXN0cnVjdCBk cm1fcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlID0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2RybV9hdG9taWNfaGVscGVyLmMKPiBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hl bHBlci5jIGluZGV4IGVhNTQ0YmRkYzI5Yi4uNjI5NmFlNmU2YWZmCj4gMTAwNjQ0Cj4gLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKPiArKysgYi9kcml2ZXJzL2dwdS9k cm0vZHJtX2F0b21pY19oZWxwZXIuYwo+IEBAIC03MCw4ICs3MCw4IEBAIGRybV9hdG9taWNfaGVs cGVyX3BsYW5lX2NoYW5nZWQoc3RydWN0IGRybV9hdG9taWNfc3RhdGUKPiAqc3RhdGUsIHN0cnVj dCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKPiAKPiAgCWlmIChvbGRfcGxhbmVfc3RhdGUt PmNydGMpIHsKPiAtCQljcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfY3J0Y19z dGF0ZShzdGF0ZSwKPiAtCQkJCQkJCQkKb2xkX3BsYW5lX3N0YXRlLT5jcnRjKTsKPiArCQljcnRj X3N0YXRlID0gZHJtX2F0b21pY19nZXRfbmV3X2NydGNfc3RhdGUoc3RhdGUsCj4gKwkJCQkJCQkg ICBvbGRfcGxhbmVfc3RhdGUtCj5jcnRjKTsKPiAKPiAgCQlpZiAoV0FSTl9PTighY3J0Y19zdGF0 ZSkpCj4gIAkJCXJldHVybjsKPiBAQCAtODAsOCArODAsNyBAQCBkcm1fYXRvbWljX2hlbHBlcl9w bGFuZV9jaGFuZ2VkKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlCj4gKnN0YXRlLCB9Cj4gCj4gIAlp ZiAocGxhbmVfc3RhdGUtPmNydGMpIHsKPiAtCQljcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRf ZXhpc3RpbmdfY3J0Y19zdGF0ZShzdGF0ZSwKPiAtCQkJCQkJCQlwbGFuZV9zdGF0ZS0KPmNydGMp Owo+ICsJCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShzdGF0ZSwg cGxhbmVfc3RhdGUtCj5jcnRjKTsKPiAKPiAgCQlpZiAoV0FSTl9PTighY3J0Y19zdGF0ZSkpCj4g IAkJCXJldHVybjsKPiBAQCAtMTUwLDcgKzE0OSw3IEBAIHN0YXRpYyBpbnQgaGFuZGxlX2NvbmZs aWN0aW5nX2VuY29kZXJzKHN0cnVjdAo+IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLCBkcm1fZm9y X2VhY2hfY29ubmVjdG9yX2l0ZXIoY29ubmVjdG9yLCAmY29ubl9pdGVyKQo+IHsKPiAgCQlzdHJ1 Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7Cj4gCj4gLQkJaWYgKGRybV9hdG9taWNfZ2V0 X2V4aXN0aW5nX2Nvbm5lY3Rvcl9zdGF0ZShzdGF0ZSwgY29ubmVjdG9yKSkKPiArCQlpZiAoZHJt X2F0b21pY19nZXRfbmV3X2Nvbm5lY3Rvcl9zdGF0ZShzdGF0ZSwgY29ubmVjdG9yKSkKPiAgCQkJ Y29udGludWU7Cj4gCj4gIAkJZW5jb2RlciA9IGNvbm5lY3Rvci0+c3RhdGUtPmJlc3RfZW5jb2Rl cjsKPiBAQCAtMTc4LDcgKzE3Nyw3IEBAIHN0YXRpYyBpbnQgaGFuZGxlX2NvbmZsaWN0aW5nX2Vu Y29kZXJzKHN0cnVjdAo+IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLCBuZXdfY29ubl9zdGF0ZS0+ Y3J0Yy0+YmFzZS5pZCwKPiBuZXdfY29ubl9zdGF0ZS0+Y3J0Yy0+bmFtZSwKPiAgCQkJCSBjb25u ZWN0b3ItPmJhc2UuaWQsIGNvbm5lY3Rvci0+bmFtZSk7Cj4gCj4gLQkJY3J0Y19zdGF0ZSA9IGRy bV9hdG9taWNfZ2V0X2V4aXN0aW5nX2NydGNfc3RhdGUoc3RhdGUsCj4gbmV3X2Nvbm5fc3RhdGUt PmNydGMpOyArCQljcnRjX3N0YXRlID0gCmRybV9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0 YXRlLAo+IG5ld19jb25uX3N0YXRlLT5jcnRjKTsKPiAKPiAgCQlyZXQgPSBkcm1fYXRvbWljX3Nl dF9jcnRjX2Zvcl9jb25uZWN0b3IobmV3X2Nvbm5fc3RhdGUsIE5VTEwpOwo+ICAJCWlmIChyZXQp Cj4gQEAgLTIxOSw3ICsyMTgsNyBAQCBzZXRfYmVzdF9lbmNvZGVyKHN0cnVjdCBkcm1fYXRvbWlj X3N0YXRlICpzdGF0ZSwKPiAgCQkgKi8KPiAgCQlXQVJOX09OKCFjcnRjICYmIGVuY29kZXIgIT0g Y29ubl9zdGF0ZS0+YmVzdF9lbmNvZGVyKTsKPiAgCQlpZiAoY3J0Yykgewo+IC0JCQljcnRjX3N0 YXRlID0gZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfY3J0Y19zdGF0ZShzdGF0ZSwgCmNydGMpOwo+ ICsJCQljcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfbmV3X2NydGNfc3RhdGUoc3RhdGUsIApj cnRjKTsKPiAKPiAgCQkJY3J0Y19zdGF0ZS0+ZW5jb2Rlcl9tYXNrICY9Cj4gIAkJCQl+KDEgPDwg ZHJtX2VuY29kZXJfaW5kZXgoY29ubl9zdGF0ZS0KPmJlc3RfZW5jb2RlcikpOwo+IEBAIC0yMzAs NyArMjI5LDcgQEAgc2V0X2Jlc3RfZW5jb2RlcihzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3Rh dGUsCj4gIAkJY3J0YyA9IGNvbm5fc3RhdGUtPmNydGM7Cj4gIAkJV0FSTl9PTighY3J0Yyk7Cj4g IAkJaWYgKGNydGMpIHsKPiAtCQkJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2V4aXN0aW5n X2NydGNfc3RhdGUoc3RhdGUsIApjcnRjKTsKPiArCQkJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNf Z2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLCAKY3J0Yyk7Cj4gCj4gIAkJCWNydGNfc3RhdGUtPmVu Y29kZXJfbWFzayB8PQo+ICAJCQkJMSA8PCBkcm1fZW5jb2Rlcl9pbmRleChlbmNvZGVyKTsKPiBA QCAtMjYzLDcgKzI2Miw3IEBAIHN0ZWFsX2VuY29kZXIoc3RydWN0IGRybV9hdG9taWNfc3RhdGUg KnN0YXRlLAo+IAo+ICAJCXNldF9iZXN0X2VuY29kZXIoc3RhdGUsIG5ld19jb25uZWN0b3Jfc3Rh dGUsIE5VTEwpOwo+IAo+IC0JCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9leGlzdGluZ19j cnRjX3N0YXRlKHN0YXRlLCAKZW5jb2Rlcl9jcnRjKTsKPiArCQljcnRjX3N0YXRlID0gZHJtX2F0 b21pY19nZXRfbmV3X2NydGNfc3RhdGUoc3RhdGUsIAplbmNvZGVyX2NydGMpOwo+ICAJCWNydGNf c3RhdGUtPmNvbm5lY3RvcnNfY2hhbmdlZCA9IHRydWU7Cj4gCj4gIAkJcmV0dXJuOwo+IEBAIC0y ODYsMTIgKzI4NSwxMiBAQCB1cGRhdGVfY29ubmVjdG9yX3JvdXRpbmcoc3RydWN0IGRybV9hdG9t aWNfc3RhdGUKPiAqc3RhdGUsCj4gCj4gIAlpZiAob2xkX2Nvbm5lY3Rvcl9zdGF0ZS0+Y3J0YyAh PSBuZXdfY29ubmVjdG9yX3N0YXRlLT5jcnRjKSB7Cj4gIAkJaWYgKG9sZF9jb25uZWN0b3Jfc3Rh dGUtPmNydGMpIHsKPiAtCQkJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2Ny dGNfc3RhdGUoc3RhdGUsCj4gb2xkX2Nvbm5lY3Rvcl9zdGF0ZS0+Y3J0Yyk7ICsJCQljcnRjX3N0 YXRlID0KPiBkcm1fYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShzdGF0ZSwgb2xkX2Nvbm5lY3Rv cl9zdGF0ZS0+Y3J0Yyk7Cj4gY3J0Y19zdGF0ZS0+Y29ubmVjdG9yc19jaGFuZ2VkID0gdHJ1ZTsK PiAgCQl9Cj4gCj4gIAkJaWYgKG5ld19jb25uZWN0b3Jfc3RhdGUtPmNydGMpIHsKPiAtCQkJY3J0 Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2NydGNfc3RhdGUoc3RhdGUsCj4gbmV3 X2Nvbm5lY3Rvcl9zdGF0ZS0+Y3J0Yyk7ICsJCQljcnRjX3N0YXRlID0KPiBkcm1fYXRvbWljX2dl dF9uZXdfY3J0Y19zdGF0ZShzdGF0ZSwgbmV3X2Nvbm5lY3Rvcl9zdGF0ZS0+Y3J0Yyk7Cj4gY3J0 Y19zdGF0ZS0+Y29ubmVjdG9yc19jaGFuZ2VkID0gdHJ1ZTsKPiAgCQl9Cj4gIAl9Cj4gQEAgLTM1 MCw3ICszNDksNyBAQCB1cGRhdGVfY29ubmVjdG9yX3JvdXRpbmcoc3RydWN0IGRybV9hdG9taWNf c3RhdGUgKnN0YXRlLAo+IAo+ICAJc2V0X2Jlc3RfZW5jb2RlcihzdGF0ZSwgbmV3X2Nvbm5lY3Rv cl9zdGF0ZSwgbmV3X2VuY29kZXIpOwo+IAo+IC0JY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0 X2V4aXN0aW5nX2NydGNfc3RhdGUoc3RhdGUsCj4gbmV3X2Nvbm5lY3Rvcl9zdGF0ZS0+Y3J0Yyk7 ICsJY3J0Y19zdGF0ZSA9Cj4gZHJtX2F0b21pY19nZXRfbmV3X2NydGNfc3RhdGUoc3RhdGUsIG5l d19jb25uZWN0b3Jfc3RhdGUtPmNydGMpOwo+IGNydGNfc3RhdGUtPmNvbm5lY3RvcnNfY2hhbmdl ZCA9IHRydWU7Cj4gCj4gIAlEUk1fREVCVUdfQVRPTUlDKCJbQ09OTkVDVE9SOiVkOiVzXSB1c2lu ZyBbRU5DT0RFUjolZDolc10gb24KPiBbQ1JUQzolZDolc11cbiIsIEBAIC0zOTIsNyArMzkxLDcg QEAgbW9kZV9maXh1cChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZQo+ICpzdGF0ZSkKPiAgCQkJY29u dGludWU7Cj4gCj4gIAkJbmV3X2NydGNfc3RhdGUgPQo+IC0JCQlkcm1fYXRvbWljX2dldF9leGlz dGluZ19jcnRjX3N0YXRlKHN0YXRlLCAKbmV3X2Nvbm5fc3RhdGUtPmNydGMpOwo+ICsJCQlkcm1f YXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShzdGF0ZSwgbmV3X2Nvbm5fc3RhdGUtCj5jcnRjKTsK PiAKPiAgCQkvKgo+ICAJCSAqIEVhY2ggZW5jb2RlciBoYXMgYXQgbW9zdCBvbmUgY29ubmVjdG9y IChzaW5jZSB3ZSBhbHdheXMgCnN0ZWFsCj4gQEAgLTcwNCw4ICs3MDMsNyBAQCBkaXNhYmxlX291 dHB1dHMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0Cj4gZHJtX2F0b21pY19zdGF0ZSAq b2xkX3N0YXRlKSBpZiAoIW9sZF9jb25uX3N0YXRlLT5jcnRjKQo+ICAJCQljb250aW51ZTsKPiAK PiAtCQlvbGRfY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2NydGNfc3RhdGUo b2xkX3N0YXRlLAo+IC0JCQkJCQkJCSAgICAKb2xkX2Nvbm5fc3RhdGUtPmNydGMpOwo+ICsJCW9s ZF9jcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfb2xkX2NydGNfc3RhdGUob2xkX3N0YXRlLAo+ IG9sZF9jb25uX3N0YXRlLT5jcnRjKTsKPiAKPiAgCQlpZiAoIW9sZF9jcnRjX3N0YXRlLT5hY3Rp dmUgfHwKPiAgCQkgICAgIWRybV9hdG9taWNfY3J0Y19uZWVkc19tb2Rlc2V0KG9sZF9jb25uX3N0 YXRlLT5jcnRjLQo+c3RhdGUpKQo+IEBAIC04MzQsMTQgKzgzMiwxNyBAQCBkcm1fYXRvbWljX2hl bHBlcl91cGRhdGVfbGVnYWN5X21vZGVzZXRfc3RhdGUoc3RydWN0Cj4gZHJtX2RldmljZSAqZGV2 LCAvKiBzZXQgbGVnYWN5IHN0YXRlIGluIHRoZSBjcnRjIHN0cnVjdHVyZSAqLwo+ICAJZm9yX2Vh Y2hfbmV3X2NydGNfaW5fc3RhdGUob2xkX3N0YXRlLCBjcnRjLCBuZXdfY3J0Y19zdGF0ZSwgaSkg ewo+ICAJCXN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnkgPSBjcnRjLT5wcmltYXJ5Owo+ICsJCXN0 cnVjdCBkcm1fcGxhbmVfc3RhdGUgKm5ld19wbGFuZV9zdGF0ZTsKPiAKPiAgCQljcnRjLT5tb2Rl ID0gbmV3X2NydGNfc3RhdGUtPm1vZGU7Cj4gIAkJY3J0Yy0+ZW5hYmxlZCA9IG5ld19jcnRjX3N0 YXRlLT5lbmFibGU7Cj4gCj4gLQkJaWYgKGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX3BsYW5lX3N0 YXRlKG9sZF9zdGF0ZSwgcHJpbWFyeSkgJiYKPiAtCQkgICAgcHJpbWFyeS0+c3RhdGUtPmNydGMg PT0gY3J0Yykgewo+IC0JCQljcnRjLT54ID0gcHJpbWFyeS0+c3RhdGUtPnNyY194ID4+IDE2Owo+ IC0JCQljcnRjLT55ID0gcHJpbWFyeS0+c3RhdGUtPnNyY195ID4+IDE2Owo+ICsJCW5ld19wbGFu ZV9zdGF0ZSA9Cj4gKwkJCWRybV9hdG9taWNfZ2V0X25ld19wbGFuZV9zdGF0ZShvbGRfc3RhdGUs IHByaW1hcnkpOwo+ICsKPiArCQlpZiAobmV3X3BsYW5lX3N0YXRlICYmIG5ld19wbGFuZV9zdGF0 ZS0+Y3J0YyA9PSBjcnRjKSB7Cj4gKwkJCWNydGMtPnggPSBuZXdfcGxhbmVfc3RhdGUtPnNyY194 ID4+IDE2Owo+ICsJCQljcnRjLT55ID0gbmV3X3BsYW5lX3N0YXRlLT5zcmNfeSA+PiAxNjsKPiAg CQl9Cj4gCj4gIAkJaWYgKG5ld19jcnRjX3N0YXRlLT5lbmFibGUpCj4gQEAgLTE4NDMsNyArMTg0 NCw3IEBAIGRybV9hdG9taWNfaGVscGVyX2NvbW1pdF9wbGFuZXNfb25fY3J0YyhzdHJ1Y3QKPiBk cm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCj4gCj4gIAlkcm1fZm9yX2VhY2hfcGxhbmVf bWFzayhwbGFuZSwgY3J0Yy0+ZGV2LCBwbGFuZV9tYXNrKSB7Cj4gIAkJc3RydWN0IGRybV9wbGFu ZV9zdGF0ZSAqb2xkX3BsYW5lX3N0YXRlID0KPiAtCQkJZHJtX2F0b21pY19nZXRfZXhpc3Rpbmdf cGxhbmVfc3RhdGUob2xkX3N0YXRlLCBwbGFuZSk7Cj4gKwkJCWRybV9hdG9taWNfZ2V0X29sZF9w bGFuZV9zdGF0ZShvbGRfc3RhdGUsIHBsYW5lKTsKPiAgCQljb25zdCBzdHJ1Y3QgZHJtX3BsYW5l X2hlbHBlcl9mdW5jcyAqcGxhbmVfZnVuY3M7Cj4gCj4gIAkJcGxhbmVfZnVuY3MgPSBwbGFuZS0+ aGVscGVyX3ByaXZhdGU7Cj4gQEAgLTI5MTQsNyArMjkxNSw3IEBAIGludCBkcm1fYXRvbWljX2hl bHBlcl9wYWdlX2ZsaXBfdGFyZ2V0KAo+ICAJaWYgKHJldCAhPSAwKQo+ICAJCWdvdG8gZmFpbDsK PiAKPiAtCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHN0 YXRlLCBjcnRjKTsKPiArCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0 ZShzdGF0ZSwgY3J0Yyk7Cj4gIAlpZiAoV0FSTl9PTighY3J0Y19zdGF0ZSkpIHsKPiAgCQlyZXQg PSAtRUlOVkFMOwo+ICAJCWdvdG8gZmFpbDsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2RybV9ibGVuZC5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9ibGVuZC5jCj4gaW5kZXggNjY1YWFm YzZhZDY4Li5kNzA1M2JiNjdkYjYgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9i bGVuZC5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9ibGVuZC5jCj4gQEAgLTM4Nyw4ICsz ODcsNyBAQCBpbnQgZHJtX2F0b21pY19ub3JtYWxpemVfenBvcyhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAo+ICAJCWlmICghY3J0YykKPiAgCQkJY29udGludWU7Cj4gIAkJaWYgKHBsYW5lLT5zdGF0 ZS0+enBvcyAhPSBwbGFuZV9zdGF0ZS0+enBvcykgewo+IC0JCQljcnRjX3N0YXRlID0KPiAtCQkJ CWRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2NydGNfc3RhdGUoc3RhdGUsIApjcnRjKTsKPiArCQkJ Y3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLCAKY3J0Yyk7 Cj4gIAkJCWNydGNfc3RhdGUtPnpwb3NfY2hhbmdlZCA9IHRydWU7Cj4gIAkJfQo+ICAJfQo+IGRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3NpbXBsZV9rbXNfaGVscGVyLmMKPiBiL2Ry aXZlcnMvZ3B1L2RybS9kcm1fc2ltcGxlX2ttc19oZWxwZXIuYyBpbmRleCAzNWM1ZDk5Mjk2Yjku LjE2Nzg5ZmFhOTI5MQo+IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fc2ltcGxl X2ttc19oZWxwZXIuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fc2ltcGxlX2ttc19oZWxw ZXIuYwo+IEBAIC04Niw4ICs4Niw4IEBAIHN0YXRpYyBpbnQgZHJtX3NpbXBsZV9rbXNfcGxhbmVf YXRvbWljX2NoZWNrKHN0cnVjdAo+IGRybV9wbGFuZSAqcGxhbmUsIGludCByZXQ7Cj4gCj4gIAlw aXBlID0gY29udGFpbmVyX29mKHBsYW5lLCBzdHJ1Y3QgZHJtX3NpbXBsZV9kaXNwbGF5X3BpcGUs IHBsYW5lKTsKPiAtCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0 YXRlKHBsYW5lX3N0YXRlLT5zdGF0ZSwKPiAtCQkJCQkJCSZwaXBlLT5jcnRjKTsKPiArCWNydGNf c3RhdGUgPSBkcm1fYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShwbGFuZV9zdGF0ZS0+c3RhdGUs Cj4gKwkJCQkJCSAgICZwaXBlLT5jcnRjKTsKPiAgCWlmIChjcnRjX3N0YXRlLT5lbmFibGUgIT0g ISFwbGFuZV9zdGF0ZS0+Y3J0YykKPiAgCQlyZXR1cm4gLUVJTlZBTDsgLyogcGxhbmUgbXVzdCBt YXRjaCBjcnRjIGVuYWJsZSBzdGF0ZSAqLwoKLS0gClJlZ2FyZHMsCgpMYXVyZW50IFBpbmNoYXJ0 CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2 ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK