From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752184AbcHIGHB (ORCPT ); Tue, 9 Aug 2016 02:07:01 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:36305 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751038AbcHIGG4 (ORCPT ); Tue, 9 Aug 2016 02:06:56 -0400 Date: Tue, 9 Aug 2016 08:05:59 +0200 From: Daniel Vetter To: Yakir Yang Cc: Sean Paul , k.kozlowski@samsung.com, linux-samsung-soc@vger.kernel.org, linux-rockchip@lists.infradead.org, yzq@rock-chips.com, jingoohan1@gmail.com, emil.l.velikov@gmail.com, dianders@chromium.org, dri-devel@lists.freedesktop.org, tfiga@chromium.org, javier@osg.samsung.com, daniel.vetter@ffwll.ch, marcheu@chromium.org, treding@nvidia.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] drm/bridge: analogix_dp: Ensure the panel is properly prepared/unprepared Message-ID: <20160809060559.GC6232@phenom.ffwll.local> Mail-Followup-To: Yakir Yang , Sean Paul , k.kozlowski@samsung.com, linux-samsung-soc@vger.kernel.org, linux-rockchip@lists.infradead.org, yzq@rock-chips.com, jingoohan1@gmail.com, emil.l.velikov@gmail.com, dianders@chromium.org, dri-devel@lists.freedesktop.org, tfiga@chromium.org, javier@osg.samsung.com, marcheu@chromium.org, treding@nvidia.com, linux-kernel@vger.kernel.org References: <1469819791-31860-1-git-send-email-seanpaul@chromium.org> <1470682398-18982-1-git-send-email-seanpaul@chromium.org> <977b849f-17c9-22c5-7534-6cb1b43ee3d2@rock-chips.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <977b849f-17c9-22c5-7534-6cb1b43ee3d2@rock-chips.com> X-Operating-System: Linux phenom 4.6.0-1-amd64 User-Agent: Mutt/1.6.0 (2016-04-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Aug 09, 2016 at 10:35:57AM +0800, Yakir Yang wrote: > + Archit > > > On 08/09/2016 02:53 AM, Sean Paul wrote: > > Instead of just preparing the panel on bind, actually prepare/unprepare > > during modeset/disable. The panel must be prepared in order to read hpd > > status and edid, so we need to keep state around the prepares in order > > to ensure we don't accidentally turn the panel off at the wrong time. > > > > Signed-off-by: Sean Paul > > Reviewed-by: Yakir Yang > > And I also tested this patch on RK3399 Kevin board, panel works rightly, so: > Tested-by: Yakir Yang > > Also add Archit into CC list, guess this patch should go through his > drm_bridge's tree. drm_bridge stuff moved to -misc ;-) -Daniel > > Thanks, > - Yakir > > > --- > > > > Changes in v2: > > - Added panel_is_modeset state/lock to avoid racing detect with modeset (marcheu) > > - Added prepare/unprepare in .get_modes (yakir) > > > > drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 101 ++++++++++++++++++--- > > drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 3 + > > 2 files changed, 93 insertions(+), 11 deletions(-) > > > > diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > > index 32715da..47c449a 100644 > > --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > > +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > > @@ -923,11 +923,63 @@ static void analogix_dp_commit(struct analogix_dp_device *dp) > > analogix_dp_start_video(dp); > > } > > +/* > > + * This function is a bit of a catch-all for panel preparation, hopefully > > + * simplifying the logic of functions that need to prepare/unprepare the panel > > + * below. > > + * > > + * If @prepare is true, this function will prepare the panel. Conversely, if it > > + * is false, the panel will be unprepared. > > + * > > + * If @is_modeset_prepare is true, the function will disregard the current state > > + * of the panel and either prepare/unprepare the panel based on @prepare. Once > > + * it finishes, it will update dp->panel_is_modeset to reflect the current state > > + * of the panel. > > + */ > > +static int analogix_dp_prepare_panel(struct analogix_dp_device *dp, > > + bool prepare, bool is_modeset_prepare) > > +{ > > + int ret = 0; > > + > > + if (!dp->plat_data->panel) > > + return 0; > > + > > + mutex_lock(&dp->panel_lock); > > + > > + /* > > + * Exit early if this is a temporary prepare/unprepare and we're already > > + * modeset (since we neither want to prepare twice or unprepare early). > > + */ > > + if (dp->panel_is_modeset && !is_modeset_prepare) > > + goto out; > > + > > + if (prepare) > > + ret = drm_panel_prepare(dp->plat_data->panel); > > + else > > + ret = drm_panel_unprepare(dp->plat_data->panel); > > + > > + if (ret) > > + goto out; > > + > > + if (is_modeset_prepare) > > + dp->panel_is_modeset = prepare; > > + > > +out: > > + mutex_unlock(&dp->panel_lock); > > + return ret; > > +} > > + > > int analogix_dp_get_modes(struct drm_connector *connector) > > { > > struct analogix_dp_device *dp = to_dp(connector); > > struct edid *edid = (struct edid *)dp->edid; > > - int num_modes = 0; > > + int ret, num_modes = 0; > > + > > + ret = analogix_dp_prepare_panel(dp, true, false); > > + if (ret) { > > + DRM_ERROR("Failed to prepare panel (%d)\n", ret); > > + return 0; > > + } > > if (analogix_dp_handle_edid(dp) == 0) { > > drm_mode_connector_update_edid_property(&dp->connector, edid); > > @@ -940,6 +992,10 @@ int analogix_dp_get_modes(struct drm_connector *connector) > > if (dp->plat_data->get_modes) > > num_modes += dp->plat_data->get_modes(dp->plat_data, connector); > > + ret = analogix_dp_prepare_panel(dp, false, false); > > + if (ret) > > + DRM_ERROR("Failed to unprepare panel (%d)\n", ret); > > + > > return num_modes; > > } > > @@ -960,11 +1016,23 @@ enum drm_connector_status > > analogix_dp_detect(struct drm_connector *connector, bool force) > > { > > struct analogix_dp_device *dp = to_dp(connector); > > + enum drm_connector_status status = connector_status_disconnected; > > + int ret; > > - if (analogix_dp_detect_hpd(dp)) > > + ret = analogix_dp_prepare_panel(dp, true, false); > > + if (ret) { > > + DRM_ERROR("Failed to prepare panel (%d)\n", ret); > > return connector_status_disconnected; > > + } > > + > > + if (!analogix_dp_detect_hpd(dp)) > > + status = connector_status_connected; > > - return connector_status_connected; > > + ret = analogix_dp_prepare_panel(dp, false, false); > > + if (ret) > > + DRM_ERROR("Failed to unprepare panel (%d)\n", ret); > > + > > + return status; > > } > > static void analogix_dp_connector_destroy(struct drm_connector *connector) > > @@ -1035,6 +1103,16 @@ static int analogix_dp_bridge_attach(struct drm_bridge *bridge) > > return 0; > > } > > +static void analogix_dp_bridge_pre_enable(struct drm_bridge *bridge) > > +{ > > + struct analogix_dp_device *dp = bridge->driver_private; > > + int ret; > > + > > + ret = analogix_dp_prepare_panel(dp, true, true); > > + if (ret) > > + DRM_ERROR("failed to setup the panel ret = %d\n", ret); > > +} > > + > > static void analogix_dp_bridge_enable(struct drm_bridge *bridge) > > { > > struct analogix_dp_device *dp = bridge->driver_private; > > @@ -1058,6 +1136,7 @@ static void analogix_dp_bridge_enable(struct drm_bridge *bridge) > > static void analogix_dp_bridge_disable(struct drm_bridge *bridge) > > { > > struct analogix_dp_device *dp = bridge->driver_private; > > + int ret; > > if (dp->dpms_mode != DRM_MODE_DPMS_ON) > > return; > > @@ -1077,6 +1156,10 @@ static void analogix_dp_bridge_disable(struct drm_bridge *bridge) > > pm_runtime_put_sync(dp->dev); > > + ret = analogix_dp_prepare_panel(dp, false, true); > > + if (ret) > > + DRM_ERROR("failed to setup the panel ret = %d\n", ret); > > + > > dp->dpms_mode = DRM_MODE_DPMS_OFF; > > } > > @@ -1165,9 +1248,9 @@ static void analogix_dp_bridge_nop(struct drm_bridge *bridge) > > } > > static const struct drm_bridge_funcs analogix_dp_bridge_funcs = { > > + .pre_enable = analogix_dp_bridge_pre_enable, > > .enable = analogix_dp_bridge_enable, > > .disable = analogix_dp_bridge_disable, > > - .pre_enable = analogix_dp_bridge_nop, > > .post_disable = analogix_dp_bridge_nop, > > .mode_set = analogix_dp_bridge_mode_set, > > .attach = analogix_dp_bridge_attach, > > @@ -1254,6 +1337,9 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, > > dp->dev = &pdev->dev; > > dp->dpms_mode = DRM_MODE_DPMS_OFF; > > + mutex_init(&dp->panel_lock); > > + dp->panel_is_modeset = false; > > + > > /* > > * platform dp driver need containor_of the plat_data to get > > * the driver private data, so we need to store the point of > > @@ -1333,13 +1419,6 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, > > phy_power_on(dp->phy); > > - if (dp->plat_data->panel) { > > - if (drm_panel_prepare(dp->plat_data->panel)) { > > - DRM_ERROR("failed to setup the panel\n"); > > - return -EBUSY; > > - } > > - } > > - > > analogix_dp_init_dp(dp); > > ret = devm_request_threaded_irq(&pdev->dev, dp->irq, > > diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h > > index b456380..43108d7 100644 > > --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h > > +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h > > @@ -178,6 +178,9 @@ struct analogix_dp_device { > > bool force_hpd; > > unsigned char edid[EDID_BLOCK_LENGTH * 2]; > > + struct mutex panel_lock; > > + bool panel_is_modeset; > > + > > struct analogix_dp_plat_data *plat_data; > > }; > > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH v2] drm/bridge: analogix_dp: Ensure the panel is properly prepared/unprepared Date: Tue, 9 Aug 2016 08:05:59 +0200 Message-ID: <20160809060559.GC6232@phenom.ffwll.local> References: <1469819791-31860-1-git-send-email-seanpaul@chromium.org> <1470682398-18982-1-git-send-email-seanpaul@chromium.org> <977b849f-17c9-22c5-7534-6cb1b43ee3d2@rock-chips.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <977b849f-17c9-22c5-7534-6cb1b43ee3d2@rock-chips.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Yakir Yang Cc: k.kozlowski@samsung.com, linux-samsung-soc@vger.kernel.org, javier@osg.samsung.com, yzq@rock-chips.com, jingoohan1@gmail.com, emil.l.velikov@gmail.com, dianders@chromium.org, dri-devel@lists.freedesktop.org, tfiga@chromium.org, linux-rockchip@lists.infradead.org, daniel.vetter@ffwll.ch, marcheu@chromium.org, treding@nvidia.com, linux-kernel@vger.kernel.org List-Id: linux-samsung-soc@vger.kernel.org T24gVHVlLCBBdWcgMDksIDIwMTYgYXQgMTA6MzU6NTdBTSArMDgwMCwgWWFraXIgWWFuZyB3cm90 ZToKPiArIEFyY2hpdAo+IAo+IAo+IE9uIDA4LzA5LzIwMTYgMDI6NTMgQU0sIFNlYW4gUGF1bCB3 cm90ZToKPiA+IEluc3RlYWQgb2YganVzdCBwcmVwYXJpbmcgdGhlIHBhbmVsIG9uIGJpbmQsIGFj dHVhbGx5IHByZXBhcmUvdW5wcmVwYXJlCj4gPiBkdXJpbmcgbW9kZXNldC9kaXNhYmxlLiBUaGUg cGFuZWwgbXVzdCBiZSBwcmVwYXJlZCBpbiBvcmRlciB0byByZWFkIGhwZAo+ID4gc3RhdHVzIGFu ZCBlZGlkLCBzbyB3ZSBuZWVkIHRvIGtlZXAgc3RhdGUgYXJvdW5kIHRoZSBwcmVwYXJlcyBpbiBv cmRlcgo+ID4gdG8gZW5zdXJlIHdlIGRvbid0IGFjY2lkZW50YWxseSB0dXJuIHRoZSBwYW5lbCBv ZmYgYXQgdGhlIHdyb25nIHRpbWUuCj4gPiAKPiA+IFNpZ25lZC1vZmYtYnk6IFNlYW4gUGF1bCA8 c2VhbnBhdWxAY2hyb21pdW0ub3JnPgo+IAo+IFJldmlld2VkLWJ5OiBZYWtpciBZYW5nIDx5a2tA cm9jay1jaGlwcy5jb20+Cj4gCj4gQW5kIEkgYWxzbyB0ZXN0ZWQgdGhpcyBwYXRjaCBvbiBSSzMz OTkgS2V2aW4gYm9hcmQsIHBhbmVsIHdvcmtzIHJpZ2h0bHksIHNvOgo+IFRlc3RlZC1ieTogWWFr aXIgWWFuZyA8eWtrQHJvY2stY2hpcHMuY29tPgo+IAo+IEFsc28gYWRkIEFyY2hpdCBpbnRvIEND IGxpc3QsIGd1ZXNzIHRoaXMgcGF0Y2ggc2hvdWxkIGdvIHRocm91Z2ggaGlzCj4gZHJtX2JyaWRn ZSdzIHRyZWUuCgpkcm1fYnJpZGdlIHN0dWZmIG1vdmVkIHRvIC1taXNjIDstKQotRGFuaWVsCgo+ IAo+IFRoYW5rcywKPiAtIFlha2lyCj4gCj4gPiAtLS0KPiA+IAo+ID4gQ2hhbmdlcyBpbiB2MjoK PiA+ICAgLSBBZGRlZCBwYW5lbF9pc19tb2Rlc2V0IHN0YXRlL2xvY2sgdG8gYXZvaWQgcmFjaW5n IGRldGVjdCB3aXRoIG1vZGVzZXQgKG1hcmNoZXUpCj4gPiAgIC0gQWRkZWQgcHJlcGFyZS91bnBy ZXBhcmUgaW4gLmdldF9tb2RlcyAoeWFraXIpCj4gPiAKPiA+ICAgZHJpdmVycy9ncHUvZHJtL2Jy aWRnZS9hbmFsb2dpeC9hbmFsb2dpeF9kcF9jb3JlLmMgfCAxMDEgKysrKysrKysrKysrKysrKysr LS0tCj4gPiAgIGRyaXZlcnMvZ3B1L2RybS9icmlkZ2UvYW5hbG9naXgvYW5hbG9naXhfZHBfY29y ZS5oIHwgICAzICsKPiA+ICAgMiBmaWxlcyBjaGFuZ2VkLCA5MyBpbnNlcnRpb25zKCspLCAxMSBk ZWxldGlvbnMoLSkKPiA+IAo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9icmlkZ2Uv YW5hbG9naXgvYW5hbG9naXhfZHBfY29yZS5jIGIvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9hbmFs b2dpeC9hbmFsb2dpeF9kcF9jb3JlLmMKPiA+IGluZGV4IDMyNzE1ZGEuLjQ3YzQ0OWEgMTAwNjQ0 Cj4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vYnJpZGdlL2FuYWxvZ2l4L2FuYWxvZ2l4X2RwX2Nv cmUuYwo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9hbmFsb2dpeC9hbmFsb2dpeF9k cF9jb3JlLmMKPiA+IEBAIC05MjMsMTEgKzkyMyw2MyBAQCBzdGF0aWMgdm9pZCBhbmFsb2dpeF9k cF9jb21taXQoc3RydWN0IGFuYWxvZ2l4X2RwX2RldmljZSAqZHApCj4gPiAgIAlhbmFsb2dpeF9k cF9zdGFydF92aWRlbyhkcCk7Cj4gPiAgIH0KPiA+ICsvKgo+ID4gKyAqIFRoaXMgZnVuY3Rpb24g aXMgYSBiaXQgb2YgYSBjYXRjaC1hbGwgZm9yIHBhbmVsIHByZXBhcmF0aW9uLCBob3BlZnVsbHkK PiA+ICsgKiBzaW1wbGlmeWluZyB0aGUgbG9naWMgb2YgZnVuY3Rpb25zIHRoYXQgbmVlZCB0byBw cmVwYXJlL3VucHJlcGFyZSB0aGUgcGFuZWwKPiA+ICsgKiBiZWxvdy4KPiA+ICsgKgo+ID4gKyAq IElmIEBwcmVwYXJlIGlzIHRydWUsIHRoaXMgZnVuY3Rpb24gd2lsbCBwcmVwYXJlIHRoZSBwYW5l bC4gQ29udmVyc2VseSwgaWYgaXQKPiA+ICsgKiBpcyBmYWxzZSwgdGhlIHBhbmVsIHdpbGwgYmUg dW5wcmVwYXJlZC4KPiA+ICsgKgo+ID4gKyAqIElmIEBpc19tb2Rlc2V0X3ByZXBhcmUgaXMgdHJ1 ZSwgdGhlIGZ1bmN0aW9uIHdpbGwgZGlzcmVnYXJkIHRoZSBjdXJyZW50IHN0YXRlCj4gPiArICog b2YgdGhlIHBhbmVsIGFuZCBlaXRoZXIgcHJlcGFyZS91bnByZXBhcmUgdGhlIHBhbmVsIGJhc2Vk IG9uIEBwcmVwYXJlLiBPbmNlCj4gPiArICogaXQgZmluaXNoZXMsIGl0IHdpbGwgdXBkYXRlIGRw LT5wYW5lbF9pc19tb2Rlc2V0IHRvIHJlZmxlY3QgdGhlIGN1cnJlbnQgc3RhdGUKPiA+ICsgKiBv ZiB0aGUgcGFuZWwuCj4gPiArICovCj4gPiArc3RhdGljIGludCBhbmFsb2dpeF9kcF9wcmVwYXJl X3BhbmVsKHN0cnVjdCBhbmFsb2dpeF9kcF9kZXZpY2UgKmRwLAo+ID4gKwkJCQkgICAgIGJvb2wg cHJlcGFyZSwgYm9vbCBpc19tb2Rlc2V0X3ByZXBhcmUpCj4gPiArewo+ID4gKwlpbnQgcmV0ID0g MDsKPiA+ICsKPiA+ICsJaWYgKCFkcC0+cGxhdF9kYXRhLT5wYW5lbCkKPiA+ICsJCXJldHVybiAw Owo+ID4gKwo+ID4gKwltdXRleF9sb2NrKCZkcC0+cGFuZWxfbG9jayk7Cj4gPiArCj4gPiArCS8q Cj4gPiArCSAqIEV4aXQgZWFybHkgaWYgdGhpcyBpcyBhIHRlbXBvcmFyeSBwcmVwYXJlL3VucHJl cGFyZSBhbmQgd2UncmUgYWxyZWFkeQo+ID4gKwkgKiBtb2Rlc2V0IChzaW5jZSB3ZSBuZWl0aGVy IHdhbnQgdG8gcHJlcGFyZSB0d2ljZSBvciB1bnByZXBhcmUgZWFybHkpLgo+ID4gKwkgKi8KPiA+ ICsJaWYgKGRwLT5wYW5lbF9pc19tb2Rlc2V0ICYmICFpc19tb2Rlc2V0X3ByZXBhcmUpCj4gPiAr CQlnb3RvIG91dDsKPiA+ICsKPiA+ICsJaWYgKHByZXBhcmUpCj4gPiArCQlyZXQgPSBkcm1fcGFu ZWxfcHJlcGFyZShkcC0+cGxhdF9kYXRhLT5wYW5lbCk7Cj4gPiArCWVsc2UKPiA+ICsJCXJldCA9 IGRybV9wYW5lbF91bnByZXBhcmUoZHAtPnBsYXRfZGF0YS0+cGFuZWwpOwo+ID4gKwo+ID4gKwlp ZiAocmV0KQo+ID4gKwkJZ290byBvdXQ7Cj4gPiArCj4gPiArCWlmIChpc19tb2Rlc2V0X3ByZXBh cmUpCj4gPiArCQlkcC0+cGFuZWxfaXNfbW9kZXNldCA9IHByZXBhcmU7Cj4gPiArCj4gPiArb3V0 Ogo+ID4gKwltdXRleF91bmxvY2soJmRwLT5wYW5lbF9sb2NrKTsKPiA+ICsJcmV0dXJuIHJldDsK PiA+ICt9Cj4gPiArCj4gPiAgIGludCBhbmFsb2dpeF9kcF9nZXRfbW9kZXMoc3RydWN0IGRybV9j b25uZWN0b3IgKmNvbm5lY3RvcikKPiA+ICAgewo+ID4gICAJc3RydWN0IGFuYWxvZ2l4X2RwX2Rl dmljZSAqZHAgPSB0b19kcChjb25uZWN0b3IpOwo+ID4gICAJc3RydWN0IGVkaWQgKmVkaWQgPSAo c3RydWN0IGVkaWQgKilkcC0+ZWRpZDsKPiA+IC0JaW50IG51bV9tb2RlcyA9IDA7Cj4gPiArCWlu dCByZXQsIG51bV9tb2RlcyA9IDA7Cj4gPiArCj4gPiArCXJldCA9IGFuYWxvZ2l4X2RwX3ByZXBh cmVfcGFuZWwoZHAsIHRydWUsIGZhbHNlKTsKPiA+ICsJaWYgKHJldCkgewo+ID4gKwkJRFJNX0VS Uk9SKCJGYWlsZWQgdG8gcHJlcGFyZSBwYW5lbCAoJWQpXG4iLCByZXQpOwo+ID4gKwkJcmV0dXJu IDA7Cj4gPiArCX0KPiA+ICAgCWlmIChhbmFsb2dpeF9kcF9oYW5kbGVfZWRpZChkcCkgPT0gMCkg ewo+ID4gICAJCWRybV9tb2RlX2Nvbm5lY3Rvcl91cGRhdGVfZWRpZF9wcm9wZXJ0eSgmZHAtPmNv bm5lY3RvciwgZWRpZCk7Cj4gPiBAQCAtOTQwLDYgKzk5MiwxMCBAQCBpbnQgYW5hbG9naXhfZHBf Z2V0X21vZGVzKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCj4gPiAgIAlpZiAoZHAt PnBsYXRfZGF0YS0+Z2V0X21vZGVzKQo+ID4gICAJCW51bV9tb2RlcyArPSBkcC0+cGxhdF9kYXRh LT5nZXRfbW9kZXMoZHAtPnBsYXRfZGF0YSwgY29ubmVjdG9yKTsKPiA+ICsJcmV0ID0gYW5hbG9n aXhfZHBfcHJlcGFyZV9wYW5lbChkcCwgZmFsc2UsIGZhbHNlKTsKPiA+ICsJaWYgKHJldCkKPiA+ ICsJCURSTV9FUlJPUigiRmFpbGVkIHRvIHVucHJlcGFyZSBwYW5lbCAoJWQpXG4iLCByZXQpOwo+ ID4gKwo+ID4gICAJcmV0dXJuIG51bV9tb2RlczsKPiA+ICAgfQo+ID4gQEAgLTk2MCwxMSArMTAx NiwyMyBAQCBlbnVtIGRybV9jb25uZWN0b3Jfc3RhdHVzCj4gPiAgIGFuYWxvZ2l4X2RwX2RldGVj dChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLCBib29sIGZvcmNlKQo+ID4gICB7Cj4g PiAgIAlzdHJ1Y3QgYW5hbG9naXhfZHBfZGV2aWNlICpkcCA9IHRvX2RwKGNvbm5lY3Rvcik7Cj4g PiArCWVudW0gZHJtX2Nvbm5lY3Rvcl9zdGF0dXMgc3RhdHVzID0gY29ubmVjdG9yX3N0YXR1c19k aXNjb25uZWN0ZWQ7Cj4gPiArCWludCByZXQ7Cj4gPiAtCWlmIChhbmFsb2dpeF9kcF9kZXRlY3Rf aHBkKGRwKSkKPiA+ICsJcmV0ID0gYW5hbG9naXhfZHBfcHJlcGFyZV9wYW5lbChkcCwgdHJ1ZSwg ZmFsc2UpOwo+ID4gKwlpZiAocmV0KSB7Cj4gPiArCQlEUk1fRVJST1IoIkZhaWxlZCB0byBwcmVw YXJlIHBhbmVsICglZClcbiIsIHJldCk7Cj4gPiAgIAkJcmV0dXJuIGNvbm5lY3Rvcl9zdGF0dXNf ZGlzY29ubmVjdGVkOwo+ID4gKwl9Cj4gPiArCj4gPiArCWlmICghYW5hbG9naXhfZHBfZGV0ZWN0 X2hwZChkcCkpCj4gPiArCQlzdGF0dXMgPSBjb25uZWN0b3Jfc3RhdHVzX2Nvbm5lY3RlZDsKPiA+ IC0JcmV0dXJuIGNvbm5lY3Rvcl9zdGF0dXNfY29ubmVjdGVkOwo+ID4gKwlyZXQgPSBhbmFsb2dp eF9kcF9wcmVwYXJlX3BhbmVsKGRwLCBmYWxzZSwgZmFsc2UpOwo+ID4gKwlpZiAocmV0KQo+ID4g KwkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gdW5wcmVwYXJlIHBhbmVsICglZClcbiIsIHJldCk7Cj4g PiArCj4gPiArCXJldHVybiBzdGF0dXM7Cj4gPiAgIH0KPiA+ICAgc3RhdGljIHZvaWQgYW5hbG9n aXhfZHBfY29ubmVjdG9yX2Rlc3Ryb3koc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcikK PiA+IEBAIC0xMDM1LDYgKzExMDMsMTYgQEAgc3RhdGljIGludCBhbmFsb2dpeF9kcF9icmlkZ2Vf YXR0YWNoKHN0cnVjdCBkcm1fYnJpZGdlICpicmlkZ2UpCj4gPiAgIAlyZXR1cm4gMDsKPiA+ICAg fQo+ID4gK3N0YXRpYyB2b2lkIGFuYWxvZ2l4X2RwX2JyaWRnZV9wcmVfZW5hYmxlKHN0cnVjdCBk cm1fYnJpZGdlICpicmlkZ2UpCj4gPiArewo+ID4gKwlzdHJ1Y3QgYW5hbG9naXhfZHBfZGV2aWNl ICpkcCA9IGJyaWRnZS0+ZHJpdmVyX3ByaXZhdGU7Cj4gPiArCWludCByZXQ7Cj4gPiArCj4gPiAr CXJldCA9IGFuYWxvZ2l4X2RwX3ByZXBhcmVfcGFuZWwoZHAsIHRydWUsIHRydWUpOwo+ID4gKwlp ZiAocmV0KQo+ID4gKwkJRFJNX0VSUk9SKCJmYWlsZWQgdG8gc2V0dXAgdGhlIHBhbmVsIHJldCA9 ICVkXG4iLCByZXQpOwo+ID4gK30KPiA+ICsKPiA+ICAgc3RhdGljIHZvaWQgYW5hbG9naXhfZHBf YnJpZGdlX2VuYWJsZShzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJpZGdlKQo+ID4gICB7Cj4gPiAgIAlz dHJ1Y3QgYW5hbG9naXhfZHBfZGV2aWNlICpkcCA9IGJyaWRnZS0+ZHJpdmVyX3ByaXZhdGU7Cj4g PiBAQCAtMTA1OCw2ICsxMTM2LDcgQEAgc3RhdGljIHZvaWQgYW5hbG9naXhfZHBfYnJpZGdlX2Vu YWJsZShzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJpZGdlKQo+ID4gICBzdGF0aWMgdm9pZCBhbmFsb2dp eF9kcF9icmlkZ2VfZGlzYWJsZShzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJpZGdlKQo+ID4gICB7Cj4g PiAgIAlzdHJ1Y3QgYW5hbG9naXhfZHBfZGV2aWNlICpkcCA9IGJyaWRnZS0+ZHJpdmVyX3ByaXZh dGU7Cj4gPiArCWludCByZXQ7Cj4gPiAgIAlpZiAoZHAtPmRwbXNfbW9kZSAhPSBEUk1fTU9ERV9E UE1TX09OKQo+ID4gICAJCXJldHVybjsKPiA+IEBAIC0xMDc3LDYgKzExNTYsMTAgQEAgc3RhdGlj IHZvaWQgYW5hbG9naXhfZHBfYnJpZGdlX2Rpc2FibGUoc3RydWN0IGRybV9icmlkZ2UgKmJyaWRn ZSkKPiA+ICAgCXBtX3J1bnRpbWVfcHV0X3N5bmMoZHAtPmRldik7Cj4gPiArCXJldCA9IGFuYWxv Z2l4X2RwX3ByZXBhcmVfcGFuZWwoZHAsIGZhbHNlLCB0cnVlKTsKPiA+ICsJaWYgKHJldCkKPiA+ ICsJCURSTV9FUlJPUigiZmFpbGVkIHRvIHNldHVwIHRoZSBwYW5lbCByZXQgPSAlZFxuIiwgcmV0 KTsKPiA+ICsKPiA+ICAgCWRwLT5kcG1zX21vZGUgPSBEUk1fTU9ERV9EUE1TX09GRjsKPiA+ICAg fQo+ID4gQEAgLTExNjUsOSArMTI0OCw5IEBAIHN0YXRpYyB2b2lkIGFuYWxvZ2l4X2RwX2JyaWRn ZV9ub3Aoc3RydWN0IGRybV9icmlkZ2UgKmJyaWRnZSkKPiA+ICAgfQo+ID4gICBzdGF0aWMgY29u c3Qgc3RydWN0IGRybV9icmlkZ2VfZnVuY3MgYW5hbG9naXhfZHBfYnJpZGdlX2Z1bmNzID0gewo+ ID4gKwkucHJlX2VuYWJsZSA9IGFuYWxvZ2l4X2RwX2JyaWRnZV9wcmVfZW5hYmxlLAo+ID4gICAJ LmVuYWJsZSA9IGFuYWxvZ2l4X2RwX2JyaWRnZV9lbmFibGUsCj4gPiAgIAkuZGlzYWJsZSA9IGFu YWxvZ2l4X2RwX2JyaWRnZV9kaXNhYmxlLAo+ID4gLQkucHJlX2VuYWJsZSA9IGFuYWxvZ2l4X2Rw X2JyaWRnZV9ub3AsCj4gPiAgIAkucG9zdF9kaXNhYmxlID0gYW5hbG9naXhfZHBfYnJpZGdlX25v cCwKPiA+ICAgCS5tb2RlX3NldCA9IGFuYWxvZ2l4X2RwX2JyaWRnZV9tb2RlX3NldCwKPiA+ICAg CS5hdHRhY2ggPSBhbmFsb2dpeF9kcF9icmlkZ2VfYXR0YWNoLAo+ID4gQEAgLTEyNTQsNiArMTMz Nyw5IEBAIGludCBhbmFsb2dpeF9kcF9iaW5kKHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRy bV9kZXZpY2UgKmRybV9kZXYsCj4gPiAgIAlkcC0+ZGV2ID0gJnBkZXYtPmRldjsKPiA+ICAgCWRw LT5kcG1zX21vZGUgPSBEUk1fTU9ERV9EUE1TX09GRjsKPiA+ICsJbXV0ZXhfaW5pdCgmZHAtPnBh bmVsX2xvY2spOwo+ID4gKwlkcC0+cGFuZWxfaXNfbW9kZXNldCA9IGZhbHNlOwo+ID4gKwo+ID4g ICAJLyoKPiA+ICAgCSAqIHBsYXRmb3JtIGRwIGRyaXZlciBuZWVkIGNvbnRhaW5vcl9vZiB0aGUg cGxhdF9kYXRhIHRvIGdldAo+ID4gICAJICogdGhlIGRyaXZlciBwcml2YXRlIGRhdGEsIHNvIHdl IG5lZWQgdG8gc3RvcmUgdGhlIHBvaW50IG9mCj4gPiBAQCAtMTMzMywxMyArMTQxOSw2IEBAIGlu dCBhbmFsb2dpeF9kcF9iaW5kKHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRybV9kZXZpY2Ug KmRybV9kZXYsCj4gPiAgIAlwaHlfcG93ZXJfb24oZHAtPnBoeSk7Cj4gPiAtCWlmIChkcC0+cGxh dF9kYXRhLT5wYW5lbCkgewo+ID4gLQkJaWYgKGRybV9wYW5lbF9wcmVwYXJlKGRwLT5wbGF0X2Rh dGEtPnBhbmVsKSkgewo+ID4gLQkJCURSTV9FUlJPUigiZmFpbGVkIHRvIHNldHVwIHRoZSBwYW5l bFxuIik7Cj4gPiAtCQkJcmV0dXJuIC1FQlVTWTsKPiA+IC0JCX0KPiA+IC0JfQo+ID4gLQo+ID4g ICAJYW5hbG9naXhfZHBfaW5pdF9kcChkcCk7Cj4gPiAgIAlyZXQgPSBkZXZtX3JlcXVlc3RfdGhy ZWFkZWRfaXJxKCZwZGV2LT5kZXYsIGRwLT5pcnEsCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2JyaWRnZS9hbmFsb2dpeC9hbmFsb2dpeF9kcF9jb3JlLmggYi9kcml2ZXJzL2dwdS9k cm0vYnJpZGdlL2FuYWxvZ2l4L2FuYWxvZ2l4X2RwX2NvcmUuaAo+ID4gaW5kZXggYjQ1NjM4MC4u NDMxMDhkNyAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9icmlkZ2UvYW5hbG9naXgv YW5hbG9naXhfZHBfY29yZS5oCj4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vYnJpZGdlL2FuYWxv Z2l4L2FuYWxvZ2l4X2RwX2NvcmUuaAo+ID4gQEAgLTE3OCw2ICsxNzgsOSBAQCBzdHJ1Y3QgYW5h bG9naXhfZHBfZGV2aWNlIHsKPiA+ICAgCWJvb2wgICAgICAgICAgICAgICAgICAgIGZvcmNlX2hw ZDsKPiA+ICAgCXVuc2lnbmVkIGNoYXIgICAgICAgICAgIGVkaWRbRURJRF9CTE9DS19MRU5HVEgg KiAyXTsKPiA+ICsJc3RydWN0IG11dGV4CQlwYW5lbF9sb2NrOwo+ID4gKwlib29sCQkJcGFuZWxf aXNfbW9kZXNldDsKPiA+ICsKPiA+ICAgCXN0cnVjdCBhbmFsb2dpeF9kcF9wbGF0X2RhdGEgKnBs YXRfZGF0YTsKPiA+ICAgfTsKPiAKPiAKPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwo+IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKPiBkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9kcmktZGV2ZWwKCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVy LCBJbnRlbCBDb3Jwb3JhdGlvbgpodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK