From nobody Mon Apr 27 03:25:11 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C964C433EF for ; Fri, 17 Jun 2022 20:47:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1382725AbiFQUr6 (ORCPT ); Fri, 17 Jun 2022 16:47:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1359556AbiFQUry (ORCPT ); Fri, 17 Jun 2022 16:47:54 -0400 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE6BE65A4 for ; Fri, 17 Jun 2022 13:47:53 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id x138so5077231pfc.12 for ; Fri, 17 Jun 2022 13:47:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ByN+wCXaOxi271nnEIZ20wtThFUPoDse0EkNhfr7LCE=; b=eIwcGaOBfUoWV4QGJeTDfvsmyotQRYQB6zsaQIRyV1maGpuVoPAlQB3RThmxv4Hos8 jj4yc7Rufi0MaAymjjwUWqflreOIgzvMyGYd/Z4cQTmiokLd6qUkFa0MYo1Y1nee+b/g sf5w340ndmzZ6mbvxm9sfKgndB7bSzaASL6vI= 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=ByN+wCXaOxi271nnEIZ20wtThFUPoDse0EkNhfr7LCE=; b=7IffAy4orfYKo/AA4T2RkHkApDmjVOQAsvq4MNt4gi/UuZi77BAcLM1MiSk7xVaZj+ eLeFUtAeGodX+1gAFouqPCY0nH5DF+WPFTnW5zKb9+KGXswYVAmbJ6G9kHQTb+PupZTo nRX6gWnBedL6B/4XJhRfeQYdirMCrw0EqqqQDRt9CT3q0g8QOmbB8rrmnYpCwzvk7/MJ ZGzRZyEIQ1D1QxYA/jdOVS/1/jLDcv+sJENWaJ5v4w4Iy8XLSl7yqvW3uLaMzGlgGdON t+JNN+BZ67NaU1e1wZtV0PRasbhHGeiVwc6YT7lDsTK6hmKNo2CxvurnW3F3VAd6rh3B Mo1g== X-Gm-Message-State: AJIora9QahiZW8o+s9b+Bev1Y29u6e/wanHpKOebycmDII5xUcscY3FK 0EagqW5w3dIyZeRspBP+1tk8Bg== X-Google-Smtp-Source: AGRyM1slGiViNrdzjVzcJOZuNc8QQfUtUDCVS+hnpTK9qGAD4qXmlvfW7+GU2rKzC3z/BPQ12WJFmQ== X-Received: by 2002:a63:140e:0:b0:408:a923:1a81 with SMTP id u14-20020a63140e000000b00408a9231a81mr10419194pgl.358.1655498873182; Fri, 17 Jun 2022 13:47:53 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:201:52e2:7dc8:1e20:f870]) by smtp.gmail.com with ESMTPSA id z12-20020aa79f8c000000b0052089e1b88esm4098325pfr.192.2022.06.17.13.47.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 13:47:52 -0700 (PDT) From: Stephen Boyd To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov Cc: linux-kernel@vger.kernel.org, patches@lists.linux.dev, Sean Paul , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, Kuogee Hsieh Subject: [PATCH 1/3] drm/msm/dp: Reorganize code to avoid forward declaration Date: Fri, 17 Jun 2022 13:47:48 -0700 Message-Id: <20220617204750.2347797-2-swboyd@chromium.org> X-Mailer: git-send-email 2.36.1.476.g0c4daa206d-goog In-Reply-To: <20220617204750.2347797-1-swboyd@chromium.org> References: <20220617204750.2347797-1-swboyd@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Let's move these functions around to avoid having to forward declare dp_ctrl_on_stream_phy_test_report(). Also remove dp_ctrl_reinitialize_mainlink() forward declaration because we're doing that sort of task. Cc: Kuogee Hsieh Signed-off-by: Stephen Boyd Reviewed-by: Dmitry Baryshkov Reviewed-by: Kuogee Hsieh --- drivers/gpu/drm/msm/dp/dp_ctrl.c | 104 +++++++++++++++---------------- 1 file changed, 50 insertions(+), 54 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_c= trl.c index 703249384e7c..bd445e683cfc 100644 --- a/drivers/gpu/drm/msm/dp/dp_ctrl.c +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c @@ -1238,8 +1238,6 @@ static int dp_ctrl_link_train_2(struct dp_ctrl_privat= e *ctrl, return -ETIMEDOUT; } =20 -static int dp_ctrl_reinitialize_mainlink(struct dp_ctrl_private *ctrl); - static int dp_ctrl_link_train(struct dp_ctrl_private *ctrl, int *training_step) { @@ -1534,38 +1532,6 @@ static int dp_ctrl_link_maintenance(struct dp_ctrl_p= rivate *ctrl) return ret; } =20 -static int dp_ctrl_on_stream_phy_test_report(struct dp_ctrl *dp_ctrl); - -static int dp_ctrl_process_phy_test_request(struct dp_ctrl_private *ctrl) -{ - int ret =3D 0; - - if (!ctrl->link->phy_params.phy_test_pattern_sel) { - drm_dbg_dp(ctrl->drm_dev, - "no test pattern selected by sink\n"); - return ret; - } - - /* - * The global reset will need DP link related clocks to be - * running. Add the global reset just before disabling the - * link clocks and core clocks. - */ - ret =3D dp_ctrl_off(&ctrl->dp_ctrl); - if (ret) { - DRM_ERROR("failed to disable DP controller\n"); - return ret; - } - - ret =3D dp_ctrl_on_link(&ctrl->dp_ctrl); - if (!ret) - ret =3D dp_ctrl_on_stream_phy_test_report(&ctrl->dp_ctrl); - else - DRM_ERROR("failed to enable DP link controller\n"); - - return ret; -} - static bool dp_ctrl_send_phy_test_pattern(struct dp_ctrl_private *ctrl) { bool success =3D false; @@ -1618,6 +1584,56 @@ static bool dp_ctrl_send_phy_test_pattern(struct dp_= ctrl_private *ctrl) return success; } =20 +static int dp_ctrl_on_stream_phy_test_report(struct dp_ctrl *dp_ctrl) +{ + int ret; + struct dp_ctrl_private *ctrl; + + ctrl =3D container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); + + ctrl->dp_ctrl.pixel_rate =3D ctrl->panel->dp_mode.drm_mode.clock; + + ret =3D dp_ctrl_enable_stream_clocks(ctrl); + if (ret) { + DRM_ERROR("Failed to start pixel clocks. ret=3D%d\n", ret); + return ret; + } + + dp_ctrl_send_phy_test_pattern(ctrl); + + return 0; +} + +static int dp_ctrl_process_phy_test_request(struct dp_ctrl_private *ctrl) +{ + int ret =3D 0; + + if (!ctrl->link->phy_params.phy_test_pattern_sel) { + drm_dbg_dp(ctrl->drm_dev, + "no test pattern selected by sink\n"); + return ret; + } + + /* + * The global reset will need DP link related clocks to be + * running. Add the global reset just before disabling the + * link clocks and core clocks. + */ + ret =3D dp_ctrl_off(&ctrl->dp_ctrl); + if (ret) { + DRM_ERROR("failed to disable DP controller\n"); + return ret; + } + + ret =3D dp_ctrl_on_link(&ctrl->dp_ctrl); + if (!ret) + ret =3D dp_ctrl_on_stream_phy_test_report(&ctrl->dp_ctrl); + else + DRM_ERROR("failed to enable DP link controller\n"); + + return ret; +} + void dp_ctrl_handle_sink_request(struct dp_ctrl *dp_ctrl) { struct dp_ctrl_private *ctrl; @@ -1815,26 +1831,6 @@ static int dp_ctrl_link_retrain(struct dp_ctrl_priva= te *ctrl) return dp_ctrl_setup_main_link(ctrl, &training_step); } =20 -static int dp_ctrl_on_stream_phy_test_report(struct dp_ctrl *dp_ctrl) -{ - int ret; - struct dp_ctrl_private *ctrl; - - ctrl =3D container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); - - ctrl->dp_ctrl.pixel_rate =3D ctrl->panel->dp_mode.drm_mode.clock; - - ret =3D dp_ctrl_enable_stream_clocks(ctrl); - if (ret) { - DRM_ERROR("Failed to start pixel clocks. ret=3D%d\n", ret); - return ret; - } - - dp_ctrl_send_phy_test_pattern(ctrl); - - return 0; -} - int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl, bool force_link_train) { int ret =3D 0; --=20 https://chromeos.dev From nobody Mon Apr 27 03:25:11 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D309C43334 for ; Fri, 17 Jun 2022 20:48:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1382864AbiFQUsB (ORCPT ); Fri, 17 Jun 2022 16:48:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377905AbiFQUrz (ORCPT ); Fri, 17 Jun 2022 16:47:55 -0400 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3BFE2BC1 for ; Fri, 17 Jun 2022 13:47:54 -0700 (PDT) Received: by mail-pf1-x430.google.com with SMTP id s37so5078202pfg.11 for ; Fri, 17 Jun 2022 13:47:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MMNoixv5Y3qsAebD0G5IYmMWYO2NVrDKFpWelKo7ZYA=; b=DwAKj5hU7XxEk73p7uOwKh762e+QzETDqC3hbDVnRwxMQBTNbMPnGkmQmqIVFRBM6Z 2uL2Ym278pMDCX5cvIMB9388irWNnAoFG5Aur+lP8NVPwUS1C8RlH3hUT2mAEfw8h2h1 RlHIwiEYwL2gQ8OoqXgoGmiFgA5eHjBDKezQY= 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=MMNoixv5Y3qsAebD0G5IYmMWYO2NVrDKFpWelKo7ZYA=; b=Qm9Iv0q/JoHVH3oBWBanJ3r/us0pZ+XPDEUJKE7UumUgE5JDW7DGQi/iUJpJxn0KKW 5nRVdRCNYwbeAlLHu/vdUWPPJTtJ3nHtr/HP4WagayfHSzGr2pi5RRUBIkSdU5y8pK7Z M7MR+ZkTTzrx8WtK/rCUo6qsITtUocHDgiS92joHxhZpAEaCWEYnBFZaUAN+r25qO55/ wBl5QaWBhcehNKJmw4QblDBZwkcm7EFUt/XVTO/VLvdOlDb9ROeKq0P+4ycO8GEi+jlu SKIQWsKU4q6cJzcTPTAPx22Ykqc9wgYNgYPbX8EjIl1ismuXFDEW/WUHrbnj3dQh0s2n U3+g== X-Gm-Message-State: AJIora9xT19KQbr6g9/OwHo6BmGrurBq6KJIp6mnVONM+aJn6RPAAxMr Za6TS3Hi9cE/V5lsh+nvewp/ZA== X-Google-Smtp-Source: AGRyM1u+s+YlgWsAAWnGZ5F3EpyUl3ftH+1yKIqhCN/cckxSBSkKmkSwxL2gzegku6DKprMS5XgWkQ== X-Received: by 2002:a05:6a00:2311:b0:4e1:52bf:e466 with SMTP id h17-20020a056a00231100b004e152bfe466mr12007494pfh.77.1655498874110; Fri, 17 Jun 2022 13:47:54 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:201:52e2:7dc8:1e20:f870]) by smtp.gmail.com with ESMTPSA id z12-20020aa79f8c000000b0052089e1b88esm4098325pfr.192.2022.06.17.13.47.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 13:47:53 -0700 (PDT) From: Stephen Boyd To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov Cc: linux-kernel@vger.kernel.org, patches@lists.linux.dev, Sean Paul , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, Kuogee Hsieh Subject: [PATCH 2/3] drm/msm/dp: Remove pixel_rate from struct dp_ctrl Date: Fri, 17 Jun 2022 13:47:49 -0700 Message-Id: <20220617204750.2347797-3-swboyd@chromium.org> X-Mailer: git-send-email 2.36.1.476.g0c4daa206d-goog In-Reply-To: <20220617204750.2347797-1-swboyd@chromium.org> References: <20220617204750.2347797-1-swboyd@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This struct member is stored to in the function that calls the function which uses it. That's possible with a function argument instead of storing to a struct member. Pass the pixel_rate as an argument instead to simplify the code. Note that dp_ctrl_link_maintenance() was storing the pixel_rate but never using it so we just remove the assignment from there. Cc: Kuogee Hsieh Signed-off-by: Stephen Boyd --- drivers/gpu/drm/msm/dp/dp_ctrl.c | 57 ++++++++++++++++---------------- drivers/gpu/drm/msm/dp/dp_ctrl.h | 1 - 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_c= trl.c index bd445e683cfc..e114521af2e9 100644 --- a/drivers/gpu/drm/msm/dp/dp_ctrl.c +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c @@ -1336,7 +1336,7 @@ static void dp_ctrl_set_clock_rate(struct dp_ctrl_pri= vate *ctrl, name, rate); } =20 -static int dp_ctrl_enable_mainlink_clocks(struct dp_ctrl_private *ctrl) +static int dp_ctrl_enable_mainlink_clocks(struct dp_ctrl_private *ctrl, un= signed long pixel_rate) { int ret =3D 0; struct dp_io *dp_io =3D &ctrl->parser->io; @@ -1357,25 +1357,25 @@ static int dp_ctrl_enable_mainlink_clocks(struct dp= _ctrl_private *ctrl) if (ret) DRM_ERROR("Unable to start link clocks. ret=3D%d\n", ret); =20 - drm_dbg_dp(ctrl->drm_dev, "link rate=3D%d pixel_clk=3D%d\n", - ctrl->link->link_params.rate, ctrl->dp_ctrl.pixel_rate); + drm_dbg_dp(ctrl->drm_dev, "link rate=3D%d pixel_clk=3D%lu\n", + ctrl->link->link_params.rate, pixel_rate); =20 return ret; } =20 -static int dp_ctrl_enable_stream_clocks(struct dp_ctrl_private *ctrl) +static int dp_ctrl_enable_stream_clocks(struct dp_ctrl_private *ctrl, + unsigned long pixel_rate) { - int ret =3D 0; + int ret; =20 - dp_ctrl_set_clock_rate(ctrl, DP_STREAM_PM, "stream_pixel", - ctrl->dp_ctrl.pixel_rate * 1000); + dp_ctrl_set_clock_rate(ctrl, DP_STREAM_PM, "stream_pixel", pixel_rate * 1= 000); =20 ret =3D dp_power_clk_enable(ctrl->power, DP_STREAM_PM, true); if (ret) DRM_ERROR("Unabled to start pixel clocks. ret=3D%d\n", ret); =20 - drm_dbg_dp(ctrl->drm_dev, "link rate=3D%d pixel_clk=3D%d\n", - ctrl->link->link_params.rate, ctrl->dp_ctrl.pixel_rate); + drm_dbg_dp(ctrl->drm_dev, "link rate=3D%d pixel_clk=3D%lu\n", + ctrl->link->link_params.rate, pixel_rate); =20 return ret; } @@ -1445,7 +1445,7 @@ static bool dp_ctrl_use_fixed_nvid(struct dp_ctrl_pri= vate *ctrl) return false; } =20 -static int dp_ctrl_reinitialize_mainlink(struct dp_ctrl_private *ctrl) +static int dp_ctrl_reinitialize_mainlink(struct dp_ctrl_private *ctrl, uns= igned long pixel_rate) { int ret =3D 0; struct dp_io *dp_io =3D &ctrl->parser->io; @@ -1469,7 +1469,7 @@ static int dp_ctrl_reinitialize_mainlink(struct dp_ct= rl_private *ctrl) /* hw recommended delay before re-enabling clocks */ msleep(20); =20 - ret =3D dp_ctrl_enable_mainlink_clocks(ctrl); + ret =3D dp_ctrl_enable_mainlink_clocks(ctrl, pixel_rate); if (ret) { DRM_ERROR("Failed to enable mainlink clks. ret=3D%d\n", ret); return ret; @@ -1517,8 +1517,6 @@ static int dp_ctrl_link_maintenance(struct dp_ctrl_pr= ivate *ctrl) ctrl->link->phy_params.p_level =3D 0; ctrl->link->phy_params.v_level =3D 0; =20 - ctrl->dp_ctrl.pixel_rate =3D ctrl->panel->dp_mode.drm_mode.clock; - ret =3D dp_ctrl_setup_main_link(ctrl, &training_step); if (ret) goto end; @@ -1588,12 +1586,12 @@ static int dp_ctrl_on_stream_phy_test_report(struct= dp_ctrl *dp_ctrl) { int ret; struct dp_ctrl_private *ctrl; + unsigned long pixel_rate; =20 ctrl =3D container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); =20 - ctrl->dp_ctrl.pixel_rate =3D ctrl->panel->dp_mode.drm_mode.clock; - - ret =3D dp_ctrl_enable_stream_clocks(ctrl); + pixel_rate =3D ctrl->panel->dp_mode.drm_mode.clock; + ret =3D dp_ctrl_enable_stream_clocks(ctrl, pixel_rate); if (ret) { DRM_ERROR("Failed to start pixel clocks. ret=3D%d\n", ret); return ret; @@ -1709,6 +1707,7 @@ int dp_ctrl_on_link(struct dp_ctrl *dp_ctrl) u32 const phy_cts_pixel_clk_khz =3D 148500; u8 link_status[DP_LINK_STATUS_SIZE]; unsigned int training_step; + unsigned long pixel_rate; =20 if (!dp_ctrl) return -EINVAL; @@ -1723,25 +1722,25 @@ int dp_ctrl_on_link(struct dp_ctrl *dp_ctrl) drm_dbg_dp(ctrl->drm_dev, "using phy test link parameters\n"); if (!ctrl->panel->dp_mode.drm_mode.clock) - ctrl->dp_ctrl.pixel_rate =3D phy_cts_pixel_clk_khz; + pixel_rate =3D phy_cts_pixel_clk_khz; } else { ctrl->link->link_params.rate =3D rate; ctrl->link->link_params.num_lanes =3D ctrl->panel->link_info.num_lanes; - ctrl->dp_ctrl.pixel_rate =3D ctrl->panel->dp_mode.drm_mode.clock; + pixel_rate =3D ctrl->panel->dp_mode.drm_mode.clock; } =20 - drm_dbg_dp(ctrl->drm_dev, "rate=3D%d, num_lanes=3D%d, pixel_rate=3D%d\n", + drm_dbg_dp(ctrl->drm_dev, "rate=3D%d, num_lanes=3D%d, pixel_rate=3D%lu\n", ctrl->link->link_params.rate, ctrl->link->link_params.num_lanes, - ctrl->dp_ctrl.pixel_rate); + pixel_rate); =20 =20 - rc =3D dp_ctrl_enable_mainlink_clocks(ctrl); + rc =3D dp_ctrl_enable_mainlink_clocks(ctrl, pixel_rate); if (rc) return rc; =20 while (--link_train_max_retries) { - rc =3D dp_ctrl_reinitialize_mainlink(ctrl); + rc =3D dp_ctrl_reinitialize_mainlink(ctrl, pixel_rate); if (rc) { DRM_ERROR("Failed to reinitialize mainlink. rc=3D%d\n", rc); @@ -1836,6 +1835,7 @@ int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl, bool f= orce_link_train) int ret =3D 0; bool mainlink_ready =3D false; struct dp_ctrl_private *ctrl; + unsigned long pixel_rate; unsigned long pixel_rate_orig; =20 if (!dp_ctrl) @@ -1843,25 +1843,24 @@ int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl, bool= force_link_train) =20 ctrl =3D container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); =20 - ctrl->dp_ctrl.pixel_rate =3D ctrl->panel->dp_mode.drm_mode.clock; + pixel_rate =3D pixel_rate_orig =3D ctrl->panel->dp_mode.drm_mode.clock; =20 - pixel_rate_orig =3D ctrl->dp_ctrl.pixel_rate; if (dp_ctrl->wide_bus_en) - ctrl->dp_ctrl.pixel_rate >>=3D 1; + pixel_rate >>=3D 1; =20 - drm_dbg_dp(ctrl->drm_dev, "rate=3D%d, num_lanes=3D%d, pixel_rate=3D%d\n", + drm_dbg_dp(ctrl->drm_dev, "rate=3D%d, num_lanes=3D%d, pixel_rate=3D%lu\n", ctrl->link->link_params.rate, - ctrl->link->link_params.num_lanes, ctrl->dp_ctrl.pixel_rate); + ctrl->link->link_params.num_lanes, pixel_rate); =20 if (!dp_power_clk_status(ctrl->power, DP_CTRL_PM)) { /* link clk is off */ - ret =3D dp_ctrl_enable_mainlink_clocks(ctrl); + ret =3D dp_ctrl_enable_mainlink_clocks(ctrl, pixel_rate); if (ret) { DRM_ERROR("Failed to start link clocks. ret=3D%d\n", ret); goto end; } } =20 - ret =3D dp_ctrl_enable_stream_clocks(ctrl); + ret =3D dp_ctrl_enable_stream_clocks(ctrl, pixel_rate); if (ret) { DRM_ERROR("Failed to start pixel clocks. ret=3D%d\n", ret); goto end; diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.h b/drivers/gpu/drm/msm/dp/dp_c= trl.h index b563e2e3bfe5..9f29734af81c 100644 --- a/drivers/gpu/drm/msm/dp/dp_ctrl.h +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.h @@ -16,7 +16,6 @@ struct dp_ctrl { bool orientation; atomic_t aborted; - u32 pixel_rate; bool wide_bus_en; }; =20 --=20 https://chromeos.dev From nobody Mon Apr 27 03:25:11 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBE05CCA479 for ; Fri, 17 Jun 2022 20:48:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1383300AbiFQUsE (ORCPT ); Fri, 17 Jun 2022 16:48:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1381762AbiFQUr4 (ORCPT ); Fri, 17 Jun 2022 16:47:56 -0400 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2BE2D104 for ; Fri, 17 Jun 2022 13:47:55 -0700 (PDT) Received: by mail-pf1-x42d.google.com with SMTP id y6so5074756pfr.13 for ; Fri, 17 Jun 2022 13:47:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZkHcSooWDiFQAWanDp+t9iIhWojlq4TIuHk5USWu968=; b=EiW2jSIpWnSRYzvxKxkG6vi0w3xy/58QL63gbehgu6Xz2yKJ5Sf2Bfr8wBlOiAOaha VILTTueJVdvB68GFjLMbnvdjEe72h5g76xKMIkWXi1UtUr6Uxd0BlGdUaLInDbpIhzQI dl7bEPbJsPf6GuAIlyO0Neb7bK8WXwcCwwpIk= 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=ZkHcSooWDiFQAWanDp+t9iIhWojlq4TIuHk5USWu968=; b=Xpmz1+kcdSxWEtmsVIpw6qepZ8erAJm4RUag/uOW0Plt0OCaNMviyKNT2nCWnEzf9i yY0Cmk/8pGBpghzjRAgiMoaDyZCykjFeZJYsUxa6FuQ5R/7mYUnUwV/ExWzeeG6jXGHl +Z0hm8Yz0mqUboLQWzkwL36QxlBAkjJtYvLwyjQA4QhJ4KhmNYS8FvmZ0W0VOkPzFJt8 DuncZuTRTHlfTOz+slX/uA5JD/TWQYtXJEbQPlI7z72Vx5KlyR4CbThZrsVf13+zDBwp HJ+fRqZfzSp0z0tMfLWdPvz9pb2beltpogYqNWcvNVGh7eytljMGJIvNCc1/vYPJZJ8L sYCQ== X-Gm-Message-State: AJIora9fm7rjE8nh7eDlajx3z1JJtYXkAX9W1NhHBFQnvK1Z483nl0L3 HNWiUNVXx3QsoNs088HCZlWcsg== X-Google-Smtp-Source: AGRyM1tviS+33tpMgDPQRa+qfam6sWYHX1/xJo9ZNWkAIGRMfkx8jNSbEbSqFZIiC7tLsFzZ8nSlnQ== X-Received: by 2002:a05:6a02:201:b0:3fc:6071:a272 with SMTP id bh1-20020a056a02020100b003fc6071a272mr10732274pgb.518.1655498875212; Fri, 17 Jun 2022 13:47:55 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:201:52e2:7dc8:1e20:f870]) by smtp.gmail.com with ESMTPSA id z12-20020aa79f8c000000b0052089e1b88esm4098325pfr.192.2022.06.17.13.47.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 13:47:54 -0700 (PDT) From: Stephen Boyd To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov Cc: linux-kernel@vger.kernel.org, patches@lists.linux.dev, Sean Paul , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, Kuogee Hsieh Subject: [PATCH 3/3] drm/msm/dp: Get rid of dp_ctrl_on_stream_phy_test_report() Date: Fri, 17 Jun 2022 13:47:50 -0700 Message-Id: <20220617204750.2347797-4-swboyd@chromium.org> X-Mailer: git-send-email 2.36.1.476.g0c4daa206d-goog In-Reply-To: <20220617204750.2347797-1-swboyd@chromium.org> References: <20220617204750.2347797-1-swboyd@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This API isn't really more than a couple lines now that we don't store the pixel_rate to the struct member. Inline it into the caller. Cc: Kuogee Hsieh Signed-off-by: Stephen Boyd Reviewed-by: Kuogee Hsieh --- drivers/gpu/drm/msm/dp/dp_ctrl.c | 40 ++++++++++++-------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_c= trl.c index e114521af2e9..d04fddb29fdf 100644 --- a/drivers/gpu/drm/msm/dp/dp_ctrl.c +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c @@ -1582,34 +1582,15 @@ static bool dp_ctrl_send_phy_test_pattern(struct dp= _ctrl_private *ctrl) return success; } =20 -static int dp_ctrl_on_stream_phy_test_report(struct dp_ctrl *dp_ctrl) +static int dp_ctrl_process_phy_test_request(struct dp_ctrl_private *ctrl) { int ret; - struct dp_ctrl_private *ctrl; unsigned long pixel_rate; =20 - ctrl =3D container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); - - pixel_rate =3D ctrl->panel->dp_mode.drm_mode.clock; - ret =3D dp_ctrl_enable_stream_clocks(ctrl, pixel_rate); - if (ret) { - DRM_ERROR("Failed to start pixel clocks. ret=3D%d\n", ret); - return ret; - } - - dp_ctrl_send_phy_test_pattern(ctrl); - - return 0; -} - -static int dp_ctrl_process_phy_test_request(struct dp_ctrl_private *ctrl) -{ - int ret =3D 0; - if (!ctrl->link->phy_params.phy_test_pattern_sel) { drm_dbg_dp(ctrl->drm_dev, "no test pattern selected by sink\n"); - return ret; + return 0; } =20 /* @@ -1624,12 +1605,21 @@ static int dp_ctrl_process_phy_test_request(struct = dp_ctrl_private *ctrl) } =20 ret =3D dp_ctrl_on_link(&ctrl->dp_ctrl); - if (!ret) - ret =3D dp_ctrl_on_stream_phy_test_report(&ctrl->dp_ctrl); - else + if (ret) { DRM_ERROR("failed to enable DP link controller\n"); + return ret; + } =20 - return ret; + pixel_rate =3D ctrl->panel->dp_mode.drm_mode.clock; + ret =3D dp_ctrl_enable_stream_clocks(ctrl, pixel_rate); + if (ret) { + DRM_ERROR("Failed to start pixel clocks. ret=3D%d\n", ret); + return ret; + } + + dp_ctrl_send_phy_test_pattern(ctrl); + + return 0; } =20 void dp_ctrl_handle_sink_request(struct dp_ctrl *dp_ctrl) --=20 https://chromeos.dev