From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756704AbdELIHP (ORCPT ); Fri, 12 May 2017 04:07:15 -0400 Received: from mail.free-electrons.com ([62.4.15.54]:49376 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755908AbdELIHM (ORCPT ); Fri, 12 May 2017 04:07:12 -0400 Date: Fri, 12 May 2017 10:07:00 +0200 From: Boris Brezillon To: Eric Anholt Cc: dri-devel@lists.freedesktop.org, Archit Taneja , Andrzej Hajda , Laurent Pinchart , CK Hu , Philipp Zabel , Yannick Fertre , Philippe Cornu , linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 4/7] drm/mediatek: Use the panel-bridge helper. Message-ID: <20170512100700.75d11a5d@bbrezillon> In-Reply-To: <20170511183128.25085-4-eric@anholt.net> References: <20170511183128.25085-1-eric@anholt.net> <20170511183128.25085-4-eric@anholt.net> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 11 May 2017 11:31:25 -0700 Eric Anholt wrote: > Avoids a bunch of connector boilerplate. Note that this causes panel > prepare() to be moved before mtk_dsi_poweron() and unprepare() to be > after poweroff(). I think this is the expected usage of the panel API > (enable should be when you do things that require the link to be > brought up), but there may be issues here. > > Signed-off-by: Eric Anholt Reviewed-by: Boris Brezillon > --- > > Note that I haven't tested this change, and am not committed to this > patch. It's just an optional cleanup, if it works for you. > > drivers/gpu/drm/mediatek/mtk_dsi.c | 125 ++++--------------------------------- > 1 file changed, 13 insertions(+), 112 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c > index 808b995a990f..764bd8b9c256 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dsi.c > +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c > @@ -160,7 +160,6 @@ struct mtk_dsi { > struct device *dev; > struct mipi_dsi_host host; > struct drm_encoder encoder; > - struct drm_connector conn; > struct drm_panel *panel; > struct drm_bridge *bridge; > struct phy *phy; > @@ -188,11 +187,6 @@ static inline struct mtk_dsi *encoder_to_dsi(struct drm_encoder *e) > return container_of(e, struct mtk_dsi, encoder); > } > > -static inline struct mtk_dsi *connector_to_dsi(struct drm_connector *c) > -{ > - return container_of(c, struct mtk_dsi, conn); > -} > - > static inline struct mtk_dsi *host_to_dsi(struct mipi_dsi_host *h) > { > return container_of(h, struct mtk_dsi, host); > @@ -603,16 +597,7 @@ static int mtk_dsi_poweron(struct mtk_dsi *dsi) > mtk_dsi_lane0_ulp_mode_leave(dsi); > mtk_dsi_clk_hs_mode(dsi, 0); > > - if (dsi->panel) { > - if (drm_panel_prepare(dsi->panel)) { > - DRM_ERROR("failed to prepare the panel\n"); > - goto err_disable_digital_clk; > - } > - } > - > return 0; > -err_disable_digital_clk: > - clk_disable_unprepare(dsi->digital_clk); > err_disable_engine_clk: > clk_disable_unprepare(dsi->engine_clk); > err_phy_power_off: > @@ -630,15 +615,7 @@ static void mtk_dsi_poweroff(struct mtk_dsi *dsi) > if (--dsi->refcount != 0) > return; > > - if (!mtk_dsi_switch_to_cmd_mode(dsi, VM_DONE_INT_FLAG, 500)) { > - if (dsi->panel) { > - if (drm_panel_unprepare(dsi->panel)) { > - DRM_ERROR("failed to unprepare the panel\n"); > - return; > - } > - } > - } > - > + mtk_dsi_switch_to_cmd_mode(dsi, VM_DONE_INT_FLAG, 500); > mtk_dsi_reset_engine(dsi); > mtk_dsi_lane0_ulp_mode_enter(dsi); > mtk_dsi_clk_ulp_mode_enter(dsi); > @@ -669,19 +646,9 @@ static void mtk_output_dsi_enable(struct mtk_dsi *dsi) > > mtk_dsi_start(dsi); > > - if (dsi->panel) { > - if (drm_panel_enable(dsi->panel)) { > - DRM_ERROR("failed to enable the panel\n"); > - goto err_dsi_power_off; > - } > - } > - > dsi->enabled = true; > > return; > -err_dsi_power_off: > - mtk_dsi_stop(dsi); > - mtk_dsi_poweroff(dsi); > } > > static void mtk_output_dsi_disable(struct mtk_dsi *dsi) > @@ -689,13 +656,6 @@ static void mtk_output_dsi_disable(struct mtk_dsi *dsi) > if (!dsi->enabled) > return; > > - if (dsi->panel) { > - if (drm_panel_disable(dsi->panel)) { > - DRM_ERROR("failed to disable the panel\n"); > - return; > - } > - } > - > mtk_dsi_stop(dsi); > mtk_dsi_poweroff(dsi); > > @@ -750,13 +710,6 @@ static void mtk_dsi_encoder_enable(struct drm_encoder *encoder) > mtk_output_dsi_enable(dsi); > } > > -static int mtk_dsi_connector_get_modes(struct drm_connector *connector) > -{ > - struct mtk_dsi *dsi = connector_to_dsi(connector); > - > - return drm_panel_get_modes(dsi->panel); > -} > - > static const struct drm_encoder_helper_funcs mtk_dsi_encoder_helper_funcs = { > .mode_fixup = mtk_dsi_encoder_mode_fixup, > .mode_set = mtk_dsi_encoder_mode_set, > @@ -764,52 +717,7 @@ static const struct drm_encoder_helper_funcs mtk_dsi_encoder_helper_funcs = { > .enable = mtk_dsi_encoder_enable, > }; > > -static const struct drm_connector_funcs mtk_dsi_connector_funcs = { > - .dpms = drm_atomic_helper_connector_dpms, > - .fill_modes = drm_helper_probe_single_connector_modes, > - .destroy = drm_connector_cleanup, > - .reset = drm_atomic_helper_connector_reset, > - .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > - .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > -}; > - > -static const struct drm_connector_helper_funcs > - mtk_dsi_connector_helper_funcs = { > - .get_modes = mtk_dsi_connector_get_modes, > -}; > - > -static int mtk_dsi_create_connector(struct drm_device *drm, struct mtk_dsi *dsi) > -{ > - int ret; > - > - ret = drm_connector_init(drm, &dsi->conn, &mtk_dsi_connector_funcs, > - DRM_MODE_CONNECTOR_DSI); > - if (ret) { > - DRM_ERROR("Failed to connector init to drm\n"); > - return ret; > - } > - > - drm_connector_helper_add(&dsi->conn, &mtk_dsi_connector_helper_funcs); > - > - dsi->conn.dpms = DRM_MODE_DPMS_OFF; > - drm_mode_connector_attach_encoder(&dsi->conn, &dsi->encoder); > - > - if (dsi->panel) { > - ret = drm_panel_attach(dsi->panel, &dsi->conn); > - if (ret) { > - DRM_ERROR("Failed to attach panel to drm\n"); > - goto err_connector_cleanup; > - } > - } > - > - return 0; > - > -err_connector_cleanup: > - drm_connector_cleanup(&dsi->conn); > - return ret; > -} > - > -static int mtk_dsi_create_conn_enc(struct drm_device *drm, struct mtk_dsi *dsi) > +static int mtk_dsi_create_enc(struct drm_device *drm, struct mtk_dsi *dsi) > { > int ret; > > @@ -827,15 +735,10 @@ static int mtk_dsi_create_conn_enc(struct drm_device *drm, struct mtk_dsi *dsi) > */ > dsi->encoder.possible_crtcs = 1; > > - /* If there's a bridge, attach to it and let it create the connector */ > ret = drm_bridge_attach(&dsi->encoder, dsi->bridge, NULL); > if (ret) { > DRM_ERROR("Failed to attach bridge to drm\n"); > - > - /* Otherwise create our own connector and attach to a panel */ > - ret = mtk_dsi_create_connector(drm, dsi); > - if (ret) > - goto err_encoder_cleanup; > + goto err_encoder_cleanup; > } > > return 0; > @@ -848,9 +751,8 @@ static int mtk_dsi_create_conn_enc(struct drm_device *drm, struct mtk_dsi *dsi) > static void mtk_dsi_destroy_conn_enc(struct mtk_dsi *dsi) > { > drm_encoder_cleanup(&dsi->encoder); > - /* Skip connector cleanup if creation was delegated to the bridge */ > - if (dsi->conn.dev) > - drm_connector_cleanup(&dsi->conn); > + if (dsi->panel) > + drm_panel_bridge_remove(dsi->bridge); > } > > static void mtk_dsi_ddp_start(struct mtk_ddp_comp *comp) > @@ -881,20 +783,12 @@ static int mtk_dsi_host_attach(struct mipi_dsi_host *host, > dsi->format = device->format; > dsi->mode_flags = device->mode_flags; > > - if (dsi->conn.dev) > - drm_helper_hpd_irq_event(dsi->conn.dev); > - > return 0; > } > > static int mtk_dsi_host_detach(struct mipi_dsi_host *host, > struct mipi_dsi_device *device) > { > - struct mtk_dsi *dsi = host_to_dsi(host); > - > - if (dsi->conn.dev) > - drm_helper_hpd_irq_event(dsi->conn.dev); > - > return 0; > } > > @@ -1062,7 +956,7 @@ static int mtk_dsi_bind(struct device *dev, struct device *master, void *data) > goto err_ddp_comp_unregister; > } > > - ret = mtk_dsi_create_conn_enc(drm, dsi); > + ret = mtk_dsi_create_enc(drm, dsi); > if (ret) { > DRM_ERROR("Encoder create failed with %d\n", ret); > goto err_unregister; > @@ -1114,6 +1008,13 @@ static int mtk_dsi_probe(struct platform_device *pdev) > if (ret) > return ret; > > + if (dsi->panel) { > + dsi->bridge = drm_panel_bridge_add(dsi->panel, > + DRM_MODE_CONNECTOR_DSI); > + if (IS_ERR(dsi->bridge)) > + return PTR_ERR(dsi->bridge); > + } > + > dsi->engine_clk = devm_clk_get(dev, "engine"); > if (IS_ERR(dsi->engine_clk)) { > ret = PTR_ERR(dsi->engine_clk); From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Brezillon Subject: Re: [PATCH v2 4/7] drm/mediatek: Use the panel-bridge helper. Date: Fri, 12 May 2017 10:07:00 +0200 Message-ID: <20170512100700.75d11a5d@bbrezillon> References: <20170511183128.25085-1-eric@anholt.net> <20170511183128.25085-4-eric@anholt.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 872266E09A for ; Fri, 12 May 2017 08:07:11 +0000 (UTC) In-Reply-To: <20170511183128.25085-4-eric@anholt.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Eric Anholt Cc: Philippe Cornu , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Yannick Fertre , Laurent Pinchart List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCAxMSBNYXkgMjAxNyAxMTozMToyNSAtMDcwMApFcmljIEFuaG9sdCA8ZXJpY0Bhbmhv bHQubmV0PiB3cm90ZToKCj4gQXZvaWRzIGEgYnVuY2ggb2YgY29ubmVjdG9yIGJvaWxlcnBsYXRl LiAgTm90ZSB0aGF0IHRoaXMgY2F1c2VzIHBhbmVsCj4gcHJlcGFyZSgpIHRvIGJlIG1vdmVkIGJl Zm9yZSBtdGtfZHNpX3Bvd2Vyb24oKSBhbmQgdW5wcmVwYXJlKCkgdG8gYmUKPiBhZnRlciBwb3dl cm9mZigpLiAgSSB0aGluayB0aGlzIGlzIHRoZSBleHBlY3RlZCB1c2FnZSBvZiB0aGUgcGFuZWwg QVBJCj4gKGVuYWJsZSBzaG91bGQgYmUgd2hlbiB5b3UgZG8gdGhpbmdzIHRoYXQgcmVxdWlyZSB0 aGUgbGluayB0byBiZQo+IGJyb3VnaHQgdXApLCBidXQgdGhlcmUgbWF5IGJlIGlzc3VlcyBoZXJl Lgo+IAo+IFNpZ25lZC1vZmYtYnk6IEVyaWMgQW5ob2x0IDxlcmljQGFuaG9sdC5uZXQ+CgpSZXZp ZXdlZC1ieTogQm9yaXMgQnJlemlsbG9uIDxib3Jpcy5icmV6aWxsb25AZnJlZS1lbGVjdHJvbnMu Y29tPgoKPiAtLS0KPiAKPiBOb3RlIHRoYXQgSSBoYXZlbid0IHRlc3RlZCB0aGlzIGNoYW5nZSwg YW5kIGFtIG5vdCBjb21taXR0ZWQgdG8gdGhpcwo+IHBhdGNoLiAgSXQncyBqdXN0IGFuIG9wdGlv bmFsIGNsZWFudXAsIGlmIGl0IHdvcmtzIGZvciB5b3UuCj4gCj4gIGRyaXZlcnMvZ3B1L2RybS9t ZWRpYXRlay9tdGtfZHNpLmMgfCAxMjUgKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMTEyIGRlbGV0aW9ucygt KQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RzaS5jIGIv ZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kc2kuYwo+IGluZGV4IDgwOGI5OTVhOTkwZi4u NzY0YmQ4YjljMjU2IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtf ZHNpLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RzaS5jCj4gQEAgLTE2 MCw3ICsxNjAsNiBAQCBzdHJ1Y3QgbXRrX2RzaSB7Cj4gIAlzdHJ1Y3QgZGV2aWNlICpkZXY7Cj4g IAlzdHJ1Y3QgbWlwaV9kc2lfaG9zdCBob3N0Owo+ICAJc3RydWN0IGRybV9lbmNvZGVyIGVuY29k ZXI7Cj4gLQlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciBjb25uOwo+ICAJc3RydWN0IGRybV9wYW5lbCAq cGFuZWw7Cj4gIAlzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJpZGdlOwo+ICAJc3RydWN0IHBoeSAqcGh5 Owo+IEBAIC0xODgsMTEgKzE4Nyw2IEBAIHN0YXRpYyBpbmxpbmUgc3RydWN0IG10a19kc2kgKmVu Y29kZXJfdG9fZHNpKHN0cnVjdCBkcm1fZW5jb2RlciAqZSkKPiAgCXJldHVybiBjb250YWluZXJf b2YoZSwgc3RydWN0IG10a19kc2ksIGVuY29kZXIpOwo+ICB9Cj4gIAo+IC1zdGF0aWMgaW5saW5l IHN0cnVjdCBtdGtfZHNpICpjb25uZWN0b3JfdG9fZHNpKHN0cnVjdCBkcm1fY29ubmVjdG9yICpj KQo+IC17Cj4gLQlyZXR1cm4gY29udGFpbmVyX29mKGMsIHN0cnVjdCBtdGtfZHNpLCBjb25uKTsK PiAtfQo+IC0KPiAgc3RhdGljIGlubGluZSBzdHJ1Y3QgbXRrX2RzaSAqaG9zdF90b19kc2koc3Ry dWN0IG1pcGlfZHNpX2hvc3QgKmgpCj4gIHsKPiAgCXJldHVybiBjb250YWluZXJfb2YoaCwgc3Ry dWN0IG10a19kc2ksIGhvc3QpOwo+IEBAIC02MDMsMTYgKzU5Nyw3IEBAIHN0YXRpYyBpbnQgbXRr X2RzaV9wb3dlcm9uKHN0cnVjdCBtdGtfZHNpICpkc2kpCj4gIAltdGtfZHNpX2xhbmUwX3VscF9t b2RlX2xlYXZlKGRzaSk7Cj4gIAltdGtfZHNpX2Nsa19oc19tb2RlKGRzaSwgMCk7Cj4gIAo+IC0J aWYgKGRzaS0+cGFuZWwpIHsKPiAtCQlpZiAoZHJtX3BhbmVsX3ByZXBhcmUoZHNpLT5wYW5lbCkp IHsKPiAtCQkJRFJNX0VSUk9SKCJmYWlsZWQgdG8gcHJlcGFyZSB0aGUgcGFuZWxcbiIpOwo+IC0J CQlnb3RvIGVycl9kaXNhYmxlX2RpZ2l0YWxfY2xrOwo+IC0JCX0KPiAtCX0KPiAtCj4gIAlyZXR1 cm4gMDsKPiAtZXJyX2Rpc2FibGVfZGlnaXRhbF9jbGs6Cj4gLQljbGtfZGlzYWJsZV91bnByZXBh cmUoZHNpLT5kaWdpdGFsX2Nsayk7Cj4gIGVycl9kaXNhYmxlX2VuZ2luZV9jbGs6Cj4gIAljbGtf ZGlzYWJsZV91bnByZXBhcmUoZHNpLT5lbmdpbmVfY2xrKTsKPiAgZXJyX3BoeV9wb3dlcl9vZmY6 Cj4gQEAgLTYzMCwxNSArNjE1LDcgQEAgc3RhdGljIHZvaWQgbXRrX2RzaV9wb3dlcm9mZihzdHJ1 Y3QgbXRrX2RzaSAqZHNpKQo+ICAJaWYgKC0tZHNpLT5yZWZjb3VudCAhPSAwKQo+ICAJCXJldHVy bjsKPiAgCj4gLQlpZiAoIW10a19kc2lfc3dpdGNoX3RvX2NtZF9tb2RlKGRzaSwgVk1fRE9ORV9J TlRfRkxBRywgNTAwKSkgewo+IC0JCWlmIChkc2ktPnBhbmVsKSB7Cj4gLQkJCWlmIChkcm1fcGFu ZWxfdW5wcmVwYXJlKGRzaS0+cGFuZWwpKSB7Cj4gLQkJCQlEUk1fRVJST1IoImZhaWxlZCB0byB1 bnByZXBhcmUgdGhlIHBhbmVsXG4iKTsKPiAtCQkJCXJldHVybjsKPiAtCQkJfQo+IC0JCX0KPiAt CX0KPiAtCj4gKwltdGtfZHNpX3N3aXRjaF90b19jbWRfbW9kZShkc2ksIFZNX0RPTkVfSU5UX0ZM QUcsIDUwMCk7Cj4gIAltdGtfZHNpX3Jlc2V0X2VuZ2luZShkc2kpOwo+ICAJbXRrX2RzaV9sYW5l MF91bHBfbW9kZV9lbnRlcihkc2kpOwo+ICAJbXRrX2RzaV9jbGtfdWxwX21vZGVfZW50ZXIoZHNp KTsKPiBAQCAtNjY5LDE5ICs2NDYsOSBAQCBzdGF0aWMgdm9pZCBtdGtfb3V0cHV0X2RzaV9lbmFi bGUoc3RydWN0IG10a19kc2kgKmRzaSkKPiAgCj4gIAltdGtfZHNpX3N0YXJ0KGRzaSk7Cj4gIAo+ IC0JaWYgKGRzaS0+cGFuZWwpIHsKPiAtCQlpZiAoZHJtX3BhbmVsX2VuYWJsZShkc2ktPnBhbmVs KSkgewo+IC0JCQlEUk1fRVJST1IoImZhaWxlZCB0byBlbmFibGUgdGhlIHBhbmVsXG4iKTsKPiAt CQkJZ290byBlcnJfZHNpX3Bvd2VyX29mZjsKPiAtCQl9Cj4gLQl9Cj4gLQo+ICAJZHNpLT5lbmFi bGVkID0gdHJ1ZTsKPiAgCj4gIAlyZXR1cm47Cj4gLWVycl9kc2lfcG93ZXJfb2ZmOgo+IC0JbXRr X2RzaV9zdG9wKGRzaSk7Cj4gLQltdGtfZHNpX3Bvd2Vyb2ZmKGRzaSk7Cj4gIH0KPiAgCj4gIHN0 YXRpYyB2b2lkIG10a19vdXRwdXRfZHNpX2Rpc2FibGUoc3RydWN0IG10a19kc2kgKmRzaSkKPiBA QCAtNjg5LDEzICs2NTYsNiBAQCBzdGF0aWMgdm9pZCBtdGtfb3V0cHV0X2RzaV9kaXNhYmxlKHN0 cnVjdCBtdGtfZHNpICpkc2kpCj4gIAlpZiAoIWRzaS0+ZW5hYmxlZCkKPiAgCQlyZXR1cm47Cj4g IAo+IC0JaWYgKGRzaS0+cGFuZWwpIHsKPiAtCQlpZiAoZHJtX3BhbmVsX2Rpc2FibGUoZHNpLT5w YW5lbCkpIHsKPiAtCQkJRFJNX0VSUk9SKCJmYWlsZWQgdG8gZGlzYWJsZSB0aGUgcGFuZWxcbiIp Owo+IC0JCQlyZXR1cm47Cj4gLQkJfQo+IC0JfQo+IC0KPiAgCW10a19kc2lfc3RvcChkc2kpOwo+ ICAJbXRrX2RzaV9wb3dlcm9mZihkc2kpOwo+ICAKPiBAQCAtNzUwLDEzICs3MTAsNiBAQCBzdGF0 aWMgdm9pZCBtdGtfZHNpX2VuY29kZXJfZW5hYmxlKHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2Rl cikKPiAgCW10a19vdXRwdXRfZHNpX2VuYWJsZShkc2kpOwo+ICB9Cj4gIAo+IC1zdGF0aWMgaW50 IG10a19kc2lfY29ubmVjdG9yX2dldF9tb2RlcyhzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVj dG9yKQo+IC17Cj4gLQlzdHJ1Y3QgbXRrX2RzaSAqZHNpID0gY29ubmVjdG9yX3RvX2RzaShjb25u ZWN0b3IpOwo+IC0KPiAtCXJldHVybiBkcm1fcGFuZWxfZ2V0X21vZGVzKGRzaS0+cGFuZWwpOwo+ IC19Cj4gLQo+ICBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9lbmNvZGVyX2hlbHBlcl9mdW5jcyBt dGtfZHNpX2VuY29kZXJfaGVscGVyX2Z1bmNzID0gewo+ICAJLm1vZGVfZml4dXAgPSBtdGtfZHNp X2VuY29kZXJfbW9kZV9maXh1cCwKPiAgCS5tb2RlX3NldCA9IG10a19kc2lfZW5jb2Rlcl9tb2Rl X3NldCwKPiBAQCAtNzY0LDUyICs3MTcsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9lbmNv ZGVyX2hlbHBlcl9mdW5jcyBtdGtfZHNpX2VuY29kZXJfaGVscGVyX2Z1bmNzID0gewo+ICAJLmVu YWJsZSA9IG10a19kc2lfZW5jb2Rlcl9lbmFibGUsCj4gIH07Cj4gIAo+IC1zdGF0aWMgY29uc3Qg c3RydWN0IGRybV9jb25uZWN0b3JfZnVuY3MgbXRrX2RzaV9jb25uZWN0b3JfZnVuY3MgPSB7Cj4g LQkuZHBtcyA9IGRybV9hdG9taWNfaGVscGVyX2Nvbm5lY3Rvcl9kcG1zLAo+IC0JLmZpbGxfbW9k ZXMgPSBkcm1faGVscGVyX3Byb2JlX3NpbmdsZV9jb25uZWN0b3JfbW9kZXMsCj4gLQkuZGVzdHJv eSA9IGRybV9jb25uZWN0b3JfY2xlYW51cCwKPiAtCS5yZXNldCA9IGRybV9hdG9taWNfaGVscGVy X2Nvbm5lY3Rvcl9yZXNldCwKPiAtCS5hdG9taWNfZHVwbGljYXRlX3N0YXRlID0gZHJtX2F0b21p Y19oZWxwZXJfY29ubmVjdG9yX2R1cGxpY2F0ZV9zdGF0ZSwKPiAtCS5hdG9taWNfZGVzdHJveV9z dGF0ZSA9IGRybV9hdG9taWNfaGVscGVyX2Nvbm5lY3Rvcl9kZXN0cm95X3N0YXRlLAo+IC19Owo+ IC0KPiAtc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fY29ubmVjdG9yX2hlbHBlcl9mdW5jcwo+IC0J bXRrX2RzaV9jb25uZWN0b3JfaGVscGVyX2Z1bmNzID0gewo+IC0JLmdldF9tb2RlcyA9IG10a19k c2lfY29ubmVjdG9yX2dldF9tb2RlcywKPiAtfTsKPiAtCj4gLXN0YXRpYyBpbnQgbXRrX2RzaV9j cmVhdGVfY29ubmVjdG9yKHN0cnVjdCBkcm1fZGV2aWNlICpkcm0sIHN0cnVjdCBtdGtfZHNpICpk c2kpCj4gLXsKPiAtCWludCByZXQ7Cj4gLQo+IC0JcmV0ID0gZHJtX2Nvbm5lY3Rvcl9pbml0KGRy bSwgJmRzaS0+Y29ubiwgJm10a19kc2lfY29ubmVjdG9yX2Z1bmNzLAo+IC0JCQkJIERSTV9NT0RF X0NPTk5FQ1RPUl9EU0kpOwo+IC0JaWYgKHJldCkgewo+IC0JCURSTV9FUlJPUigiRmFpbGVkIHRv IGNvbm5lY3RvciBpbml0IHRvIGRybVxuIik7Cj4gLQkJcmV0dXJuIHJldDsKPiAtCX0KPiAtCj4g LQlkcm1fY29ubmVjdG9yX2hlbHBlcl9hZGQoJmRzaS0+Y29ubiwgJm10a19kc2lfY29ubmVjdG9y X2hlbHBlcl9mdW5jcyk7Cj4gLQo+IC0JZHNpLT5jb25uLmRwbXMgPSBEUk1fTU9ERV9EUE1TX09G RjsKPiAtCWRybV9tb2RlX2Nvbm5lY3Rvcl9hdHRhY2hfZW5jb2RlcigmZHNpLT5jb25uLCAmZHNp LT5lbmNvZGVyKTsKPiAtCj4gLQlpZiAoZHNpLT5wYW5lbCkgewo+IC0JCXJldCA9IGRybV9wYW5l bF9hdHRhY2goZHNpLT5wYW5lbCwgJmRzaS0+Y29ubik7Cj4gLQkJaWYgKHJldCkgewo+IC0JCQlE Uk1fRVJST1IoIkZhaWxlZCB0byBhdHRhY2ggcGFuZWwgdG8gZHJtXG4iKTsKPiAtCQkJZ290byBl cnJfY29ubmVjdG9yX2NsZWFudXA7Cj4gLQkJfQo+IC0JfQo+IC0KPiAtCXJldHVybiAwOwo+IC0K PiAtZXJyX2Nvbm5lY3Rvcl9jbGVhbnVwOgo+IC0JZHJtX2Nvbm5lY3Rvcl9jbGVhbnVwKCZkc2kt PmNvbm4pOwo+IC0JcmV0dXJuIHJldDsKPiAtfQo+IC0KPiAtc3RhdGljIGludCBtdGtfZHNpX2Ny ZWF0ZV9jb25uX2VuYyhzdHJ1Y3QgZHJtX2RldmljZSAqZHJtLCBzdHJ1Y3QgbXRrX2RzaSAqZHNp KQo+ICtzdGF0aWMgaW50IG10a19kc2lfY3JlYXRlX2VuYyhzdHJ1Y3QgZHJtX2RldmljZSAqZHJt LCBzdHJ1Y3QgbXRrX2RzaSAqZHNpKQo+ICB7Cj4gIAlpbnQgcmV0Owo+ICAKPiBAQCAtODI3LDE1 ICs3MzUsMTAgQEAgc3RhdGljIGludCBtdGtfZHNpX2NyZWF0ZV9jb25uX2VuYyhzdHJ1Y3QgZHJt X2RldmljZSAqZHJtLCBzdHJ1Y3QgbXRrX2RzaSAqZHNpKQo+ICAJICovCj4gIAlkc2ktPmVuY29k ZXIucG9zc2libGVfY3J0Y3MgPSAxOwo+ICAKPiAtCS8qIElmIHRoZXJlJ3MgYSBicmlkZ2UsIGF0 dGFjaCB0byBpdCBhbmQgbGV0IGl0IGNyZWF0ZSB0aGUgY29ubmVjdG9yICovCj4gIAlyZXQgPSBk cm1fYnJpZGdlX2F0dGFjaCgmZHNpLT5lbmNvZGVyLCBkc2ktPmJyaWRnZSwgTlVMTCk7Cj4gIAlp ZiAocmV0KSB7Cj4gIAkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gYXR0YWNoIGJyaWRnZSB0byBkcm1c biIpOwo+IC0KPiAtCQkvKiBPdGhlcndpc2UgY3JlYXRlIG91ciBvd24gY29ubmVjdG9yIGFuZCBh dHRhY2ggdG8gYSBwYW5lbCAqLwo+IC0JCXJldCA9IG10a19kc2lfY3JlYXRlX2Nvbm5lY3Rvcihk cm0sIGRzaSk7Cj4gLQkJaWYgKHJldCkKPiAtCQkJZ290byBlcnJfZW5jb2Rlcl9jbGVhbnVwOwo+ ICsJCWdvdG8gZXJyX2VuY29kZXJfY2xlYW51cDsKPiAgCX0KPiAgCj4gIAlyZXR1cm4gMDsKPiBA QCAtODQ4LDkgKzc1MSw4IEBAIHN0YXRpYyBpbnQgbXRrX2RzaV9jcmVhdGVfY29ubl9lbmMoc3Ry dWN0IGRybV9kZXZpY2UgKmRybSwgc3RydWN0IG10a19kc2kgKmRzaSkKPiAgc3RhdGljIHZvaWQg bXRrX2RzaV9kZXN0cm95X2Nvbm5fZW5jKHN0cnVjdCBtdGtfZHNpICpkc2kpCj4gIHsKPiAgCWRy bV9lbmNvZGVyX2NsZWFudXAoJmRzaS0+ZW5jb2Rlcik7Cj4gLQkvKiBTa2lwIGNvbm5lY3RvciBj bGVhbnVwIGlmIGNyZWF0aW9uIHdhcyBkZWxlZ2F0ZWQgdG8gdGhlIGJyaWRnZSAqLwo+IC0JaWYg KGRzaS0+Y29ubi5kZXYpCj4gLQkJZHJtX2Nvbm5lY3Rvcl9jbGVhbnVwKCZkc2ktPmNvbm4pOwo+ ICsJaWYgKGRzaS0+cGFuZWwpCj4gKwkJZHJtX3BhbmVsX2JyaWRnZV9yZW1vdmUoZHNpLT5icmlk Z2UpOwo+ICB9Cj4gIAo+ICBzdGF0aWMgdm9pZCBtdGtfZHNpX2RkcF9zdGFydChzdHJ1Y3QgbXRr X2RkcF9jb21wICpjb21wKQo+IEBAIC04ODEsMjAgKzc4MywxMiBAQCBzdGF0aWMgaW50IG10a19k c2lfaG9zdF9hdHRhY2goc3RydWN0IG1pcGlfZHNpX2hvc3QgKmhvc3QsCj4gIAlkc2ktPmZvcm1h dCA9IGRldmljZS0+Zm9ybWF0Owo+ICAJZHNpLT5tb2RlX2ZsYWdzID0gZGV2aWNlLT5tb2RlX2Zs YWdzOwo+ICAKPiAtCWlmIChkc2ktPmNvbm4uZGV2KQo+IC0JCWRybV9oZWxwZXJfaHBkX2lycV9l dmVudChkc2ktPmNvbm4uZGV2KTsKPiAtCj4gIAlyZXR1cm4gMDsKPiAgfQo+ICAKPiAgc3RhdGlj IGludCBtdGtfZHNpX2hvc3RfZGV0YWNoKHN0cnVjdCBtaXBpX2RzaV9ob3N0ICpob3N0LAo+ICAJ CQkgICAgICAgc3RydWN0IG1pcGlfZHNpX2RldmljZSAqZGV2aWNlKQo+ICB7Cj4gLQlzdHJ1Y3Qg bXRrX2RzaSAqZHNpID0gaG9zdF90b19kc2koaG9zdCk7Cj4gLQo+IC0JaWYgKGRzaS0+Y29ubi5k ZXYpCj4gLQkJZHJtX2hlbHBlcl9ocGRfaXJxX2V2ZW50KGRzaS0+Y29ubi5kZXYpOwo+IC0KPiAg CXJldHVybiAwOwo+ICB9Cj4gIAo+IEBAIC0xMDYyLDcgKzk1Niw3IEBAIHN0YXRpYyBpbnQgbXRr X2RzaV9iaW5kKHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRldmljZSAqbWFzdGVyLCB2b2lk ICpkYXRhKQo+ICAJCWdvdG8gZXJyX2RkcF9jb21wX3VucmVnaXN0ZXI7Cj4gIAl9Cj4gIAo+IC0J cmV0ID0gbXRrX2RzaV9jcmVhdGVfY29ubl9lbmMoZHJtLCBkc2kpOwo+ICsJcmV0ID0gbXRrX2Rz aV9jcmVhdGVfZW5jKGRybSwgZHNpKTsKPiAgCWlmIChyZXQpIHsKPiAgCQlEUk1fRVJST1IoIkVu Y29kZXIgY3JlYXRlIGZhaWxlZCB3aXRoICVkXG4iLCByZXQpOwo+ICAJCWdvdG8gZXJyX3VucmVn aXN0ZXI7Cj4gQEAgLTExMTQsNiArMTAwOCwxMyBAQCBzdGF0aWMgaW50IG10a19kc2lfcHJvYmUo c3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKPiAgCWlmIChyZXQpCj4gIAkJcmV0dXJuIHJl dDsKPiAgCj4gKwlpZiAoZHNpLT5wYW5lbCkgewo+ICsJCWRzaS0+YnJpZGdlID0gZHJtX3BhbmVs X2JyaWRnZV9hZGQoZHNpLT5wYW5lbCwKPiArCQkJCQkJICAgRFJNX01PREVfQ09OTkVDVE9SX0RT SSk7Cj4gKwkJaWYgKElTX0VSUihkc2ktPmJyaWRnZSkpCj4gKwkJCXJldHVybiBQVFJfRVJSKGRz aS0+YnJpZGdlKTsKPiArCX0KPiArCj4gIAlkc2ktPmVuZ2luZV9jbGsgPSBkZXZtX2Nsa19nZXQo ZGV2LCAiZW5naW5lIik7Cj4gIAlpZiAoSVNfRVJSKGRzaS0+ZW5naW5lX2NsaykpIHsKPiAgCQly ZXQgPSBQVFJfRVJSKGRzaS0+ZW5naW5lX2Nsayk7CgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9kcmktZGV2ZWwK