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=-8.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 BC9E0C48BE8 for ; Mon, 24 Jun 2019 16:03:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9513F20449 for ; Mon, 24 Jun 2019 16:03:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731489AbfFXQDn (ORCPT ); Mon, 24 Jun 2019 12:03:43 -0400 Received: from lb2-smtp-cloud7.xs4all.net ([194.109.24.28]:55269 "EHLO lb2-smtp-cloud7.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729593AbfFXQDl (ORCPT ); Mon, 24 Jun 2019 12:03:41 -0400 Received: from tschai.fritz.box ([46.9.252.75]) by smtp-cloud7.xs4all.net with ESMTPA id fRRKhHRxHF85OfRRShZabG; Mon, 24 Jun 2019 18:03:38 +0200 From: Hans Verkuil To: linux-media@vger.kernel.org Cc: Dariusz Marcinkiewicz , dri-devel@lists.freedesktop.org, Cheng-yi Chiang , Hans Verkuil Subject: [PATCHv8 06/13] drm_dp_cec: add connector info support. Date: Mon, 24 Jun 2019 18:03:23 +0200 Message-Id: <20190624160330.38048-7-hverkuil-cisco@xs4all.nl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190624160330.38048-1-hverkuil-cisco@xs4all.nl> References: <20190624160330.38048-1-hverkuil-cisco@xs4all.nl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CMAE-Envelope: MS4wfJHC8gnzmC6VsiHnhAT8Mnidw5ZU62gn3HZHqKNX7UVaXyuhfnr8nar7qUT3qlGmLsDkHKBOJjxOpQkAxPvSMU3uLSYaB+Wh29+IGNwTHaGSotCleMaH jydz2acYQRgsFtg5uESRnzo2+IhsZuls1iSK2+Qfkk2rRICKaq20ln8sxj5KvqE5TGegRK8uzBLdcF1HlbC6OaX8lMJjgnGzWc0jjfkuWs4X7YDCfmEum+4X EcZCyIsFh8k2xFRLcU5Gc0W61YkPGvB1b8ApD3uhy0omGT08+E7McH1Hf2S5Ig/VzyXS/OrQ4ZvogWElIONKW9fR0hITkbJmUhYwMOL6l1o= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Dariusz Marcinkiewicz Pass the connector info to the CEC adapter. This makes it possible to associate the CEC adapter with the corresponding drm connector. Signed-off-by: Dariusz Marcinkiewicz Signed-off-by: Hans Verkuil --- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 2 +- drivers/gpu/drm/drm_dp_cec.c | 25 ++++++++++++------- drivers/gpu/drm/i915/intel_dp.c | 4 +-- drivers/gpu/drm/nouveau/nouveau_connector.c | 3 +-- include/drm/drm_dp_helper.h | 14 +++++------ 5 files changed, 26 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c index 6e205ee36ac3..7f2eb4eb1035 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c @@ -394,7 +394,7 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, drm_dp_aux_register(&aconnector->dm_dp_aux.aux); drm_dp_cec_register_connector(&aconnector->dm_dp_aux.aux, - aconnector->base.name, dm->adev->dev); + &aconnector->base); aconnector->mst_mgr.cbs = &dm_mst_cbs; drm_dp_mst_topology_mgr_init( &aconnector->mst_mgr, diff --git a/drivers/gpu/drm/drm_dp_cec.c b/drivers/gpu/drm/drm_dp_cec.c index b15cee85b702..b457c16c3a8b 100644 --- a/drivers/gpu/drm/drm_dp_cec.c +++ b/drivers/gpu/drm/drm_dp_cec.c @@ -8,7 +8,9 @@ #include #include #include +#include #include +#include #include /* @@ -295,7 +297,10 @@ static void drm_dp_cec_unregister_work(struct work_struct *work) */ void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid) { - u32 cec_caps = CEC_CAP_DEFAULTS | CEC_CAP_NEEDS_HPD; + struct drm_connector *connector = aux->cec.connector; + u32 cec_caps = CEC_CAP_DEFAULTS | CEC_CAP_NEEDS_HPD | + CEC_CAP_CONNECTOR_INFO; + struct cec_connector_info conn_info; unsigned int num_las = 1; u8 cap; @@ -344,13 +349,17 @@ void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid) /* Create a new adapter */ aux->cec.adap = cec_allocate_adapter(&drm_dp_cec_adap_ops, - aux, aux->cec.name, cec_caps, + aux, connector->name, cec_caps, num_las); if (IS_ERR(aux->cec.adap)) { aux->cec.adap = NULL; goto unlock; } - if (cec_register_adapter(aux->cec.adap, aux->cec.parent)) { + + cec_fill_conn_info_from_drm(&conn_info, connector); + cec_s_conn_info(aux->cec.adap, &conn_info); + + if (cec_register_adapter(aux->cec.adap, connector->dev->dev)) { cec_delete_adapter(aux->cec.adap); aux->cec.adap = NULL; } else { @@ -406,22 +415,20 @@ EXPORT_SYMBOL(drm_dp_cec_unset_edid); /** * drm_dp_cec_register_connector() - register a new connector * @aux: DisplayPort AUX channel - * @name: name of the CEC device - * @parent: parent device + * @connector: drm connector * * A new connector was registered with associated CEC adapter name and * CEC adapter parent device. After registering the name and parent * drm_dp_cec_set_edid() is called to check if the connector supports * CEC and to register a CEC adapter if that is the case. */ -void drm_dp_cec_register_connector(struct drm_dp_aux *aux, const char *name, - struct device *parent) +void drm_dp_cec_register_connector(struct drm_dp_aux *aux, + struct drm_connector *connector) { WARN_ON(aux->cec.adap); if (WARN_ON(!aux->transfer)) return; - aux->cec.name = name; - aux->cec.parent = parent; + aux->cec.connector = connector; INIT_DELAYED_WORK(&aux->cec.unregister_work, drm_dp_cec_unregister_work); } diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 560274d1c50b..1dfd16848e03 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -5518,7 +5518,6 @@ static int intel_dp_connector_register(struct drm_connector *connector) { struct intel_dp *intel_dp = intel_attached_dp(connector); - struct drm_device *dev = connector->dev; int ret; ret = intel_connector_register(connector); @@ -5533,8 +5532,7 @@ intel_dp_connector_register(struct drm_connector *connector) intel_dp->aux.dev = connector->kdev; ret = drm_dp_aux_register(&intel_dp->aux); if (!ret) - drm_dp_cec_register_connector(&intel_dp->aux, - connector->name, dev->dev); + drm_dp_cec_register_connector(&intel_dp->aux, connector); return ret; } diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index 4116ee62adaf..4438824ca88b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -1413,8 +1413,7 @@ nouveau_connector_create(struct drm_device *dev, switch (type) { case DRM_MODE_CONNECTOR_DisplayPort: case DRM_MODE_CONNECTOR_eDP: - drm_dp_cec_register_connector(&nv_connector->aux, - connector->name, dev->dev); + drm_dp_cec_register_connector(&nv_connector->aux, connector); break; } diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h index 97ce790a5b5a..eeb42abc343c 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -1208,6 +1208,7 @@ struct drm_dp_aux_msg { struct cec_adapter; struct edid; +struct drm_connector; /** * struct drm_dp_aux_cec - DisplayPort CEC-Tunneling-over-AUX @@ -1220,8 +1221,7 @@ struct edid; struct drm_dp_aux_cec { struct mutex lock; struct cec_adapter *adap; - const char *name; - struct device *parent; + struct drm_connector *connector; struct delayed_work unregister_work; }; @@ -1418,8 +1418,8 @@ drm_dp_has_quirk(const struct drm_dp_desc *desc, enum drm_dp_quirk quirk) #ifdef CONFIG_DRM_DP_CEC void drm_dp_cec_irq(struct drm_dp_aux *aux); -void drm_dp_cec_register_connector(struct drm_dp_aux *aux, const char *name, - struct device *parent); +void drm_dp_cec_register_connector(struct drm_dp_aux *aux, + struct drm_connector *connector); void drm_dp_cec_unregister_connector(struct drm_dp_aux *aux); void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid); void drm_dp_cec_unset_edid(struct drm_dp_aux *aux); @@ -1428,9 +1428,9 @@ static inline void drm_dp_cec_irq(struct drm_dp_aux *aux) { } -static inline void drm_dp_cec_register_connector(struct drm_dp_aux *aux, - const char *name, - struct device *parent) +static inline void +drm_dp_cec_register_connector(struct drm_dp_aux *aux, + struct drm_connector *connector) { } -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans Verkuil Subject: [PATCHv8 06/13] drm_dp_cec: add connector info support. Date: Mon, 24 Jun 2019 18:03:23 +0200 Message-ID: <20190624160330.38048-7-hverkuil-cisco@xs4all.nl> References: <20190624160330.38048-1-hverkuil-cisco@xs4all.nl> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from lb3-smtp-cloud7.xs4all.net (lb3-smtp-cloud7.xs4all.net [194.109.24.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5F59789CD5 for ; Mon, 24 Jun 2019 16:10:48 +0000 (UTC) In-Reply-To: <20190624160330.38048-1-hverkuil-cisco@xs4all.nl> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-media@vger.kernel.org Cc: Hans Verkuil , Dariusz Marcinkiewicz , dri-devel@lists.freedesktop.org, Cheng-yi Chiang List-Id: dri-devel@lists.freedesktop.org RnJvbTogRGFyaXVzeiBNYXJjaW5raWV3aWN6IDxkYXJla21AZ29vZ2xlLmNvbT4KClBhc3MgdGhl IGNvbm5lY3RvciBpbmZvIHRvIHRoZSBDRUMgYWRhcHRlci4gVGhpcyBtYWtlcyBpdCBwb3NzaWJs ZQp0byBhc3NvY2lhdGUgdGhlIENFQyBhZGFwdGVyIHdpdGggdGhlIGNvcnJlc3BvbmRpbmcgZHJt IGNvbm5lY3Rvci4KClNpZ25lZC1vZmYtYnk6IERhcml1c3ogTWFyY2lua2lld2ljeiA8ZGFyZWtt QGdvb2dsZS5jb20+ClNpZ25lZC1vZmYtYnk6IEhhbnMgVmVya3VpbCA8aHZlcmt1aWwtY2lzY29A eHM0YWxsLm5sPgotLS0KIC4uLi9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fbXN0X3R5cGVz LmMgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2RwX2NlYy5jICAgICAgICAgICAgICAg ICAgfCAyNSArKysrKysrKysrKystLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cC5jICAgICAgICAgICAgICAgfCAgNCArLS0KIGRyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZl YXVfY29ubmVjdG9yLmMgICB8ICAzICstLQogaW5jbHVkZS9kcm0vZHJtX2RwX2hlbHBlci5oICAg ICAgICAgICAgICAgICAgIHwgMTQgKysrKystLS0tLS0KIDUgZmlsZXMgY2hhbmdlZCwgMjYgaW5z ZXJ0aW9ucygrKSwgMjIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fbXN0X3R5cGVzLmMgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV9tc3RfdHlwZXMuYwppbmRleCA2 ZTIwNWVlMzZhYzMuLjdmMmViNGViMTAzNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fbXN0X3R5cGVzLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fbXN0X3R5cGVzLmMKQEAgLTM5 NCw3ICszOTQsNyBAQCB2b2lkIGFtZGdwdV9kbV9pbml0aWFsaXplX2RwX2Nvbm5lY3RvcihzdHJ1 Y3QgYW1kZ3B1X2Rpc3BsYXlfbWFuYWdlciAqZG0sCiAKIAlkcm1fZHBfYXV4X3JlZ2lzdGVyKCZh Y29ubmVjdG9yLT5kbV9kcF9hdXguYXV4KTsKIAlkcm1fZHBfY2VjX3JlZ2lzdGVyX2Nvbm5lY3Rv cigmYWNvbm5lY3Rvci0+ZG1fZHBfYXV4LmF1eCwKLQkJCQkgICAgICBhY29ubmVjdG9yLT5iYXNl Lm5hbWUsIGRtLT5hZGV2LT5kZXYpOworCQkJCSAgICAgICZhY29ubmVjdG9yLT5iYXNlKTsKIAlh Y29ubmVjdG9yLT5tc3RfbWdyLmNicyA9ICZkbV9tc3RfY2JzOwogCWRybV9kcF9tc3RfdG9wb2xv Z3lfbWdyX2luaXQoCiAJCSZhY29ubmVjdG9yLT5tc3RfbWdyLApkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2RybV9kcF9jZWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZHBfY2VjLmMKaW5k ZXggYjE1Y2VlODViNzAyLi5iNDU3YzE2YzNhOGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fZHBfY2VjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9kcF9jZWMuYwpAQCAtOCw3 ICs4LDkgQEAKICNpbmNsdWRlIDxsaW51eC9rZXJuZWwuaD4KICNpbmNsdWRlIDxsaW51eC9tb2R1 bGUuaD4KICNpbmNsdWRlIDxsaW51eC9zbGFiLmg+CisjaW5jbHVkZSA8ZHJtL2RybV9jb25uZWN0 b3IuaD4KICNpbmNsdWRlIDxkcm0vZHJtX2RwX2hlbHBlci5oPgorI2luY2x1ZGUgPGRybS9kcm1Q Lmg+CiAjaW5jbHVkZSA8bWVkaWEvY2VjLmg+CiAKIC8qCkBAIC0yOTUsNyArMjk3LDEwIEBAIHN0 YXRpYyB2b2lkIGRybV9kcF9jZWNfdW5yZWdpc3Rlcl93b3JrKHN0cnVjdCB3b3JrX3N0cnVjdCAq d29yaykKICAqLwogdm9pZCBkcm1fZHBfY2VjX3NldF9lZGlkKHN0cnVjdCBkcm1fZHBfYXV4ICph dXgsIGNvbnN0IHN0cnVjdCBlZGlkICplZGlkKQogewotCXUzMiBjZWNfY2FwcyA9IENFQ19DQVBf REVGQVVMVFMgfCBDRUNfQ0FQX05FRURTX0hQRDsKKwlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29u bmVjdG9yID0gYXV4LT5jZWMuY29ubmVjdG9yOworCXUzMiBjZWNfY2FwcyA9IENFQ19DQVBfREVG QVVMVFMgfCBDRUNfQ0FQX05FRURTX0hQRCB8CisJCSAgICAgICBDRUNfQ0FQX0NPTk5FQ1RPUl9J TkZPOworCXN0cnVjdCBjZWNfY29ubmVjdG9yX2luZm8gY29ubl9pbmZvOwogCXVuc2lnbmVkIGlu dCBudW1fbGFzID0gMTsKIAl1OCBjYXA7CiAKQEAgLTM0NCwxMyArMzQ5LDE3IEBAIHZvaWQgZHJt X2RwX2NlY19zZXRfZWRpZChzdHJ1Y3QgZHJtX2RwX2F1eCAqYXV4LCBjb25zdCBzdHJ1Y3QgZWRp ZCAqZWRpZCkKIAogCS8qIENyZWF0ZSBhIG5ldyBhZGFwdGVyICovCiAJYXV4LT5jZWMuYWRhcCA9 IGNlY19hbGxvY2F0ZV9hZGFwdGVyKCZkcm1fZHBfY2VjX2FkYXBfb3BzLAotCQkJCQkgICAgIGF1 eCwgYXV4LT5jZWMubmFtZSwgY2VjX2NhcHMsCisJCQkJCSAgICAgYXV4LCBjb25uZWN0b3ItPm5h bWUsIGNlY19jYXBzLAogCQkJCQkgICAgIG51bV9sYXMpOwogCWlmIChJU19FUlIoYXV4LT5jZWMu YWRhcCkpIHsKIAkJYXV4LT5jZWMuYWRhcCA9IE5VTEw7CiAJCWdvdG8gdW5sb2NrOwogCX0KLQlp ZiAoY2VjX3JlZ2lzdGVyX2FkYXB0ZXIoYXV4LT5jZWMuYWRhcCwgYXV4LT5jZWMucGFyZW50KSkg eworCisJY2VjX2ZpbGxfY29ubl9pbmZvX2Zyb21fZHJtKCZjb25uX2luZm8sIGNvbm5lY3Rvcik7 CisJY2VjX3NfY29ubl9pbmZvKGF1eC0+Y2VjLmFkYXAsICZjb25uX2luZm8pOworCisJaWYgKGNl Y19yZWdpc3Rlcl9hZGFwdGVyKGF1eC0+Y2VjLmFkYXAsIGNvbm5lY3Rvci0+ZGV2LT5kZXYpKSB7 CiAJCWNlY19kZWxldGVfYWRhcHRlcihhdXgtPmNlYy5hZGFwKTsKIAkJYXV4LT5jZWMuYWRhcCA9 IE5VTEw7CiAJfSBlbHNlIHsKQEAgLTQwNiwyMiArNDE1LDIwIEBAIEVYUE9SVF9TWU1CT0woZHJt X2RwX2NlY191bnNldF9lZGlkKTsKIC8qKgogICogZHJtX2RwX2NlY19yZWdpc3Rlcl9jb25uZWN0 b3IoKSAtIHJlZ2lzdGVyIGEgbmV3IGNvbm5lY3RvcgogICogQGF1eDogRGlzcGxheVBvcnQgQVVY IGNoYW5uZWwKLSAqIEBuYW1lOiBuYW1lIG9mIHRoZSBDRUMgZGV2aWNlCi0gKiBAcGFyZW50OiBw YXJlbnQgZGV2aWNlCisgKiBAY29ubmVjdG9yOiBkcm0gY29ubmVjdG9yCiAgKgogICogQSBuZXcg Y29ubmVjdG9yIHdhcyByZWdpc3RlcmVkIHdpdGggYXNzb2NpYXRlZCBDRUMgYWRhcHRlciBuYW1l IGFuZAogICogQ0VDIGFkYXB0ZXIgcGFyZW50IGRldmljZS4gQWZ0ZXIgcmVnaXN0ZXJpbmcgdGhl IG5hbWUgYW5kIHBhcmVudAogICogZHJtX2RwX2NlY19zZXRfZWRpZCgpIGlzIGNhbGxlZCB0byBj aGVjayBpZiB0aGUgY29ubmVjdG9yIHN1cHBvcnRzCiAgKiBDRUMgYW5kIHRvIHJlZ2lzdGVyIGEg Q0VDIGFkYXB0ZXIgaWYgdGhhdCBpcyB0aGUgY2FzZS4KICAqLwotdm9pZCBkcm1fZHBfY2VjX3Jl Z2lzdGVyX2Nvbm5lY3RvcihzdHJ1Y3QgZHJtX2RwX2F1eCAqYXV4LCBjb25zdCBjaGFyICpuYW1l LAotCQkJCSAgIHN0cnVjdCBkZXZpY2UgKnBhcmVudCkKK3ZvaWQgZHJtX2RwX2NlY19yZWdpc3Rl cl9jb25uZWN0b3Ioc3RydWN0IGRybV9kcF9hdXggKmF1eCwKKwkJCQkgICBzdHJ1Y3QgZHJtX2Nv bm5lY3RvciAqY29ubmVjdG9yKQogewogCVdBUk5fT04oYXV4LT5jZWMuYWRhcCk7CiAJaWYgKFdB Uk5fT04oIWF1eC0+dHJhbnNmZXIpKQogCQlyZXR1cm47Ci0JYXV4LT5jZWMubmFtZSA9IG5hbWU7 Ci0JYXV4LT5jZWMucGFyZW50ID0gcGFyZW50OworCWF1eC0+Y2VjLmNvbm5lY3RvciA9IGNvbm5l Y3RvcjsKIAlJTklUX0RFTEFZRURfV09SSygmYXV4LT5jZWMudW5yZWdpc3Rlcl93b3JrLAogCQkJ ICBkcm1fZHBfY2VjX3VucmVnaXN0ZXJfd29yayk7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpp bmRleCA1NjAyNzRkMWM1MGIuLjFkZmQxNjg0OGUwMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5j CkBAIC01NTE4LDcgKzU1MTgsNiBAQCBzdGF0aWMgaW50CiBpbnRlbF9kcF9jb25uZWN0b3JfcmVn aXN0ZXIoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcikKIHsKIAlzdHJ1Y3QgaW50ZWxf ZHAgKmludGVsX2RwID0gaW50ZWxfYXR0YWNoZWRfZHAoY29ubmVjdG9yKTsKLQlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2ID0gY29ubmVjdG9yLT5kZXY7CiAJaW50IHJldDsKIAogCXJldCA9IGludGVs X2Nvbm5lY3Rvcl9yZWdpc3Rlcihjb25uZWN0b3IpOwpAQCAtNTUzMyw4ICs1NTMyLDcgQEAgaW50 ZWxfZHBfY29ubmVjdG9yX3JlZ2lzdGVyKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3Ip CiAJaW50ZWxfZHAtPmF1eC5kZXYgPSBjb25uZWN0b3ItPmtkZXY7CiAJcmV0ID0gZHJtX2RwX2F1 eF9yZWdpc3RlcigmaW50ZWxfZHAtPmF1eCk7CiAJaWYgKCFyZXQpCi0JCWRybV9kcF9jZWNfcmVn aXN0ZXJfY29ubmVjdG9yKCZpbnRlbF9kcC0+YXV4LAotCQkJCQkgICAgICBjb25uZWN0b3ItPm5h bWUsIGRldi0+ZGV2KTsKKwkJZHJtX2RwX2NlY19yZWdpc3Rlcl9jb25uZWN0b3IoJmludGVsX2Rw LT5hdXgsIGNvbm5lY3Rvcik7CiAJcmV0dXJuIHJldDsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9jb25uZWN0b3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9u b3V2ZWF1L25vdXZlYXVfY29ubmVjdG9yLmMKaW5kZXggNDExNmVlNjJhZGFmLi40NDM4ODI0Y2E4 OGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfY29ubmVjdG9y LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9jb25uZWN0b3IuYwpAQCAt MTQxMyw4ICsxNDEzLDcgQEAgbm91dmVhdV9jb25uZWN0b3JfY3JlYXRlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsCiAJc3dpdGNoICh0eXBlKSB7CiAJY2FzZSBEUk1fTU9ERV9DT05ORUNUT1JfRGlz cGxheVBvcnQ6CiAJY2FzZSBEUk1fTU9ERV9DT05ORUNUT1JfZURQOgotCQlkcm1fZHBfY2VjX3Jl Z2lzdGVyX2Nvbm5lY3RvcigmbnZfY29ubmVjdG9yLT5hdXgsCi0JCQkJCSAgICAgIGNvbm5lY3Rv ci0+bmFtZSwgZGV2LT5kZXYpOworCQlkcm1fZHBfY2VjX3JlZ2lzdGVyX2Nvbm5lY3RvcigmbnZf Y29ubmVjdG9yLT5hdXgsIGNvbm5lY3Rvcik7CiAJCWJyZWFrOwogCX0KIApkaWZmIC0tZ2l0IGEv aW5jbHVkZS9kcm0vZHJtX2RwX2hlbHBlci5oIGIvaW5jbHVkZS9kcm0vZHJtX2RwX2hlbHBlci5o CmluZGV4IDk3Y2U3OTBhNWI1YS4uZWViNDJhYmMzNDNjIDEwMDY0NAotLS0gYS9pbmNsdWRlL2Ry bS9kcm1fZHBfaGVscGVyLmgKKysrIGIvaW5jbHVkZS9kcm0vZHJtX2RwX2hlbHBlci5oCkBAIC0x MjA4LDYgKzEyMDgsNyBAQCBzdHJ1Y3QgZHJtX2RwX2F1eF9tc2cgewogCiBzdHJ1Y3QgY2VjX2Fk YXB0ZXI7CiBzdHJ1Y3QgZWRpZDsKK3N0cnVjdCBkcm1fY29ubmVjdG9yOwogCiAvKioKICAqIHN0 cnVjdCBkcm1fZHBfYXV4X2NlYyAtIERpc3BsYXlQb3J0IENFQy1UdW5uZWxpbmctb3Zlci1BVVgK QEAgLTEyMjAsOCArMTIyMSw3IEBAIHN0cnVjdCBlZGlkOwogc3RydWN0IGRybV9kcF9hdXhfY2Vj IHsKIAlzdHJ1Y3QgbXV0ZXggbG9jazsKIAlzdHJ1Y3QgY2VjX2FkYXB0ZXIgKmFkYXA7Ci0JY29u c3QgY2hhciAqbmFtZTsKLQlzdHJ1Y3QgZGV2aWNlICpwYXJlbnQ7CisJc3RydWN0IGRybV9jb25u ZWN0b3IgKmNvbm5lY3RvcjsKIAlzdHJ1Y3QgZGVsYXllZF93b3JrIHVucmVnaXN0ZXJfd29yazsK IH07CiAKQEAgLTE0MTgsOCArMTQxOCw4IEBAIGRybV9kcF9oYXNfcXVpcmsoY29uc3Qgc3RydWN0 IGRybV9kcF9kZXNjICpkZXNjLCBlbnVtIGRybV9kcF9xdWlyayBxdWlyaykKIAogI2lmZGVmIENP TkZJR19EUk1fRFBfQ0VDCiB2b2lkIGRybV9kcF9jZWNfaXJxKHN0cnVjdCBkcm1fZHBfYXV4ICph dXgpOwotdm9pZCBkcm1fZHBfY2VjX3JlZ2lzdGVyX2Nvbm5lY3RvcihzdHJ1Y3QgZHJtX2RwX2F1 eCAqYXV4LCBjb25zdCBjaGFyICpuYW1lLAotCQkJCSAgIHN0cnVjdCBkZXZpY2UgKnBhcmVudCk7 Cit2b2lkIGRybV9kcF9jZWNfcmVnaXN0ZXJfY29ubmVjdG9yKHN0cnVjdCBkcm1fZHBfYXV4ICph dXgsCisJCQkJICAgc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rvcik7CiB2b2lkIGRybV9k cF9jZWNfdW5yZWdpc3Rlcl9jb25uZWN0b3Ioc3RydWN0IGRybV9kcF9hdXggKmF1eCk7CiB2b2lk IGRybV9kcF9jZWNfc2V0X2VkaWQoc3RydWN0IGRybV9kcF9hdXggKmF1eCwgY29uc3Qgc3RydWN0 IGVkaWQgKmVkaWQpOwogdm9pZCBkcm1fZHBfY2VjX3Vuc2V0X2VkaWQoc3RydWN0IGRybV9kcF9h dXggKmF1eCk7CkBAIC0xNDI4LDkgKzE0MjgsOSBAQCBzdGF0aWMgaW5saW5lIHZvaWQgZHJtX2Rw X2NlY19pcnEoc3RydWN0IGRybV9kcF9hdXggKmF1eCkKIHsKIH0KIAotc3RhdGljIGlubGluZSB2 b2lkIGRybV9kcF9jZWNfcmVnaXN0ZXJfY29ubmVjdG9yKHN0cnVjdCBkcm1fZHBfYXV4ICphdXgs Ci0JCQkJCQkgY29uc3QgY2hhciAqbmFtZSwKLQkJCQkJCSBzdHJ1Y3QgZGV2aWNlICpwYXJlbnQp CitzdGF0aWMgaW5saW5lIHZvaWQKK2RybV9kcF9jZWNfcmVnaXN0ZXJfY29ubmVjdG9yKHN0cnVj dCBkcm1fZHBfYXV4ICphdXgsCisJCQkgICAgICBzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVj dG9yKQogewogfQogCi0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2RyaS1kZXZlbA==