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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 33B2FC388F7 for ; Fri, 13 Nov 2020 13:51:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F0AC622240 for ; Fri, 13 Nov 2020 13:51:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="gqhHrO4P" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727070AbgKMNus (ORCPT ); Fri, 13 Nov 2020 08:50:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727140AbgKMNuk (ORCPT ); Fri, 13 Nov 2020 08:50:40 -0500 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F94AC061A52 for ; Fri, 13 Nov 2020 05:50:31 -0800 (PST) Received: by mail-wm1-x343.google.com with SMTP id h62so8560592wme.3 for ; Fri, 13 Nov 2020 05:50:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LO+KljdrZZIZgFM888ZdvLp3rO45dugwj559GBfLspM=; b=gqhHrO4P9lvKa+HYQ2fMKuZWltdhYShxnRKjubXa4pkeYjg6cm0oYSWN04KBydRfbj 5xZ2YI2/94LH+so2pECsqPoAcf+BR0o7q43/+FlzcklUKJz4L9lDXIMlRRod1epVC3oV M8sG4qUPHxAFYEeHMAceOCyy4X+p8SK40cki8jMMniU96jJDDPv3BQGrUuQ6lpki01P0 FeYhR5/pNrfWIP5hY1B6nw9AeOI26/lWpJjBtVY5ZzDRCzfvDUbi16rFLVkUWShmCTUS EL6TMMFwk6DF7ZA6bIHs2zELCkw3vkNrhACOk/HAebHOltutlyByE5t2GOXWI6K1HNH/ PagA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LO+KljdrZZIZgFM888ZdvLp3rO45dugwj559GBfLspM=; b=tMB4wv8AGqy3PjsLukcb5FFHIu8hrnIPdfp36wL4K+L688jk1LT+NnYZ2cLvWnO2V3 Fq9qxKhiJsaOYPVjYjsATzHePz4s8bi93YXS1gmyW46n1UIkehAbBbT1sP+7MJvuhTrt ONxMRO1A0znBRT63Y1cnQoP0DRm8O+DyFDm0mQ9ZE4xTE9fvTooTQDe9NyITOCvhuurE Y9QPilrzSS/F6QcmSrpZglwWp8Xw1HY/OfI31PBw9dWotgrkh/YrN7oZ1aaQxAlAc3Vl kT2X1lNnqlT17R5GywI7V2FD/SaXEsow1KPRITQw4dN8vnZuvWJA6hVwJxyT5dTyqCQW jDsg== X-Gm-Message-State: AOAM531aNHmr6UXTClETjN5vyzjUZlAlnAqomazmH0ozWa/XMQo1XoH+ YrgarSvS6jd20cup34zJYObf4A== X-Google-Smtp-Source: ABdhPJzGn+znnntIyqVcelqBOU+yTpNFBD1sJ9JIuB54Ysv0RKYRALX0IbDg2r4GGu5Q0ois64zBDw== X-Received: by 2002:a1c:f31a:: with SMTP id q26mr2637187wmq.178.1605275430282; Fri, 13 Nov 2020 05:50:30 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id t11sm4561614wrm.8.2020.11.13.05.50.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Nov 2020 05:50:29 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, Rob Clark , Sean Paul , David Airlie , Daniel Vetter , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH 39/40] drm/msm/disp/dpu1/dpu_encoder: Remove a bunch of unused variables Date: Fri, 13 Nov 2020 13:49:37 +0000 Message-Id: <20201113134938.4004947-40-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201113134938.4004947-1-lee.jones@linaro.org> References: <20201113134938.4004947-1-lee.jones@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c: In function ‘dpu_encoder_virt_mode_set’: drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c:981:31: warning: variable ‘num_dspp’ set but not used [-Wunused-but-set-variable] drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c:976:30: warning: variable ‘topology’ set but not used [-Wunused-but-set-variable] drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c: In function ‘_dpu_encoder_virt_enable_helper’: drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c:1099:26: warning: variable ‘priv’ set but not used [-Wunused-but-set-variable] drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c: In function ‘dpu_encoder_virt_disable’: drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c:1210:18: warning: variable ‘dpu_kms’ set but not used [-Wunused-but-set-variable] Cc: Rob Clark Cc: Sean Paul Cc: David Airlie Cc: Daniel Vetter Cc: linux-arm-msm@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org Signed-off-by: Lee Jones --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index f7f5c258b5537..289bfb6f1861c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -973,12 +973,11 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc, struct drm_crtc *drm_crtc; struct dpu_crtc_state *cstate; struct dpu_global_state *global_state; - struct msm_display_topology topology; struct dpu_hw_blk *hw_pp[MAX_CHANNELS_PER_ENC]; struct dpu_hw_blk *hw_ctl[MAX_CHANNELS_PER_ENC]; struct dpu_hw_blk *hw_lm[MAX_CHANNELS_PER_ENC]; struct dpu_hw_blk *hw_dspp[MAX_CHANNELS_PER_ENC] = { NULL }; - int num_lm, num_ctl, num_pp, num_dspp; + int num_lm, num_ctl, num_pp; int i, j; if (!drm_enc) { @@ -1020,8 +1019,6 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc, if (drm_crtc->state->encoder_mask & drm_encoder_mask(drm_enc)) break; - topology = dpu_encoder_get_topology(dpu_enc, dpu_kms, adj_mode); - /* Query resource that have been reserved in atomic check step. */ num_pp = dpu_rm_get_assigned_resources(&dpu_kms->rm, global_state, drm_enc->base.id, DPU_HW_BLK_PINGPONG, hw_pp, @@ -1030,7 +1027,7 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc, drm_enc->base.id, DPU_HW_BLK_CTL, hw_ctl, ARRAY_SIZE(hw_ctl)); num_lm = dpu_rm_get_assigned_resources(&dpu_kms->rm, global_state, drm_enc->base.id, DPU_HW_BLK_LM, hw_lm, ARRAY_SIZE(hw_lm)); - num_dspp = dpu_rm_get_assigned_resources(&dpu_kms->rm, global_state, + dpu_rm_get_assigned_resources(&dpu_kms->rm, global_state, drm_enc->base.id, DPU_HW_BLK_DSPP, hw_dspp, ARRAY_SIZE(hw_dspp)); @@ -1096,7 +1093,6 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc, static void _dpu_encoder_virt_enable_helper(struct drm_encoder *drm_enc) { struct dpu_encoder_virt *dpu_enc = NULL; - struct msm_drm_private *priv; int i; if (!drm_enc || !drm_enc->dev) { @@ -1104,8 +1100,6 @@ static void _dpu_encoder_virt_enable_helper(struct drm_encoder *drm_enc) return; } - priv = drm_enc->dev->dev_private; - dpu_enc = to_dpu_encoder_virt(drm_enc); if (!dpu_enc || !dpu_enc->cur_master) { DPU_ERROR("invalid dpu encoder/master\n"); @@ -1207,7 +1201,6 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc) { struct dpu_encoder_virt *dpu_enc = NULL; struct msm_drm_private *priv; - struct dpu_kms *dpu_kms; int i = 0; if (!drm_enc) { @@ -1225,7 +1218,6 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc) dpu_enc->enabled = false; priv = drm_enc->dev->dev_private; - dpu_kms = to_dpu_kms(priv->kms); trace_dpu_enc_disable(DRMID(drm_enc)); -- 2.25.1 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=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 D94EFC61DD8 for ; Fri, 13 Nov 2020 13:50:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9CCF922201 for ; Fri, 13 Nov 2020 13:50:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="gqhHrO4P" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9CCF922201 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 914486E513; Fri, 13 Nov 2020 13:50:33 +0000 (UTC) Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by gabe.freedesktop.org (Postfix) with ESMTPS id A48256E519 for ; Fri, 13 Nov 2020 13:50:31 +0000 (UTC) Received: by mail-wm1-x343.google.com with SMTP id p22so8202095wmg.3 for ; Fri, 13 Nov 2020 05:50:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LO+KljdrZZIZgFM888ZdvLp3rO45dugwj559GBfLspM=; b=gqhHrO4P9lvKa+HYQ2fMKuZWltdhYShxnRKjubXa4pkeYjg6cm0oYSWN04KBydRfbj 5xZ2YI2/94LH+so2pECsqPoAcf+BR0o7q43/+FlzcklUKJz4L9lDXIMlRRod1epVC3oV M8sG4qUPHxAFYEeHMAceOCyy4X+p8SK40cki8jMMniU96jJDDPv3BQGrUuQ6lpki01P0 FeYhR5/pNrfWIP5hY1B6nw9AeOI26/lWpJjBtVY5ZzDRCzfvDUbi16rFLVkUWShmCTUS EL6TMMFwk6DF7ZA6bIHs2zELCkw3vkNrhACOk/HAebHOltutlyByE5t2GOXWI6K1HNH/ PagA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LO+KljdrZZIZgFM888ZdvLp3rO45dugwj559GBfLspM=; b=LApRawL1WFLh/5q+mmRCw988ph60SH2ABJRn/PlmA4zfmICrZeBGI3/4O7MMxQTRhy w/VwEzAI+admEiw/E3k+zA1F8opLspi7Ro0/FoKx28VA7VJjtYotYpehfT9UTr9+55/3 nMakBjN2Xh/sSv5YMzJATi/+feLQtQBRBg85Ccm4d5OlxFBg/f9Vzf67925VSzLKt746 iztynrHwhQo3EDKaIELqTTuDuuKQRL/8HfN0mMOLBaYpz3R+Ch6QRvrdB9FX2Mry7V6X bMqQt03I4zqZ+fzw+GxV9p6hU1o6tFV4F2Xt/L80Z4WWxFK50+xKg7O+hsjpW6rwtO+x lN3A== X-Gm-Message-State: AOAM532oXRP7nzU01xlcuFtYWrhcvyMQT5QDQ8Tlm4Spnnxa1ieeXstt 72LqL+jSQoDsQyfBQmcl6iD1UA== X-Google-Smtp-Source: ABdhPJzGn+znnntIyqVcelqBOU+yTpNFBD1sJ9JIuB54Ysv0RKYRALX0IbDg2r4GGu5Q0ois64zBDw== X-Received: by 2002:a1c:f31a:: with SMTP id q26mr2637187wmq.178.1605275430282; Fri, 13 Nov 2020 05:50:30 -0800 (PST) Received: from dell.default ([91.110.221.159]) by smtp.gmail.com with ESMTPSA id t11sm4561614wrm.8.2020.11.13.05.50.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Nov 2020 05:50:29 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 39/40] drm/msm/disp/dpu1/dpu_encoder: Remove a bunch of unused variables Date: Fri, 13 Nov 2020 13:49:37 +0000 Message-Id: <20201113134938.4004947-40-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201113134938.4004947-1-lee.jones@linaro.org> References: <20201113134938.4004947-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: freedreno@lists.freedesktop.org, David Airlie , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Sean Paul Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Rml4ZXMgdGhlIGZvbGxvd2luZyBXPTEga2VybmVsIGJ1aWxkIHdhcm5pbmcocyk6CgogZHJpdmVy cy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X2VuY29kZXIuYzogSW4gZnVuY3Rpb24g4oCYZHB1 X2VuY29kZXJfdmlydF9tb2RlX3NldOKAmToKIGRyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9kcHUx L2RwdV9lbmNvZGVyLmM6OTgxOjMxOiB3YXJuaW5nOiB2YXJpYWJsZSDigJhudW1fZHNwcOKAmSBz ZXQgYnV0IG5vdCB1c2VkIFstV3VudXNlZC1idXQtc2V0LXZhcmlhYmxlXQogZHJpdmVycy9ncHUv ZHJtL21zbS9kaXNwL2RwdTEvZHB1X2VuY29kZXIuYzo5NzY6MzA6IHdhcm5pbmc6IHZhcmlhYmxl IOKAmHRvcG9sb2d54oCZIHNldCBidXQgbm90IHVzZWQgWy1XdW51c2VkLWJ1dC1zZXQtdmFyaWFi bGVdCiBkcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvZHB1MS9kcHVfZW5jb2Rlci5jOiBJbiBmdW5j dGlvbiDigJhfZHB1X2VuY29kZXJfdmlydF9lbmFibGVfaGVscGVy4oCZOgogZHJpdmVycy9ncHUv ZHJtL21zbS9kaXNwL2RwdTEvZHB1X2VuY29kZXIuYzoxMDk5OjI2OiB3YXJuaW5nOiB2YXJpYWJs ZSDigJhwcml24oCZIHNldCBidXQgbm90IHVzZWQgWy1XdW51c2VkLWJ1dC1zZXQtdmFyaWFibGVd CiBkcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvZHB1MS9kcHVfZW5jb2Rlci5jOiBJbiBmdW5jdGlv biDigJhkcHVfZW5jb2Rlcl92aXJ0X2Rpc2FibGXigJk6CiBkcml2ZXJzL2dwdS9kcm0vbXNtL2Rp c3AvZHB1MS9kcHVfZW5jb2Rlci5jOjEyMTA6MTg6IHdhcm5pbmc6IHZhcmlhYmxlIOKAmGRwdV9r bXPigJkgc2V0IGJ1dCBub3QgdXNlZCBbLVd1bnVzZWQtYnV0LXNldC12YXJpYWJsZV0KCkNjOiBS b2IgQ2xhcmsgPHJvYmRjbGFya0BnbWFpbC5jb20+CkNjOiBTZWFuIFBhdWwgPHNlYW5AcG9vcmx5 LnJ1bj4KQ2M6IERhdmlkIEFpcmxpZSA8YWlybGllZEBsaW51eC5pZT4KQ2M6IERhbmllbCBWZXR0 ZXIgPGRhbmllbEBmZndsbC5jaD4KQ2M6IGxpbnV4LWFybS1tc21Admdlci5rZXJuZWwub3JnCkNj OiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCkNjOiBmcmVlZHJlbm9AbGlzdHMuZnJl ZWRlc2t0b3Aub3JnClNpZ25lZC1vZmYtYnk6IExlZSBKb25lcyA8bGVlLmpvbmVzQGxpbmFyby5v cmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X2VuY29kZXIuYyB8IDEy ICsrLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X2Vu Y29kZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9kcHUxL2RwdV9lbmNvZGVyLmMKaW5k ZXggZjdmNWMyNThiNTUzNy4uMjg5YmZiNmYxODYxYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL21zbS9kaXNwL2RwdTEvZHB1X2VuY29kZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbXNt L2Rpc3AvZHB1MS9kcHVfZW5jb2Rlci5jCkBAIC05NzMsMTIgKzk3MywxMSBAQCBzdGF0aWMgdm9p ZCBkcHVfZW5jb2Rlcl92aXJ0X21vZGVfc2V0KHN0cnVjdCBkcm1fZW5jb2RlciAqZHJtX2VuYywK IAlzdHJ1Y3QgZHJtX2NydGMgKmRybV9jcnRjOwogCXN0cnVjdCBkcHVfY3J0Y19zdGF0ZSAqY3N0 YXRlOwogCXN0cnVjdCBkcHVfZ2xvYmFsX3N0YXRlICpnbG9iYWxfc3RhdGU7Ci0Jc3RydWN0IG1z bV9kaXNwbGF5X3RvcG9sb2d5IHRvcG9sb2d5OwogCXN0cnVjdCBkcHVfaHdfYmxrICpod19wcFtN QVhfQ0hBTk5FTFNfUEVSX0VOQ107CiAJc3RydWN0IGRwdV9od19ibGsgKmh3X2N0bFtNQVhfQ0hB Tk5FTFNfUEVSX0VOQ107CiAJc3RydWN0IGRwdV9od19ibGsgKmh3X2xtW01BWF9DSEFOTkVMU19Q RVJfRU5DXTsKIAlzdHJ1Y3QgZHB1X2h3X2JsayAqaHdfZHNwcFtNQVhfQ0hBTk5FTFNfUEVSX0VO Q10gPSB7IE5VTEwgfTsKLQlpbnQgbnVtX2xtLCBudW1fY3RsLCBudW1fcHAsIG51bV9kc3BwOwor CWludCBudW1fbG0sIG51bV9jdGwsIG51bV9wcDsKIAlpbnQgaSwgajsKIAogCWlmICghZHJtX2Vu YykgewpAQCAtMTAyMCw4ICsxMDE5LDYgQEAgc3RhdGljIHZvaWQgZHB1X2VuY29kZXJfdmlydF9t b2RlX3NldChzdHJ1Y3QgZHJtX2VuY29kZXIgKmRybV9lbmMsCiAJCWlmIChkcm1fY3J0Yy0+c3Rh dGUtPmVuY29kZXJfbWFzayAmIGRybV9lbmNvZGVyX21hc2soZHJtX2VuYykpCiAJCQlicmVhazsK IAotCXRvcG9sb2d5ID0gZHB1X2VuY29kZXJfZ2V0X3RvcG9sb2d5KGRwdV9lbmMsIGRwdV9rbXMs IGFkal9tb2RlKTsKLQogCS8qIFF1ZXJ5IHJlc291cmNlIHRoYXQgaGF2ZSBiZWVuIHJlc2VydmVk IGluIGF0b21pYyBjaGVjayBzdGVwLiAqLwogCW51bV9wcCA9IGRwdV9ybV9nZXRfYXNzaWduZWRf cmVzb3VyY2VzKCZkcHVfa21zLT5ybSwgZ2xvYmFsX3N0YXRlLAogCQlkcm1fZW5jLT5iYXNlLmlk LCBEUFVfSFdfQkxLX1BJTkdQT05HLCBod19wcCwKQEAgLTEwMzAsNyArMTAyNyw3IEBAIHN0YXRp YyB2b2lkIGRwdV9lbmNvZGVyX3ZpcnRfbW9kZV9zZXQoc3RydWN0IGRybV9lbmNvZGVyICpkcm1f ZW5jLAogCQlkcm1fZW5jLT5iYXNlLmlkLCBEUFVfSFdfQkxLX0NUTCwgaHdfY3RsLCBBUlJBWV9T SVpFKGh3X2N0bCkpOwogCW51bV9sbSA9IGRwdV9ybV9nZXRfYXNzaWduZWRfcmVzb3VyY2VzKCZk cHVfa21zLT5ybSwgZ2xvYmFsX3N0YXRlLAogCQlkcm1fZW5jLT5iYXNlLmlkLCBEUFVfSFdfQkxL X0xNLCBod19sbSwgQVJSQVlfU0laRShod19sbSkpOwotCW51bV9kc3BwID0gZHB1X3JtX2dldF9h c3NpZ25lZF9yZXNvdXJjZXMoJmRwdV9rbXMtPnJtLCBnbG9iYWxfc3RhdGUsCisJZHB1X3JtX2dl dF9hc3NpZ25lZF9yZXNvdXJjZXMoJmRwdV9rbXMtPnJtLCBnbG9iYWxfc3RhdGUsCiAJCWRybV9l bmMtPmJhc2UuaWQsIERQVV9IV19CTEtfRFNQUCwgaHdfZHNwcCwKIAkJQVJSQVlfU0laRShod19k c3BwKSk7CiAKQEAgLTEwOTYsNyArMTA5Myw2IEBAIHN0YXRpYyB2b2lkIGRwdV9lbmNvZGVyX3Zp cnRfbW9kZV9zZXQoc3RydWN0IGRybV9lbmNvZGVyICpkcm1fZW5jLAogc3RhdGljIHZvaWQgX2Rw dV9lbmNvZGVyX3ZpcnRfZW5hYmxlX2hlbHBlcihzdHJ1Y3QgZHJtX2VuY29kZXIgKmRybV9lbmMp CiB7CiAJc3RydWN0IGRwdV9lbmNvZGVyX3ZpcnQgKmRwdV9lbmMgPSBOVUxMOwotCXN0cnVjdCBt c21fZHJtX3ByaXZhdGUgKnByaXY7CiAJaW50IGk7CiAKIAlpZiAoIWRybV9lbmMgfHwgIWRybV9l bmMtPmRldikgewpAQCAtMTEwNCw4ICsxMTAwLDYgQEAgc3RhdGljIHZvaWQgX2RwdV9lbmNvZGVy X3ZpcnRfZW5hYmxlX2hlbHBlcihzdHJ1Y3QgZHJtX2VuY29kZXIgKmRybV9lbmMpCiAJCXJldHVy bjsKIAl9CiAKLQlwcml2ID0gZHJtX2VuYy0+ZGV2LT5kZXZfcHJpdmF0ZTsKLQogCWRwdV9lbmMg PSB0b19kcHVfZW5jb2Rlcl92aXJ0KGRybV9lbmMpOwogCWlmICghZHB1X2VuYyB8fCAhZHB1X2Vu Yy0+Y3VyX21hc3RlcikgewogCQlEUFVfRVJST1IoImludmFsaWQgZHB1IGVuY29kZXIvbWFzdGVy XG4iKTsKQEAgLTEyMDcsNyArMTIwMSw2IEBAIHN0YXRpYyB2b2lkIGRwdV9lbmNvZGVyX3ZpcnRf ZGlzYWJsZShzdHJ1Y3QgZHJtX2VuY29kZXIgKmRybV9lbmMpCiB7CiAJc3RydWN0IGRwdV9lbmNv ZGVyX3ZpcnQgKmRwdV9lbmMgPSBOVUxMOwogCXN0cnVjdCBtc21fZHJtX3ByaXZhdGUgKnByaXY7 Ci0Jc3RydWN0IGRwdV9rbXMgKmRwdV9rbXM7CiAJaW50IGkgPSAwOwogCiAJaWYgKCFkcm1fZW5j KSB7CkBAIC0xMjI1LDcgKzEyMTgsNiBAQCBzdGF0aWMgdm9pZCBkcHVfZW5jb2Rlcl92aXJ0X2Rp c2FibGUoc3RydWN0IGRybV9lbmNvZGVyICpkcm1fZW5jKQogCWRwdV9lbmMtPmVuYWJsZWQgPSBm YWxzZTsKIAogCXByaXYgPSBkcm1fZW5jLT5kZXYtPmRldl9wcml2YXRlOwotCWRwdV9rbXMgPSB0 b19kcHVfa21zKHByaXYtPmttcyk7CiAKIAl0cmFjZV9kcHVfZW5jX2Rpc2FibGUoRFJNSUQoZHJt X2VuYykpOwogCi0tIAoyLjI1LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2RyaS1kZXZlbAo=