From patchwork Fri Jun 17 23:24:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 12886102 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 3C92FC433EF for ; Fri, 17 Jun 2022 23:24:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2A16110E242; Fri, 17 Jun 2022 23:24:39 +0000 (UTC) Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by gabe.freedesktop.org (Postfix) with ESMTPS id AAD0610E242 for ; Fri, 17 Jun 2022 23:24:37 +0000 (UTC) Received: by mail-lj1-x229.google.com with SMTP id l18so6169339lje.13 for ; Fri, 17 Jun 2022 16:24:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=V3CoSuB4D5qInJIqDTgQj0Rw+X+4vfSubGhWpl0S/2Q=; b=Z+mW8n/vzz2WwQ8BmJtwxjGoBuU8ju8kzUyG9femrn7n6qDgnDFA3Z+bHo++Qi9POf QRc8LwhGzFscD8ICBYEvF7Ny85JNxxMsdz5/JkWnKRtRq2x3ceFvVvyifySutuNuru7J 7HBho3f8PuULqNWNDdrTg1PAPpChWW2NVVwqvrO8MPCXTEl36y0eUDKNBUL5ar5w6S82 u1pWLrh/2fOPhGd2BsL85yzo5WCJl4xTZvKrpO2jeRtJucFFfe+R/+86NF1/VGUVH6dj /h0JW1tsZk7DgT10xNcwktf8Kes5jdTMvqaGe8mYybdcD9laT4q+MkD5kyILOuV9j3Qa msKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=V3CoSuB4D5qInJIqDTgQj0Rw+X+4vfSubGhWpl0S/2Q=; b=qoBFi+kmIDX+h9VqpeFpl/hQCiO2dq/2Hcf2RzF495dSpvEOdlKPWLc54Rnii1dkkI iMWaY7vID24YF/6gHGZ9z21n9O1h8dV0rn8x0mgY1ldA7urJiAIom5FcE4SNgZ8TugR9 HkzKcrdnZCrzbdk4kaS5RAfG4Iyy+OVwiwZL8GXuhv7R/eGTHWnBv+Pkn+xM4WDgDGK8 c5bV8t6S7X3Mm4Crh0/xzOWTLtY3UIiUeh4df5ROAHBI0Y3igS7b34DG9biEPmreWE84 CIr0Yag/eJ5w5CiIVk42emR8BYi8jZwnavkt1ttQe4JkQQTa0p55IxbtAS2Lrrbg0GjB 2Ozg== X-Gm-Message-State: AJIora+dSRykSUu5WuNF8mSjhTe/4Jm2RZkNWJbB6/u9xm9WFlhM0nW9 p7dUlubQwMce+B7GYdS5fy/TUQ== X-Google-Smtp-Source: AGRyM1v4Kt1s+lv2jMlNJEh5BGzkXvB/hPQ0IvYIrRfGYdlkZA6sSojphvexXEm4aRL63Bp96r/3MA== X-Received: by 2002:a05:651c:23b:b0:259:fee:cc2a with SMTP id z27-20020a05651c023b00b002590feecc2amr6118733ljn.400.1655508275957; Fri, 17 Jun 2022 16:24:35 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id a7-20020a194f47000000b00478f9517a60sm802742lfk.38.2022.06.17.16.24.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 16:24:35 -0700 (PDT) From: Dmitry Baryshkov To: Rob Clark , Sean Paul , Abhinav Kumar Subject: [PATCH v2 1/3] drm/msm/dp: remove unused stubs Date: Sat, 18 Jun 2022 02:24:32 +0300 Message-Id: <20220617232434.1139950-1-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 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: David Airlie , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, Bjorn Andersson , Stephen Boyd , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Refactoring DP code transformed several functions into empty stubs. Remove them. Reviewed-by: Stephen Boyd Signed-off-by: Dmitry Baryshkov Reviewed-by: Kuogee Hsieh --- drivers/gpu/drm/msm/dp/dp_display.c | 35 ----------------------------- 1 file changed, 35 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 08e3f0b1b395..fea610793dc4 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -857,11 +857,6 @@ static int dp_display_set_mode(struct msm_dp *dp_display, return 0; } -static int dp_display_prepare(struct msm_dp *dp_display) -{ - return 0; -} - static int dp_display_enable(struct dp_display_private *dp, u32 data) { int rc = 0; @@ -938,11 +933,6 @@ static int dp_display_disable(struct dp_display_private *dp, u32 data) return 0; } -static int dp_display_unprepare(struct msm_dp *dp_display) -{ - return 0; -} - int dp_display_set_plugged_cb(struct msm_dp *dp_display, hdmi_codec_plugged_cb fn, struct device *codec_dev) { @@ -1458,21 +1448,9 @@ static int dp_pm_suspend(struct device *dev) return 0; } -static int dp_pm_prepare(struct device *dev) -{ - return 0; -} - -static void dp_pm_complete(struct device *dev) -{ - -} - static const struct dev_pm_ops dp_pm_ops = { .suspend = dp_pm_suspend, .resume = dp_pm_resume, - .prepare = dp_pm_prepare, - .complete = dp_pm_complete, }; static struct platform_driver dp_display_driver = { @@ -1686,13 +1664,6 @@ void dp_bridge_enable(struct drm_bridge *drm_bridge) return; } - rc = dp_display_prepare(dp); - if (rc) { - DRM_ERROR("DP display prepare failed, rc=%d\n", rc); - mutex_unlock(&dp_display->event_mutex); - return; - } - state = dp_display->hpd_state; if (state == ST_DISPLAY_OFF) { @@ -1706,7 +1677,6 @@ void dp_bridge_enable(struct drm_bridge *drm_bridge) if (rc) { DRM_ERROR("DP display post enable failed, rc=%d\n", rc); dp_display_disable(dp_display, 0); - dp_display_unprepare(dp); } /* completed connection */ @@ -1731,7 +1701,6 @@ void dp_bridge_post_disable(struct drm_bridge *drm_bridge) { struct msm_dp_bridge *dp_bridge = to_dp_bridge(drm_bridge); struct msm_dp *dp = dp_bridge->dp_display; - int rc = 0; u32 state; struct dp_display_private *dp_display; @@ -1750,10 +1719,6 @@ void dp_bridge_post_disable(struct drm_bridge *drm_bridge) dp_display_disable(dp_display, 0); - rc = dp_display_unprepare(dp); - if (rc) - DRM_ERROR("DP display unprepare failed, rc=%d\n", rc); - state = dp_display->hpd_state; if (state == ST_DISCONNECT_PENDING) { /* completed disconnection */ From patchwork Fri Jun 17 23:24:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 12886103 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 15B01C433EF for ; Fri, 17 Jun 2022 23:24:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9D59D10E338; Fri, 17 Jun 2022 23:24:39 +0000 (UTC) Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by gabe.freedesktop.org (Postfix) with ESMTPS id 995AD10E242 for ; Fri, 17 Jun 2022 23:24:38 +0000 (UTC) Received: by mail-lj1-x234.google.com with SMTP id s10so6170784ljh.12 for ; Fri, 17 Jun 2022 16:24:38 -0700 (PDT) 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=JZ+dOp4Z4kFod4DkYa3/glNVXupx/hzcZ+pGIy9A73g=; b=kTPE8xQhlnU+DF0lB6ZBnP2DBaScpH/GKYgCRgU9jdOZhhhjO5q7xfPr468LCdVrmA qyghjqWpxUUN/S5+6BHoW3NX2bmMFJJT3/M8osRP333bBU+RkZxhB2JvE/MioL3+daeU r/z3mCsnGIyxP0WWS1StHzY7NS4Vkw4Mn01NNKrP/DvTG0RkrCvvOJsXMC5pzqvE9Gzv /pPol/JmJeCW+NGmCXEiRGpsM9jrk4XnQj+je9CnNNabemNjd5/Lnvnrw+HlQRPRe03M NtkomSaRN0+pc7Tv3m+AkAOFcF6yu2ZrF0w2iYtj4NmSnF83kfK0rh0yVVVOfSuc8f4B qecQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JZ+dOp4Z4kFod4DkYa3/glNVXupx/hzcZ+pGIy9A73g=; b=PA0Vu//HA6/7WExQHOpQG3pVoqR0wdd2xnAUtz4R2P8RM3FSP8Mfi4TJCTvGci1lbr 7AynVxWytmom3p2Ftds7wGv/J43cI76c3YZN7A/jn/fe/488vGkDQWEYsMd6VuW16bnk 7cdzmUTUP4FHRwkJWqlTHjIe865A154yTJAkMyL+TKALdUvGfV1IMvt4wsKVIXFiKsl2 7yzHgWeX2ryzCG74tu5D/nK+Lf2Dcmc5qMC4oNkwb5luHoadzJtqT/E/RfyUjBnVYbH8 yiZv0JmsMkxWVkFzmXoau6RBsporWXW9InsYGaS/k3f/taNsXjQUbpzxq44mx5rqlkyp nK4A== X-Gm-Message-State: AJIora8k6xg/Hf31yopRh4puZXrfha3m5qraoFabJ8QYdJcRURXSPa83 EPvIKGQHne/n5U2ZpgfSVJe+0Q== X-Google-Smtp-Source: AGRyM1sN+iG8PVMK7zauSWr0l9ms1QCEcumjsR+hlo6UhXmunHRrJEOs5wRGS3LMnxi0VnSWb4Xywg== X-Received: by 2002:a2e:875a:0:b0:25a:4307:dd4c with SMTP id q26-20020a2e875a000000b0025a4307dd4cmr6091853ljj.32.1655508276960; Fri, 17 Jun 2022 16:24:36 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id a7-20020a194f47000000b00478f9517a60sm802742lfk.38.2022.06.17.16.24.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 16:24:36 -0700 (PDT) From: Dmitry Baryshkov To: Rob Clark , Sean Paul , Abhinav Kumar Subject: [PATCH v2 2/3] drm/msm/dp: rename second dp_display_enable()'s argument Date: Sat, 18 Jun 2022 02:24:33 +0300 Message-Id: <20220617232434.1139950-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220617232434.1139950-1-dmitry.baryshkov@linaro.org> References: <20220617232434.1139950-1-dmitry.baryshkov@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: David Airlie , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, Bjorn Andersson , Stephen Boyd , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To follow up recent changes, rename (and change type of) second dp_display_enable()'s argument from generic u32 data to bool force_link_train, which is later passed to dp_ctrl_on_stream(). Signed-off-by: Dmitry Baryshkov Reviewed-by: Kuogee Hsieh --- Changes since v1: - Added patch --- drivers/gpu/drm/msm/dp/dp_display.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index fea610793dc4..96defacc92dc 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -608,7 +608,7 @@ static int dp_hpd_plug_handle(struct dp_display_private *dp, u32 data) return 0; }; -static int dp_display_enable(struct dp_display_private *dp, u32 data); +static int dp_display_enable(struct dp_display_private *dp, bool force_link_train); static int dp_display_disable(struct dp_display_private *dp, u32 data); static void dp_display_handle_plugged_change(struct msm_dp *dp_display, @@ -857,7 +857,7 @@ static int dp_display_set_mode(struct msm_dp *dp_display, return 0; } -static int dp_display_enable(struct dp_display_private *dp, u32 data) +static int dp_display_enable(struct dp_display_private *dp, bool force_link_train) { int rc = 0; struct msm_dp *dp_display = &dp->dp_display; @@ -868,7 +868,7 @@ static int dp_display_enable(struct dp_display_private *dp, u32 data) return 0; } - rc = dp_ctrl_on_stream(dp->ctrl, data); + rc = dp_ctrl_on_stream(dp->ctrl, force_link_train); if (!rc) dp_display->power_on = true; From patchwork Fri Jun 17 23:24:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 12886104 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id B9AE7C43334 for ; Fri, 17 Jun 2022 23:24:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7384210F57C; Fri, 17 Jun 2022 23:24:41 +0000 (UTC) Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by gabe.freedesktop.org (Postfix) with ESMTPS id C105010EEAE for ; Fri, 17 Jun 2022 23:24:39 +0000 (UTC) Received: by mail-lj1-x236.google.com with SMTP id s10so6170818ljh.12 for ; Fri, 17 Jun 2022 16:24:39 -0700 (PDT) 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=e45UG9mTlTJvPbiZWbY0ZYbiN8aB8KaEsAK9Yi9aKWU=; b=qSUG0lk3OoQ2cOPgN6PQc4jGVavTHVqq4u00LXAjSMmFKrF5QDWtkTU6pm2qnWsdJB /lK2RLjATzgI9VDLgQqxa4txNnKq5Du3M6PRCcNYBNTorZsToEIsRZWSuxV9tUeN+m/W cFBlo0VRTIv9cbh9+r9ATpMcVJTdNYezumpdXRvsEDI0VEyoec0vOPnqp3Yuu9d07V3A 8gjRTi2qH1PvQ6Cy9RTIoDdgOuD9GjxThUUzgqCPmsTPMSR3zulHetn9qMMC7UF43CQs oSI1vig3ERY0EDyzSL98+qI4eLqXE3qW3Vg+e7eBvz9aJ75A4n3Lp1qDDF84UoE3De4b LGRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=e45UG9mTlTJvPbiZWbY0ZYbiN8aB8KaEsAK9Yi9aKWU=; b=E2AEtP0gAy5sD9ZR9h5NDkNYEytHmQMk/0T7q9frYMa5vRhanfpoFDvh5ELNe3KDgJ FIorjv2eHgqI/nJw9WsVIhQryR2npUUNgJdMdANL1pYf51fzOWMLY/iLfyLJ7FuG2pCo hjOt6H+G9qtVi/eBdUcCTyCuNEmRE4fIZ1FoYR1R2RlFuH+6GVrcXIczm8kBFwWqEfoj o61FLfQBUFBnNkuoQNBxs8diKUOBXFU/Ehf9aFSJqvu5U0ShqFKYLLneRjq5olF0I/Fp iyPz4Us0Z/lLN5S/uno5P0ly7RU0N7PwqH1s2tO2u5btAo7K1WrfgIlFuLiyc9al/VSX 4TSw== X-Gm-Message-State: AJIora9przIX2QThfVJKtY03YalxYT1fo3UOCmcICHt4TkdndSuhwiJn t5NXTRNhAjpo38VFriAfUVL32g== X-Google-Smtp-Source: AGRyM1sAbE/LZM8y3KLOdVfrC2vhIFcVXRKQL12NmosiqD2uFaZO7EUb106lmfkZr7u8XkIT1Uwe6Q== X-Received: by 2002:a2e:9781:0:b0:24a:fb54:31d3 with SMTP id y1-20020a2e9781000000b0024afb5431d3mr6146842lji.242.1655508277901; Fri, 17 Jun 2022 16:24:37 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id a7-20020a194f47000000b00478f9517a60sm802742lfk.38.2022.06.17.16.24.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 16:24:37 -0700 (PDT) From: Dmitry Baryshkov To: Rob Clark , Sean Paul , Abhinav Kumar Subject: [PATCH v2 3/3] drm/msm/dp: remove dp_display_en/disable prototypes and data argument Date: Sat, 18 Jun 2022 02:24:34 +0300 Message-Id: <20220617232434.1139950-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220617232434.1139950-1-dmitry.baryshkov@linaro.org> References: <20220617232434.1139950-1-dmitry.baryshkov@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: David Airlie , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, Bjorn Andersson , Stephen Boyd , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Remove unused dp_display_en/disable prototypes. While we are at it, remove extra 'data' argument that is unused. Signed-off-by: Dmitry Baryshkov Reviewed-by: Kuogee Hsieh --- Changes since v1: - Rebased and dropped the dp_display_enable() chunk --- drivers/gpu/drm/msm/dp/dp_display.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 96defacc92dc..c17a799d3009 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -608,9 +608,6 @@ static int dp_hpd_plug_handle(struct dp_display_private *dp, u32 data) return 0; }; -static int dp_display_enable(struct dp_display_private *dp, bool force_link_train); -static int dp_display_disable(struct dp_display_private *dp, u32 data); - static void dp_display_handle_plugged_change(struct msm_dp *dp_display, bool plugged) { @@ -894,7 +891,7 @@ static int dp_display_post_enable(struct msm_dp *dp_display) return 0; } -static int dp_display_disable(struct dp_display_private *dp, u32 data) +static int dp_display_disable(struct dp_display_private *dp) { struct msm_dp *dp_display = &dp->dp_display; @@ -1676,7 +1673,7 @@ void dp_bridge_enable(struct drm_bridge *drm_bridge) rc = dp_display_post_enable(dp); if (rc) { DRM_ERROR("DP display post enable failed, rc=%d\n", rc); - dp_display_disable(dp_display, 0); + dp_display_disable(dp_display); } /* completed connection */ @@ -1717,7 +1714,7 @@ void dp_bridge_post_disable(struct drm_bridge *drm_bridge) return; } - dp_display_disable(dp_display, 0); + dp_display_disable(dp_display); state = dp_display->hpd_state; if (state == ST_DISCONNECT_PENDING) {