From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C39CC47E49 for ; Wed, 23 Oct 2019 15:45:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D8792084C for ; Wed, 23 Oct 2019 15:45:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406858AbfJWPp0 (ORCPT ); Wed, 23 Oct 2019 11:45:26 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:37766 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404032AbfJWPpZ (ORCPT ); Wed, 23 Oct 2019 11:45:25 -0400 Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:2c:6930:5cf4:84a1:2763:fe0d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bbrezillon) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id B7A1728F91F; Wed, 23 Oct 2019 16:45:22 +0100 (BST) From: Boris Brezillon To: dri-devel@lists.freedesktop.org Cc: Lucas Stach , Chris Healy , Andrey Smirnov , Nikita Yushchenko , kernel@collabora.com, Daniel Vetter , Inki Dae , Joonyoung Shim , Seung-Woo Kim , Kyungmin Park , Thierry Reding , Sam Ravnborg , Philipp Zabel , Rob Clark , Andrzej Hajda , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Rob Herring , Mark Rutland , devicetree@vger.kernel.org, Boris Brezillon Subject: [PATCH v3 06/21] drm: Stop accessing encoder->bridge directly Date: Wed, 23 Oct 2019 17:44:57 +0200 Message-Id: <20191023154512.9762-7-boris.brezillon@collabora.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191023154512.9762-1-boris.brezillon@collabora.com> References: <20191023154512.9762-1-boris.brezillon@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org We are about to replace the single-linked bridge list by a double-linked one based on list.h, leading to the suppression of the encoder->bridge field. But before we can do that we must provide a drm_bridge_chain_get_first_bridge() bridge helper and patch all drivers and core helpers to use it instead of directly accessing encoder->bridge. Signed-off-by: Boris Brezillon --- drivers/gpu/drm/drm_atomic_helper.c | 25 +++++++++++++++++-------- drivers/gpu/drm/drm_encoder.c | 3 ++- drivers/gpu/drm/drm_probe_helper.c | 4 +++- drivers/gpu/drm/msm/edp/edp_bridge.c | 10 ++++++++-- drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 11 ++++++++--- include/drm/drm_bridge.h | 15 +++++++++++++++ 6 files changed, 53 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index cf678be58fa4..f02ddffd4960 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -419,6 +419,7 @@ mode_fixup(struct drm_atomic_state *state) for_each_new_connector_in_state(state, connector, new_conn_state, i) { const struct drm_encoder_helper_funcs *funcs; struct drm_encoder *encoder; + struct drm_bridge *bridge; WARN_ON(!!new_conn_state->best_encoder != !!new_conn_state->crtc); @@ -435,7 +436,8 @@ mode_fixup(struct drm_atomic_state *state) encoder = new_conn_state->best_encoder; funcs = encoder->helper_private; - ret = drm_bridge_chain_mode_fixup(encoder->bridge, + bridge = drm_bridge_chain_get_first_bridge(encoder); + ret = drm_bridge_chain_mode_fixup(bridge, &new_crtc_state->mode, &new_crtc_state->adjusted_mode); if (!ret) { @@ -493,6 +495,7 @@ static enum drm_mode_status mode_valid_path(struct drm_connector *connector, struct drm_crtc *crtc, const struct drm_display_mode *mode) { + struct drm_bridge *bridge; enum drm_mode_status ret; ret = drm_encoder_mode_valid(encoder, mode); @@ -502,7 +505,8 @@ static enum drm_mode_status mode_valid_path(struct drm_connector *connector, return ret; } - ret = drm_bridge_chain_mode_valid(encoder->bridge, mode); + bridge = drm_bridge_chain_get_first_bridge(encoder); + ret = drm_bridge_chain_mode_valid(bridge, mode); if (ret != MODE_OK) { DRM_DEBUG_ATOMIC("[BRIDGE] mode_valid() failed\n"); return ret; @@ -985,6 +989,7 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) for_each_oldnew_connector_in_state(old_state, connector, old_conn_state, new_conn_state, i) { const struct drm_encoder_helper_funcs *funcs; struct drm_encoder *encoder; + struct drm_bridge *bridge; /* Shut down everything that's in the changeset and currently * still on. So need to check the old, saved state. */ @@ -1021,7 +1026,8 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) * Each encoder has at most one connector (since we always steal * it away), so we won't call disable hooks twice. */ - drm_atomic_bridge_chain_disable(encoder->bridge, old_state); + bridge = drm_bridge_chain_get_first_bridge(encoder); + drm_atomic_bridge_chain_disable(bridge, old_state); /* Right function depends upon target state. */ if (funcs) { @@ -1035,7 +1041,7 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) funcs->dpms(encoder, DRM_MODE_DPMS_OFF); } - drm_atomic_bridge_chain_post_disable(encoder->bridge, + drm_atomic_bridge_chain_post_disable(bridge, old_state); } @@ -1190,6 +1196,7 @@ crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state) const struct drm_encoder_helper_funcs *funcs; struct drm_encoder *encoder; struct drm_display_mode *mode, *adjusted_mode; + struct drm_bridge *bridge; if (!new_conn_state->best_encoder) continue; @@ -1217,8 +1224,8 @@ crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state) funcs->mode_set(encoder, mode, adjusted_mode); } - drm_bridge_chain_mode_set(encoder->bridge, mode, - adjusted_mode); + bridge = drm_bridge_chain_get_first_bridge(encoder); + drm_bridge_chain_mode_set(bridge, mode, adjusted_mode); } } @@ -1317,6 +1324,7 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, for_each_new_connector_in_state(old_state, connector, new_conn_state, i) { const struct drm_encoder_helper_funcs *funcs; struct drm_encoder *encoder; + struct drm_bridge *bridge; if (!new_conn_state->best_encoder) continue; @@ -1335,7 +1343,8 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, * Each encoder has at most one connector (since we always steal * it away), so we won't call enable hooks twice. */ - drm_atomic_bridge_chain_pre_enable(encoder->bridge, old_state); + bridge = drm_bridge_chain_get_first_bridge(encoder); + drm_atomic_bridge_chain_pre_enable(bridge, old_state); if (funcs) { if (funcs->atomic_enable) @@ -1346,7 +1355,7 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, funcs->commit(encoder); } - drm_atomic_bridge_chain_enable(encoder->bridge, old_state); + drm_atomic_bridge_chain_enable(bridge, old_state); } drm_atomic_helper_commit_writebacks(dev, old_state); diff --git a/drivers/gpu/drm/drm_encoder.c b/drivers/gpu/drm/drm_encoder.c index 80d88a55302e..4fe9e723e227 100644 --- a/drivers/gpu/drm/drm_encoder.c +++ b/drivers/gpu/drm/drm_encoder.c @@ -167,9 +167,10 @@ void drm_encoder_cleanup(struct drm_encoder *encoder) */ if (encoder->bridge) { - struct drm_bridge *bridge = encoder->bridge; + struct drm_bridge *bridge; struct drm_bridge *next; + bridge = drm_bridge_chain_get_first_bridge(encoder); while (bridge) { next = bridge->next; drm_bridge_detach(bridge); diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c index c3ea722065c4..576b4b7dcd89 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -101,6 +101,7 @@ drm_mode_validate_pipeline(struct drm_display_mode *mode, /* Step 2: Validate against encoders and crtcs */ drm_connector_for_each_possible_encoder(connector, encoder) { + struct drm_bridge *bridge; struct drm_crtc *crtc; ret = drm_encoder_mode_valid(encoder, mode); @@ -112,7 +113,8 @@ drm_mode_validate_pipeline(struct drm_display_mode *mode, continue; } - ret = drm_bridge_chain_mode_valid(encoder->bridge, mode); + bridge = drm_bridge_chain_get_first_bridge(encoder); + ret = drm_bridge_chain_mode_valid(bridge, mode); if (ret != MODE_OK) { /* There is also no point in continuing for crtc check * here. */ diff --git a/drivers/gpu/drm/msm/edp/edp_bridge.c b/drivers/gpu/drm/msm/edp/edp_bridge.c index 2950bba4aca9..b65b5cc2dba2 100644 --- a/drivers/gpu/drm/msm/edp/edp_bridge.c +++ b/drivers/gpu/drm/msm/edp/edp_bridge.c @@ -55,8 +55,14 @@ static void edp_bridge_mode_set(struct drm_bridge *bridge, DBG("set mode: " DRM_MODE_FMT, DRM_MODE_ARG(mode)); list_for_each_entry(connector, &dev->mode_config.connector_list, head) { - if ((connector->encoder != NULL) && - (connector->encoder->bridge == bridge)) { + struct drm_encoder *encoder = connector->encoder; + struct drm_bridge *first_bridge; + + if (!connector->encoder) + continue; + + first_bridge = drm_bridge_chain_get_first_bridge(encoder); + if (bridge == first_bridge) { msm_edp_ctrl_timing_cfg(edp->ctrl, adjusted_mode, &connector->display_info); break; diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c index 2da46e3dc4ae..7a1f1e5f0326 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c @@ -14,6 +14,7 @@ #include #include +#include #include #include #include @@ -680,9 +681,10 @@ static void rcar_du_crtc_atomic_enable(struct drm_crtc *crtc, rcdu->encoders[RCAR_DU_OUTPUT_LVDS0 + rcrtc->index]; const struct drm_display_mode *mode = &crtc->state->adjusted_mode; + struct drm_bridge *bridge; - rcar_lvds_clk_enable(encoder->base.bridge, - mode->clock * 1000); + bridge = drm_bridge_chain_get_first_bridge(&encoder->base); + rcar_lvds_clk_enable(bridge, mode->clock * 1000); } rcar_du_crtc_start(rcrtc); @@ -702,12 +704,15 @@ static void rcar_du_crtc_atomic_disable(struct drm_crtc *crtc, rstate->outputs == BIT(RCAR_DU_OUTPUT_DPAD0)) { struct rcar_du_encoder *encoder = rcdu->encoders[RCAR_DU_OUTPUT_LVDS0 + rcrtc->index]; + struct drm_bridge *bridge; + /* * Disable the LVDS clock output, see * rcar_du_crtc_atomic_enable(). */ - rcar_lvds_clk_disable(encoder->base.bridge); + bridge = drm_bridge_chain_get_first_bridge(&encoder->base); + rcar_lvds_clk_disable(bridge); } spin_lock_irq(&crtc->dev->event_lock); diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index 8aeba83fcf31..27eef63ce0ff 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -25,6 +25,7 @@ #include #include +#include #include #include @@ -422,6 +423,20 @@ drm_bridge_chain_get_next_bridge(struct drm_bridge *bridge) return bridge->next; } +/** + * drm_bridge_chain_get_first_bridge() - Get the first bridge in the chain + * @encoder: encoder object + * + * RETURNS: + * the first bridge in the chain, or NULL if @encoder has no bridge attached + * to it. + */ +static inline struct drm_bridge * +drm_bridge_chain_get_first_bridge(struct drm_encoder *encoder) +{ + return encoder->bridge; +} + bool drm_bridge_chain_mode_fixup(struct drm_bridge *bridge, const struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode); -- 2.21.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Brezillon Subject: [PATCH v3 06/21] drm: Stop accessing encoder->bridge directly Date: Wed, 23 Oct 2019 17:44:57 +0200 Message-ID: <20191023154512.9762-7-boris.brezillon@collabora.com> References: <20191023154512.9762-1-boris.brezillon@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7F7B86EB1B for ; Wed, 23 Oct 2019 15:45:24 +0000 (UTC) In-Reply-To: <20191023154512.9762-1-boris.brezillon@collabora.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: Mark Rutland , Neil Armstrong , Thierry Reding , Laurent Pinchart , kernel@collabora.com, Sam Ravnborg , Nikita Yushchenko , Andrey Smirnov , Kyungmin Park , Chris Healy , devicetree@vger.kernel.org, Jonas Karlman , Rob Herring , Jernej Skrabec , Seung-Woo Kim , Boris Brezillon List-Id: dri-devel@lists.freedesktop.org V2UgYXJlIGFib3V0IHRvIHJlcGxhY2UgdGhlIHNpbmdsZS1saW5rZWQgYnJpZGdlIGxpc3QgYnkg YSBkb3VibGUtbGlua2VkCm9uZSBiYXNlZCBvbiBsaXN0LmgsIGxlYWRpbmcgdG8gdGhlIHN1cHBy ZXNzaW9uIG9mIHRoZSBlbmNvZGVyLT5icmlkZ2UKZmllbGQuIEJ1dCBiZWZvcmUgd2UgY2FuIGRv IHRoYXQgd2UgbXVzdCBwcm92aWRlIGEKZHJtX2JyaWRnZV9jaGFpbl9nZXRfZmlyc3RfYnJpZGdl KCkgYnJpZGdlIGhlbHBlciBhbmQgcGF0Y2ggYWxsIGRyaXZlcnMKYW5kIGNvcmUgaGVscGVycyB0 byB1c2UgaXQgaW5zdGVhZCBvZiBkaXJlY3RseSBhY2Nlc3NpbmcgZW5jb2Rlci0+YnJpZGdlLgoK U2lnbmVkLW9mZi1ieTogQm9yaXMgQnJlemlsbG9uIDxib3Jpcy5icmV6aWxsb25AY29sbGFib3Jh LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyAgICB8IDI1ICsr KysrKysrKysrKysrKysrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fZW5jb2Rlci5jICAg ICAgICAgIHwgIDMgKystCiBkcml2ZXJzL2dwdS9kcm0vZHJtX3Byb2JlX2hlbHBlci5jICAgICB8 ICA0ICsrKy0KIGRyaXZlcnMvZ3B1L2RybS9tc20vZWRwL2VkcF9icmlkZ2UuYyAgIHwgMTAgKysr KysrKystLQogZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9jcnRjLmMgfCAxMSArKysr KysrKy0tLQogaW5jbHVkZS9kcm0vZHJtX2JyaWRnZS5oICAgICAgICAgICAgICAgfCAxNSArKysr KysrKysrKysrKysKIDYgZmlsZXMgY2hhbmdlZCwgNTMgaW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMg Yi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwppbmRleCBjZjY3OGJlNThmYTQu LmYwMmRkZmZkNDk2MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVs cGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKQEAgLTQxOSw2 ICs0MTksNyBAQCBtb2RlX2ZpeHVwKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAlm b3JfZWFjaF9uZXdfY29ubmVjdG9yX2luX3N0YXRlKHN0YXRlLCBjb25uZWN0b3IsIG5ld19jb25u X3N0YXRlLCBpKSB7CiAJCWNvbnN0IHN0cnVjdCBkcm1fZW5jb2Rlcl9oZWxwZXJfZnVuY3MgKmZ1 bmNzOwogCQlzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXI7CisJCXN0cnVjdCBkcm1fYnJpZGdl ICpicmlkZ2U7CiAKIAkJV0FSTl9PTighIW5ld19jb25uX3N0YXRlLT5iZXN0X2VuY29kZXIgIT0g ISFuZXdfY29ubl9zdGF0ZS0+Y3J0Yyk7CiAKQEAgLTQzNSw3ICs0MzYsOCBAQCBtb2RlX2ZpeHVw KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJZW5jb2RlciA9IG5ld19jb25uX3N0 YXRlLT5iZXN0X2VuY29kZXI7CiAJCWZ1bmNzID0gZW5jb2Rlci0+aGVscGVyX3ByaXZhdGU7CiAK LQkJcmV0ID0gZHJtX2JyaWRnZV9jaGFpbl9tb2RlX2ZpeHVwKGVuY29kZXItPmJyaWRnZSwKKwkJ YnJpZGdlID0gZHJtX2JyaWRnZV9jaGFpbl9nZXRfZmlyc3RfYnJpZGdlKGVuY29kZXIpOworCQly ZXQgPSBkcm1fYnJpZGdlX2NoYWluX21vZGVfZml4dXAoYnJpZGdlLAogCQkJCQkmbmV3X2NydGNf c3RhdGUtPm1vZGUsCiAJCQkJCSZuZXdfY3J0Y19zdGF0ZS0+YWRqdXN0ZWRfbW9kZSk7CiAJCWlm ICghcmV0KSB7CkBAIC00OTMsNiArNDk1LDcgQEAgc3RhdGljIGVudW0gZHJtX21vZGVfc3RhdHVz IG1vZGVfdmFsaWRfcGF0aChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCQkJCQkg ICAgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJCQkgICAgY29uc3Qgc3RydWN0IGRybV9kaXNw bGF5X21vZGUgKm1vZGUpCiB7CisJc3RydWN0IGRybV9icmlkZ2UgKmJyaWRnZTsKIAllbnVtIGRy bV9tb2RlX3N0YXR1cyByZXQ7CiAKIAlyZXQgPSBkcm1fZW5jb2Rlcl9tb2RlX3ZhbGlkKGVuY29k ZXIsIG1vZGUpOwpAQCAtNTAyLDcgKzUwNSw4IEBAIHN0YXRpYyBlbnVtIGRybV9tb2RlX3N0YXR1 cyBtb2RlX3ZhbGlkX3BhdGgoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKIAkJcmV0 dXJuIHJldDsKIAl9CiAKLQlyZXQgPSBkcm1fYnJpZGdlX2NoYWluX21vZGVfdmFsaWQoZW5jb2Rl ci0+YnJpZGdlLCBtb2RlKTsKKwlicmlkZ2UgPSBkcm1fYnJpZGdlX2NoYWluX2dldF9maXJzdF9i cmlkZ2UoZW5jb2Rlcik7CisJcmV0ID0gZHJtX2JyaWRnZV9jaGFpbl9tb2RlX3ZhbGlkKGJyaWRn ZSwgbW9kZSk7CiAJaWYgKHJldCAhPSBNT0RFX09LKSB7CiAJCURSTV9ERUJVR19BVE9NSUMoIltC UklER0VdIG1vZGVfdmFsaWQoKSBmYWlsZWRcbiIpOwogCQlyZXR1cm4gcmV0OwpAQCAtOTg1LDYg Kzk4OSw3IEBAIGRpc2FibGVfb3V0cHV0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3Qg ZHJtX2F0b21pY19zdGF0ZSAqb2xkX3N0YXRlKQogCWZvcl9lYWNoX29sZG5ld19jb25uZWN0b3Jf aW5fc3RhdGUob2xkX3N0YXRlLCBjb25uZWN0b3IsIG9sZF9jb25uX3N0YXRlLCBuZXdfY29ubl9z dGF0ZSwgaSkgewogCQljb25zdCBzdHJ1Y3QgZHJtX2VuY29kZXJfaGVscGVyX2Z1bmNzICpmdW5j czsKIAkJc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyOworCQlzdHJ1Y3QgZHJtX2JyaWRnZSAq YnJpZGdlOwogCiAJCS8qIFNodXQgZG93biBldmVyeXRoaW5nIHRoYXQncyBpbiB0aGUgY2hhbmdl c2V0IGFuZCBjdXJyZW50bHkKIAkJICogc3RpbGwgb24uIFNvIG5lZWQgdG8gY2hlY2sgdGhlIG9s ZCwgc2F2ZWQgc3RhdGUuICovCkBAIC0xMDIxLDcgKzEwMjYsOCBAQCBkaXNhYmxlX291dHB1dHMo c3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKm9sZF9zdGF0 ZSkKIAkJICogRWFjaCBlbmNvZGVyIGhhcyBhdCBtb3N0IG9uZSBjb25uZWN0b3IgKHNpbmNlIHdl IGFsd2F5cyBzdGVhbAogCQkgKiBpdCBhd2F5KSwgc28gd2Ugd29uJ3QgY2FsbCBkaXNhYmxlIGhv b2tzIHR3aWNlLgogCQkgKi8KLQkJZHJtX2F0b21pY19icmlkZ2VfY2hhaW5fZGlzYWJsZShlbmNv ZGVyLT5icmlkZ2UsIG9sZF9zdGF0ZSk7CisJCWJyaWRnZSA9IGRybV9icmlkZ2VfY2hhaW5fZ2V0 X2ZpcnN0X2JyaWRnZShlbmNvZGVyKTsKKwkJZHJtX2F0b21pY19icmlkZ2VfY2hhaW5fZGlzYWJs ZShicmlkZ2UsIG9sZF9zdGF0ZSk7CiAKIAkJLyogUmlnaHQgZnVuY3Rpb24gZGVwZW5kcyB1cG9u IHRhcmdldCBzdGF0ZS4gKi8KIAkJaWYgKGZ1bmNzKSB7CkBAIC0xMDM1LDcgKzEwNDEsNyBAQCBk aXNhYmxlX291dHB1dHMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9hdG9taWNf c3RhdGUgKm9sZF9zdGF0ZSkKIAkJCQlmdW5jcy0+ZHBtcyhlbmNvZGVyLCBEUk1fTU9ERV9EUE1T X09GRik7CiAJCX0KIAotCQlkcm1fYXRvbWljX2JyaWRnZV9jaGFpbl9wb3N0X2Rpc2FibGUoZW5j b2Rlci0+YnJpZGdlLAorCQlkcm1fYXRvbWljX2JyaWRnZV9jaGFpbl9wb3N0X2Rpc2FibGUoYnJp ZGdlLAogCQkJCQkJICAgICBvbGRfc3RhdGUpOwogCX0KIApAQCAtMTE5MCw2ICsxMTk2LDcgQEAg Y3J0Y19zZXRfbW9kZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2F0b21pY19z dGF0ZSAqb2xkX3N0YXRlKQogCQljb25zdCBzdHJ1Y3QgZHJtX2VuY29kZXJfaGVscGVyX2Z1bmNz ICpmdW5jczsKIAkJc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyOwogCQlzdHJ1Y3QgZHJtX2Rp c3BsYXlfbW9kZSAqbW9kZSwgKmFkanVzdGVkX21vZGU7CisJCXN0cnVjdCBkcm1fYnJpZGdlICpi cmlkZ2U7CiAKIAkJaWYgKCFuZXdfY29ubl9zdGF0ZS0+YmVzdF9lbmNvZGVyKQogCQkJY29udGlu dWU7CkBAIC0xMjE3LDggKzEyMjQsOCBAQCBjcnRjX3NldF9tb2RlKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3RhdGUpCiAJCQlmdW5jcy0+bW9k ZV9zZXQoZW5jb2RlciwgbW9kZSwgYWRqdXN0ZWRfbW9kZSk7CiAJCX0KIAotCQlkcm1fYnJpZGdl X2NoYWluX21vZGVfc2V0KGVuY29kZXItPmJyaWRnZSwgbW9kZSwKLQkJCQkJICBhZGp1c3RlZF9t b2RlKTsKKwkJYnJpZGdlID0gZHJtX2JyaWRnZV9jaGFpbl9nZXRfZmlyc3RfYnJpZGdlKGVuY29k ZXIpOworCQlkcm1fYnJpZGdlX2NoYWluX21vZGVfc2V0KGJyaWRnZSwgbW9kZSwgYWRqdXN0ZWRf bW9kZSk7CiAJfQogfQogCkBAIC0xMzE3LDYgKzEzMjQsNyBAQCB2b2lkIGRybV9hdG9taWNfaGVs cGVyX2NvbW1pdF9tb2Rlc2V0X2VuYWJsZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlmb3Jf ZWFjaF9uZXdfY29ubmVjdG9yX2luX3N0YXRlKG9sZF9zdGF0ZSwgY29ubmVjdG9yLCBuZXdfY29u bl9zdGF0ZSwgaSkgewogCQljb25zdCBzdHJ1Y3QgZHJtX2VuY29kZXJfaGVscGVyX2Z1bmNzICpm dW5jczsKIAkJc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyOworCQlzdHJ1Y3QgZHJtX2JyaWRn ZSAqYnJpZGdlOwogCiAJCWlmICghbmV3X2Nvbm5fc3RhdGUtPmJlc3RfZW5jb2RlcikKIAkJCWNv bnRpbnVlOwpAQCAtMTMzNSw3ICsxMzQzLDggQEAgdm9pZCBkcm1fYXRvbWljX2hlbHBlcl9jb21t aXRfbW9kZXNldF9lbmFibGVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCSAqIEVhY2ggZW5j b2RlciBoYXMgYXQgbW9zdCBvbmUgY29ubmVjdG9yIChzaW5jZSB3ZSBhbHdheXMgc3RlYWwKIAkJ ICogaXQgYXdheSksIHNvIHdlIHdvbid0IGNhbGwgZW5hYmxlIGhvb2tzIHR3aWNlLgogCQkgKi8K LQkJZHJtX2F0b21pY19icmlkZ2VfY2hhaW5fcHJlX2VuYWJsZShlbmNvZGVyLT5icmlkZ2UsIG9s ZF9zdGF0ZSk7CisJCWJyaWRnZSA9IGRybV9icmlkZ2VfY2hhaW5fZ2V0X2ZpcnN0X2JyaWRnZShl bmNvZGVyKTsKKwkJZHJtX2F0b21pY19icmlkZ2VfY2hhaW5fcHJlX2VuYWJsZShicmlkZ2UsIG9s ZF9zdGF0ZSk7CiAKIAkJaWYgKGZ1bmNzKSB7CiAJCQlpZiAoZnVuY3MtPmF0b21pY19lbmFibGUp CkBAIC0xMzQ2LDcgKzEzNTUsNyBAQCB2b2lkIGRybV9hdG9taWNfaGVscGVyX2NvbW1pdF9tb2Rl c2V0X2VuYWJsZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQlmdW5jcy0+Y29tbWl0KGVu Y29kZXIpOwogCQl9CiAKLQkJZHJtX2F0b21pY19icmlkZ2VfY2hhaW5fZW5hYmxlKGVuY29kZXIt PmJyaWRnZSwgb2xkX3N0YXRlKTsKKwkJZHJtX2F0b21pY19icmlkZ2VfY2hhaW5fZW5hYmxlKGJy aWRnZSwgb2xkX3N0YXRlKTsKIAl9CiAKIAlkcm1fYXRvbWljX2hlbHBlcl9jb21taXRfd3JpdGVi YWNrcyhkZXYsIG9sZF9zdGF0ZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2Vu Y29kZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZW5jb2Rlci5jCmluZGV4IDgwZDg4YTU1MzAy ZS4uNGZlOWU3MjNlMjI3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2VuY29kZXIu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2VuY29kZXIuYwpAQCAtMTY3LDkgKzE2NywxMCBA QCB2b2lkIGRybV9lbmNvZGVyX2NsZWFudXAoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQog CSAqLwogCiAJaWYgKGVuY29kZXItPmJyaWRnZSkgewotCQlzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJp ZGdlID0gZW5jb2Rlci0+YnJpZGdlOworCQlzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJpZGdlOwogCQlz dHJ1Y3QgZHJtX2JyaWRnZSAqbmV4dDsKIAorCQlicmlkZ2UgPSBkcm1fYnJpZGdlX2NoYWluX2dl dF9maXJzdF9icmlkZ2UoZW5jb2Rlcik7CiAJCXdoaWxlIChicmlkZ2UpIHsKIAkJCW5leHQgPSBi cmlkZ2UtPm5leHQ7CiAJCQlkcm1fYnJpZGdlX2RldGFjaChicmlkZ2UpOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2RybV9wcm9iZV9oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1f cHJvYmVfaGVscGVyLmMKaW5kZXggYzNlYTcyMjA2NWM0Li41NzZiNGI3ZGNkODkgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcHJvYmVfaGVscGVyLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2RybV9wcm9iZV9oZWxwZXIuYwpAQCAtMTAxLDYgKzEwMSw3IEBAIGRybV9tb2RlX3ZhbGlk YXRlX3BpcGVsaW5lKHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlLAogCiAJLyogU3RlcCAy OiBWYWxpZGF0ZSBhZ2FpbnN0IGVuY29kZXJzIGFuZCBjcnRjcyAqLwogCWRybV9jb25uZWN0b3Jf Zm9yX2VhY2hfcG9zc2libGVfZW5jb2Rlcihjb25uZWN0b3IsIGVuY29kZXIpIHsKKwkJc3RydWN0 IGRybV9icmlkZ2UgKmJyaWRnZTsKIAkJc3RydWN0IGRybV9jcnRjICpjcnRjOwogCiAJCXJldCA9 IGRybV9lbmNvZGVyX21vZGVfdmFsaWQoZW5jb2RlciwgbW9kZSk7CkBAIC0xMTIsNyArMTEzLDgg QEAgZHJtX21vZGVfdmFsaWRhdGVfcGlwZWxpbmUoc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1v ZGUsCiAJCQljb250aW51ZTsKIAkJfQogCi0JCXJldCA9IGRybV9icmlkZ2VfY2hhaW5fbW9kZV92 YWxpZChlbmNvZGVyLT5icmlkZ2UsIG1vZGUpOworCQlicmlkZ2UgPSBkcm1fYnJpZGdlX2NoYWlu X2dldF9maXJzdF9icmlkZ2UoZW5jb2Rlcik7CisJCXJldCA9IGRybV9icmlkZ2VfY2hhaW5fbW9k ZV92YWxpZChicmlkZ2UsIG1vZGUpOwogCQlpZiAocmV0ICE9IE1PREVfT0spIHsKIAkJCS8qIFRo ZXJlIGlzIGFsc28gbm8gcG9pbnQgaW4gY29udGludWluZyBmb3IgY3J0YyBjaGVjawogCQkJICog aGVyZS4gKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tc20vZWRwL2VkcF9icmlkZ2Uu YyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vZWRwL2VkcF9icmlkZ2UuYwppbmRleCAyOTUwYmJhNGFj YTkuLmI2NWI1Y2MyZGJhMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21zbS9lZHAvZWRw X2JyaWRnZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vZWRwL2VkcF9icmlkZ2UuYwpAQCAt NTUsOCArNTUsMTQgQEAgc3RhdGljIHZvaWQgZWRwX2JyaWRnZV9tb2RlX3NldChzdHJ1Y3QgZHJt X2JyaWRnZSAqYnJpZGdlLAogCURCRygic2V0IG1vZGU6ICIgRFJNX01PREVfRk1ULCBEUk1fTU9E RV9BUkcobW9kZSkpOwogCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShjb25uZWN0b3IsICZkZXYtPm1v ZGVfY29uZmlnLmNvbm5lY3Rvcl9saXN0LCBoZWFkKSB7Ci0JCWlmICgoY29ubmVjdG9yLT5lbmNv ZGVyICE9IE5VTEwpICYmCi0JCQkoY29ubmVjdG9yLT5lbmNvZGVyLT5icmlkZ2UgPT0gYnJpZGdl KSkgeworCQlzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIgPSBjb25uZWN0b3ItPmVuY29kZXI7 CisJCXN0cnVjdCBkcm1fYnJpZGdlICpmaXJzdF9icmlkZ2U7CisKKwkJaWYgKCFjb25uZWN0b3It PmVuY29kZXIpCisJCQljb250aW51ZTsKKworCQlmaXJzdF9icmlkZ2UgPSBkcm1fYnJpZGdlX2No YWluX2dldF9maXJzdF9icmlkZ2UoZW5jb2Rlcik7CisJCWlmIChicmlkZ2UgPT0gZmlyc3RfYnJp ZGdlKSB7CiAJCQltc21fZWRwX2N0cmxfdGltaW5nX2NmZyhlZHAtPmN0cmwsCiAJCQkJYWRqdXN0 ZWRfbW9kZSwgJmNvbm5lY3Rvci0+ZGlzcGxheV9pbmZvKTsKIAkJCWJyZWFrOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9jcnRjLmMgYi9kcml2ZXJzL2dwdS9k cm0vcmNhci1kdS9yY2FyX2R1X2NydGMuYwppbmRleCAyZGE0NmUzZGM0YWUuLjdhMWYxZTVmMDMy NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9jcnRjLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9jcnRjLmMKQEAgLTE0LDYgKzE0LDcg QEAKIAogI2luY2x1ZGUgPGRybS9kcm1fYXRvbWljLmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9hdG9t aWNfaGVscGVyLmg+CisjaW5jbHVkZSA8ZHJtL2RybV9icmlkZ2UuaD4KICNpbmNsdWRlIDxkcm0v ZHJtX2NydGMuaD4KICNpbmNsdWRlIDxkcm0vZHJtX2RldmljZS5oPgogI2luY2x1ZGUgPGRybS9k cm1fZmJfY21hX2hlbHBlci5oPgpAQCAtNjgwLDkgKzY4MSwxMCBAQCBzdGF0aWMgdm9pZCByY2Fy X2R1X2NydGNfYXRvbWljX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQlyY2R1LT5l bmNvZGVyc1tSQ0FSX0RVX09VVFBVVF9MVkRTMCArIHJjcnRjLT5pbmRleF07CiAJCWNvbnN0IHN0 cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlID0KIAkJCSZjcnRjLT5zdGF0ZS0+YWRqdXN0ZWRf bW9kZTsKKwkJc3RydWN0IGRybV9icmlkZ2UgKmJyaWRnZTsKIAotCQlyY2FyX2x2ZHNfY2xrX2Vu YWJsZShlbmNvZGVyLT5iYXNlLmJyaWRnZSwKLQkJCQkgICAgIG1vZGUtPmNsb2NrICogMTAwMCk7 CisJCWJyaWRnZSA9IGRybV9icmlkZ2VfY2hhaW5fZ2V0X2ZpcnN0X2JyaWRnZSgmZW5jb2Rlci0+ YmFzZSk7CisJCXJjYXJfbHZkc19jbGtfZW5hYmxlKGJyaWRnZSwgbW9kZS0+Y2xvY2sgKiAxMDAw KTsKIAl9CiAKIAlyY2FyX2R1X2NydGNfc3RhcnQocmNydGMpOwpAQCAtNzAyLDEyICs3MDQsMTUg QEAgc3RhdGljIHZvaWQgcmNhcl9kdV9jcnRjX2F0b21pY19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0 YyAqY3J0YywKIAkgICAgcnN0YXRlLT5vdXRwdXRzID09IEJJVChSQ0FSX0RVX09VVFBVVF9EUEFE MCkpIHsKIAkJc3RydWN0IHJjYXJfZHVfZW5jb2RlciAqZW5jb2RlciA9CiAJCQlyY2R1LT5lbmNv ZGVyc1tSQ0FSX0RVX09VVFBVVF9MVkRTMCArIHJjcnRjLT5pbmRleF07CisJCXN0cnVjdCBkcm1f YnJpZGdlICpicmlkZ2U7CisKIAogCQkvKgogCQkgKiBEaXNhYmxlIHRoZSBMVkRTIGNsb2NrIG91 dHB1dCwgc2VlCiAJCSAqIHJjYXJfZHVfY3J0Y19hdG9taWNfZW5hYmxlKCkuCiAJCSAqLwotCQly Y2FyX2x2ZHNfY2xrX2Rpc2FibGUoZW5jb2Rlci0+YmFzZS5icmlkZ2UpOworCQlicmlkZ2UgPSBk cm1fYnJpZGdlX2NoYWluX2dldF9maXJzdF9icmlkZ2UoJmVuY29kZXItPmJhc2UpOworCQlyY2Fy X2x2ZHNfY2xrX2Rpc2FibGUoYnJpZGdlKTsKIAl9CiAKIAlzcGluX2xvY2tfaXJxKCZjcnRjLT5k ZXYtPmV2ZW50X2xvY2spOwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX2JyaWRnZS5oIGIv aW5jbHVkZS9kcm0vZHJtX2JyaWRnZS5oCmluZGV4IDhhZWJhODNmY2YzMS4uMjdlZWY2M2NlMGZm IDEwMDY0NAotLS0gYS9pbmNsdWRlL2RybS9kcm1fYnJpZGdlLmgKKysrIGIvaW5jbHVkZS9kcm0v ZHJtX2JyaWRnZS5oCkBAIC0yNSw2ICsyNSw3IEBACiAKICNpbmNsdWRlIDxsaW51eC9saXN0Lmg+ CiAjaW5jbHVkZSA8bGludXgvY3R5cGUuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX2VuY29kZXIuaD4K ICNpbmNsdWRlIDxkcm0vZHJtX21vZGVfb2JqZWN0Lmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9tb2Rl cy5oPgogCkBAIC00MjIsNiArNDIzLDIwIEBAIGRybV9icmlkZ2VfY2hhaW5fZ2V0X25leHRfYnJp ZGdlKHN0cnVjdCBkcm1fYnJpZGdlICpicmlkZ2UpCiAJcmV0dXJuIGJyaWRnZS0+bmV4dDsKIH0K IAorLyoqCisgKiBkcm1fYnJpZGdlX2NoYWluX2dldF9maXJzdF9icmlkZ2UoKSAtIEdldCB0aGUg Zmlyc3QgYnJpZGdlIGluIHRoZSBjaGFpbgorICogQGVuY29kZXI6IGVuY29kZXIgb2JqZWN0Cisg KgorICogUkVUVVJOUzoKKyAqIHRoZSBmaXJzdCBicmlkZ2UgaW4gdGhlIGNoYWluLCBvciBOVUxM IGlmIEBlbmNvZGVyIGhhcyBubyBicmlkZ2UgYXR0YWNoZWQKKyAqIHRvIGl0LgorICovCitzdGF0 aWMgaW5saW5lIHN0cnVjdCBkcm1fYnJpZGdlICoKK2RybV9icmlkZ2VfY2hhaW5fZ2V0X2ZpcnN0 X2JyaWRnZShzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIpCit7CisJcmV0dXJuIGVuY29kZXIt PmJyaWRnZTsKK30KKwogYm9vbCBkcm1fYnJpZGdlX2NoYWluX21vZGVfZml4dXAoc3RydWN0IGRy bV9icmlkZ2UgKmJyaWRnZSwKIAkJCQkgY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1v ZGUsCiAJCQkJIHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2RlKTsKLS0gCjIu MjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJp LWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs