From nobody Fri Dec 19 14:21:13 2025 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 97585C83F18 for ; Tue, 29 Aug 2023 18:48:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238262AbjH2SsM (ORCPT ); Tue, 29 Aug 2023 14:48:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238247AbjH2Sro (ORCPT ); Tue, 29 Aug 2023 14:47:44 -0400 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44FB8C5 for ; Tue, 29 Aug 2023 11:47:41 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1bdf4752c3cso29074705ad.2 for ; Tue, 29 Aug 2023 11:47:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1693334861; x=1693939661; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Zy1QTPwLj2+EWnTOjoPoVz867Fu7gzyOgxl1+3H6Nnc=; b=fdXiyQd+R3qGm5Nphv+8j5xKo14D3w9yIQArlsiouC4hZls3koS/DnWkpoXCL/18I6 fttfwSMZPVXcZ4Qctb7Xe7vRYvQbK+BVK2z+fX3JeqH7glikDw+cg81t/UDclLVVpMuM ynZ7Trrudlfu8n4mGrQEaO1hbAOb0Y4HUDpKs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693334861; x=1693939661; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Zy1QTPwLj2+EWnTOjoPoVz867Fu7gzyOgxl1+3H6Nnc=; b=ZU9mDsYXt9eCocobEF74+S5zLr+G1jY58U7Q0WcXnIIBjeb58Z92KsGGWeswFeO9ek x9hPc4CrjLqzXNqFc17m8jMddzUGHxy/050dQJgOrdY76/9RvUIH8jX+vde18IjXMOzr CAwr7/virTsAamu6jcofnboNutBGRv9MXjdMY/PiXb5hqtaZH63b2V97j12fmzHKpzg7 JwDFORIsXqIItelHu5rUlc/HvbOsPTnOlkBdM+aPpqR685f5pbDVA+bT0zPl6Uh2YHbR N2xDAgITbNpuJn5iHqn4Akdh3X1GJj/7qbPpLgEXz44gAOgp/pb4HmGoBgqqUDpKbLkL uLwA== X-Gm-Message-State: AOJu0Yz1fdLL8X7BadLDKtGo/YgdJopf+oLpPLDXSYT1qj+5wbghgCl+ HCa68hXy41gkcvP+2C/4uca8gpzYUdplzXYg+d4= X-Google-Smtp-Source: AGHT+IHOR7LHxCdUXoZltRyEuyQ9vz2U+mpOg+PlnYRlpoqnQkJZmp/tPsmE6qYU14e9a+3nTx5+mg== X-Received: by 2002:a17:902:eacc:b0:1bc:6dd9:82c3 with SMTP id p12-20020a170902eacc00b001bc6dd982c3mr24966758pld.37.1693334860713; Tue, 29 Aug 2023 11:47:40 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:11a:201:d603:22a7:5e5e:d239]) by smtp.gmail.com with ESMTPSA id o15-20020a170902d4cf00b001b9e86e05b7sm9697953plg.0.2023.08.29.11.47.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 11:47:40 -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, Vinod Polimera , Kuogee Hsieh Subject: [PATCH 1/7] drm/msm/dp: Replace open-coded drm_dp_read_dpcd_caps() Date: Tue, 29 Aug 2023 11:47:26 -0700 Message-ID: <20230829184735.2841739-2-swboyd@chromium.org> X-Mailer: git-send-email 2.42.0.rc2.253.gd59a3bf2b4-goog In-Reply-To: <20230829184735.2841739-1-swboyd@chromium.org> References: <20230829184735.2841739-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 function duplicates the common function drm_dp_read_dpcd_caps(). The array of DPCD registers filled in is one size larger than the function takes, but from what I can tell that extra byte was never used. Resize the array and use the common function to reduce the code here. Cc: Vinod Polimera Cc: Kuogee Hsieh Signed-off-by: Stephen Boyd Reviewed-by: Dmitry Baryshkov Reviewed-by: Kuogee Hsieh Tested-by: Dmitry Baryshkov Tested-by: Kuogee Hsieh --- drivers/gpu/drm/msm/dp/dp_panel.c | 42 ++++--------------------------- drivers/gpu/drm/msm/dp/dp_panel.h | 4 +-- 2 files changed, 6 insertions(+), 40 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_panel.c b/drivers/gpu/drm/msm/dp/dp_= panel.c index 42d52510ffd4..09d4f6c38ef8 100644 --- a/drivers/gpu/drm/msm/dp/dp_panel.c +++ b/drivers/gpu/drm/msm/dp/dp_panel.c @@ -48,47 +48,15 @@ static int dp_panel_read_dpcd(struct dp_panel *dp_panel) ssize_t rlen; struct dp_panel_private *panel; struct dp_link_info *link_info; - u8 *dpcd, major =3D 0, minor =3D 0, temp; - u32 offset =3D DP_DPCD_REV; + u8 *dpcd, major, minor; =20 + panel =3D container_of(dp_panel, struct dp_panel_private, dp_panel); dpcd =3D dp_panel->dpcd; + rc =3D drm_dp_read_dpcd_caps(panel->aux, dpcd); + if (rc) + return rc; =20 - panel =3D container_of(dp_panel, struct dp_panel_private, dp_panel); link_info =3D &dp_panel->link_info; - - rlen =3D drm_dp_dpcd_read(panel->aux, offset, - dpcd, (DP_RECEIVER_CAP_SIZE + 1)); - if (rlen < (DP_RECEIVER_CAP_SIZE + 1)) { - DRM_ERROR("dpcd read failed, rlen=3D%zd\n", rlen); - if (rlen =3D=3D -ETIMEDOUT) - rc =3D rlen; - else - rc =3D -EINVAL; - - goto end; - } - - temp =3D dpcd[DP_TRAINING_AUX_RD_INTERVAL]; - - /* check for EXTENDED_RECEIVER_CAPABILITY_FIELD_PRESENT */ - if (temp & BIT(7)) { - drm_dbg_dp(panel->drm_dev, - "using EXTENDED_RECEIVER_CAPABILITY_FIELD\n"); - offset =3D DPRX_EXTENDED_DPCD_FIELD; - } - - rlen =3D drm_dp_dpcd_read(panel->aux, offset, - dpcd, (DP_RECEIVER_CAP_SIZE + 1)); - if (rlen < (DP_RECEIVER_CAP_SIZE + 1)) { - DRM_ERROR("dpcd read failed, rlen=3D%zd\n", rlen); - if (rlen =3D=3D -ETIMEDOUT) - rc =3D rlen; - else - rc =3D -EINVAL; - - goto end; - } - link_info->revision =3D dpcd[DP_DPCD_REV]; major =3D (link_info->revision >> 4) & 0x0f; minor =3D link_info->revision & 0x0f; diff --git a/drivers/gpu/drm/msm/dp/dp_panel.h b/drivers/gpu/drm/msm/dp/dp_= panel.h index ed1030e17e1b..6d733480a62d 100644 --- a/drivers/gpu/drm/msm/dp/dp_panel.h +++ b/drivers/gpu/drm/msm/dp/dp_panel.h @@ -13,8 +13,6 @@ =20 struct edid; =20 -#define DPRX_EXTENDED_DPCD_FIELD 0x2200 - #define DP_DOWNSTREAM_PORTS 4 #define DP_DOWNSTREAM_CAP_SIZE 4 =20 @@ -40,7 +38,7 @@ struct dp_panel_psr { =20 struct dp_panel { /* dpcd raw data */ - u8 dpcd[DP_RECEIVER_CAP_SIZE + 1]; + u8 dpcd[DP_RECEIVER_CAP_SIZE]; u8 ds_cap_info[DP_DOWNSTREAM_PORTS * DP_DOWNSTREAM_CAP_SIZE]; u32 ds_port_cnt; u32 dfp_present; --=20 https://chromeos.dev From nobody Fri Dec 19 14:21:13 2025 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 78B4AC71153 for ; Tue, 29 Aug 2023 18:48:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238243AbjH2SsL (ORCPT ); Tue, 29 Aug 2023 14:48:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238262AbjH2Srp (ORCPT ); Tue, 29 Aug 2023 14:47:45 -0400 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0725C2 for ; Tue, 29 Aug 2023 11:47:42 -0700 (PDT) Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-1bc0d39b52cso29103175ad.2 for ; Tue, 29 Aug 2023 11:47:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1693334862; x=1693939662; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SP05QRX0ffgV9H75PNnPPPNwlPJBgrXfqON4q+7zQd8=; b=iR7CMZ2TOMm2oug+fW6PozLCKDS/FtBtnyhISmwLaudI+OQt4JkFh/4nfXqVS5T+x0 gc6XOEmfRRN6xM1lORZsVM7CD7pKalI9P9/iQA5HtQp5fiKBNFKY3340x/G8AX0+B02N KIsQX062xJPxzh2NKMuJVFoQ08gASaFeSb6N4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693334862; x=1693939662; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SP05QRX0ffgV9H75PNnPPPNwlPJBgrXfqON4q+7zQd8=; b=edxWKRF8wMewl+0zPzYaU0Mn+8OGcelbb+bLzOljV9FexfrXwhAghuj+6d9FA002Cd PFH5fO5jhfVg1HYGbDRrhLyGGJUPLSgMO/YIYfY7yD6Wuw09ifadxPKjoNH9nH4T6JN0 Y6w3YZLSryep7UU52q3WTxZAvfAW29a2jn/HtSS96CeC8KeOKY0XbKx3vAtcxqda/8VB H2mcAGSu4nkk6sF0W51xKOMrXOPkJvxigmZUMcrwYjBIoylBlLClUVgwEzCCVc/vaS5K PqmjpUsO7qeE1c4QQopic+KDUaA8vsLjzWcgPhLl8rzXdB9OEHTuz4fOyY8qy5ezbi+V LLpA== X-Gm-Message-State: AOJu0Yx5s9VFzXU0tZp1szlY1MyUrPhWADGpE7uFXomHB7fqXbBAh7Fh w7FqK5yKfs3PzQzVVHqX+OZpwA== X-Google-Smtp-Source: AGHT+IHGUmCHB6AjaXPnbvPgZPbqs96iezZg8UGYC+YUja3aAojoTLyujv9/gnvDjuZGMy/H54oFrA== X-Received: by 2002:a17:903:1212:b0:1b0:3df7:5992 with SMTP id l18-20020a170903121200b001b03df75992mr28283828plh.32.1693334862256; Tue, 29 Aug 2023 11:47:42 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:11a:201:d603:22a7:5e5e:d239]) by smtp.gmail.com with ESMTPSA id o15-20020a170902d4cf00b001b9e86e05b7sm9697953plg.0.2023.08.29.11.47.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 11:47:41 -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, Vinod Polimera , Kuogee Hsieh Subject: [PATCH 2/7] drm/msm/dp: Use drm_dp_read_sink_count() helper Date: Tue, 29 Aug 2023 11:47:27 -0700 Message-ID: <20230829184735.2841739-3-swboyd@chromium.org> X-Mailer: git-send-email 2.42.0.rc2.253.gd59a3bf2b4-goog In-Reply-To: <20230829184735.2841739-1-swboyd@chromium.org> References: <20230829184735.2841739-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" Use the common function drm_dp_read_sink_count() instead of open-coding it. This shrinks the kernel text a tiny bit. Cc: Vinod Polimera Cc: Kuogee Hsieh Signed-off-by: Stephen Boyd Reviewed-by: Dmitry Baryshkov Reviewed-by: Kuogee Hsieh Tested-by: Dmitry Baryshkov Tested-by: Kuogee Hsieh --- drivers/gpu/drm/msm/dp/dp_panel.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_panel.c b/drivers/gpu/drm/msm/dp/dp_= panel.c index 09d4f6c38ef8..a0523b18b9e9 100644 --- a/drivers/gpu/drm/msm/dp/dp_panel.c +++ b/drivers/gpu/drm/msm/dp/dp_panel.c @@ -147,8 +147,8 @@ static int dp_panel_update_modes(struct drm_connector *= connector, int dp_panel_read_sink_caps(struct dp_panel *dp_panel, struct drm_connector *connector) { - int rc =3D 0, bw_code; - int rlen, count; + int rc, bw_code; + int count; struct dp_panel_private *panel; =20 if (!dp_panel || !connector) { @@ -174,16 +174,11 @@ int dp_panel_read_sink_caps(struct dp_panel *dp_panel, } =20 if (dp_panel->dfp_present) { - rlen =3D drm_dp_dpcd_read(panel->aux, DP_SINK_COUNT, - &count, 1); - if (rlen =3D=3D 1) { - count =3D DP_GET_SINK_COUNT(count); - if (!count) { - DRM_ERROR("no downstream ports connected\n"); - panel->link->sink_count =3D 0; - rc =3D -ENOTCONN; - goto end; - } + count =3D drm_dp_read_sink_count(panel->aux); + if (!count) { + DRM_ERROR("no downstream ports connected\n"); + panel->link->sink_count =3D 0; + return -ENOTCONN; } } =20 --=20 https://chromeos.dev From nobody Fri Dec 19 14:21:13 2025 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 A7E83C83F19 for ; Tue, 29 Aug 2023 18:48:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238276AbjH2SsN (ORCPT ); Tue, 29 Aug 2023 14:48:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238275AbjH2Srq (ORCPT ); Tue, 29 Aug 2023 14:47:46 -0400 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 499CA1A2 for ; Tue, 29 Aug 2023 11:47:44 -0700 (PDT) Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1bf3a2f4528so37325225ad.2 for ; Tue, 29 Aug 2023 11:47:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1693334864; x=1693939664; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=V46+9RLRUs4jn3oMfUKtRDAEvgB49sGBWfYkBPv0+7o=; b=V/nm6vszO+uvEgAFcBm6ctl27mmYNTIbrvxYVif2P7XV8O9SZ4LQwXasF6coGjMn/T PKadI4pkh9xKzUC4CF1RfTbzxH/u80SEUUHcmsx2hmBOVqzX+ILpLP93898uIus/iEL3 OjamnOk5JD6kmxjUiibEJFzjti2YpMem+i4X4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693334864; x=1693939664; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V46+9RLRUs4jn3oMfUKtRDAEvgB49sGBWfYkBPv0+7o=; b=Ir/cBJRKSmGUhF8YS7wlR+ACRT8XCSlVL+qmZc/SQ8lD8RgAOy0OfTBUX0jR7Rc3PN eUOw6QwBWLm5xr+HMXs9JBEkDersuP2a4G24omx+maGbmZKsaJDw+yowi2U8YEpxzWyP vwGuKSb66UUDnpq9Hp1sbruqYFYvqhpfWiSskadUJa0fMipcglD8rhXtI+Pu2VAuZfrj phaZAZJ/Ufe6QL/0qv9WZXxBVhGEkXjqKgLPw9gPkQ27MNip9r1PxkxRE//X4M9/p47N 8amHfuaxwSWLTmFPfzO42iG5Onu8Vwtoonm0KxoOMjmB7dVcW536++bLLNURW7GPkIB+ T0xA== X-Gm-Message-State: AOJu0Yw7S0vyeFeRF/RXZjpoGoOMKVwMm3mOaSTrOx96KtHj7VEFziM/ OMunbYf0Xyjxocf7vBga8za8EQ== X-Google-Smtp-Source: AGHT+IFQ+sayvRTbFlB/yJwtr4beqBjEBFE4xO6oxnY7iGPiTXaDK/H6T4fPE7QuZzDpNy7Vg0mguQ== X-Received: by 2002:a17:902:db0e:b0:1bf:a41:371e with SMTP id m14-20020a170902db0e00b001bf0a41371emr38019313plx.56.1693334863827; Tue, 29 Aug 2023 11:47:43 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:11a:201:d603:22a7:5e5e:d239]) by smtp.gmail.com with ESMTPSA id o15-20020a170902d4cf00b001b9e86e05b7sm9697953plg.0.2023.08.29.11.47.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 11:47:43 -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, Vinod Polimera , Kuogee Hsieh Subject: [PATCH 3/7] drm/msm/dp: Remove dead code related to downstream cap info Date: Tue, 29 Aug 2023 11:47:28 -0700 Message-ID: <20230829184735.2841739-4-swboyd@chromium.org> X-Mailer: git-send-email 2.42.0.rc2.253.gd59a3bf2b4-goog In-Reply-To: <20230829184735.2841739-1-swboyd@chromium.org> References: <20230829184735.2841739-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" We read the downstream port count and capability info but never use it anywhere. Remove 'ds_port_cnt' and 'ds_cap_info' and any associated code from this driver. Fold the check for 'dfp_present' into a call to drm_dp_is_branch() at the one place it is used to get rid of any member storage related to downstream ports. Cc: Vinod Polimera Cc: Kuogee Hsieh Signed-off-by: Stephen Boyd Reviewed-by: Dmitry Baryshkov Reviewed-by: Kuogee Hsieh Tested-by: Dmitry Baryshkov Tested-by: Kuogee Hsieh --- drivers/gpu/drm/msm/dp/dp_panel.c | 25 +++---------------------- drivers/gpu/drm/msm/dp/dp_panel.h | 6 ------ 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_panel.c b/drivers/gpu/drm/msm/dp/dp_= panel.c index a0523b18b9e9..9fb4e963fefb 100644 --- a/drivers/gpu/drm/msm/dp/dp_panel.c +++ b/drivers/gpu/drm/msm/dp/dp_panel.c @@ -43,9 +43,7 @@ static void dp_panel_read_psr_cap(struct dp_panel_private= *panel) =20 static int dp_panel_read_dpcd(struct dp_panel *dp_panel) { - int rc =3D 0; - size_t len; - ssize_t rlen; + int rc; struct dp_panel_private *panel; struct dp_link_info *link_info; u8 *dpcd, major, minor; @@ -79,25 +77,8 @@ static int dp_panel_read_dpcd(struct dp_panel *dp_panel) if (drm_dp_enhanced_frame_cap(dpcd)) link_info->capabilities |=3D DP_LINK_CAP_ENHANCED_FRAMING; =20 - dp_panel->dfp_present =3D dpcd[DP_DOWNSTREAMPORT_PRESENT]; - dp_panel->dfp_present &=3D DP_DWN_STRM_PORT_PRESENT; - - if (dp_panel->dfp_present && (dpcd[DP_DPCD_REV] > 0x10)) { - dp_panel->ds_port_cnt =3D dpcd[DP_DOWN_STREAM_PORT_COUNT]; - dp_panel->ds_port_cnt &=3D DP_PORT_COUNT_MASK; - len =3D DP_DOWNSTREAM_PORTS * DP_DOWNSTREAM_CAP_SIZE; - - rlen =3D drm_dp_dpcd_read(panel->aux, - DP_DOWNSTREAM_PORT_0, dp_panel->ds_cap_info, len); - if (rlen < len) { - DRM_ERROR("ds port status failed, rlen=3D%zd\n", rlen); - rc =3D -EINVAL; - goto end; - } - } - dp_panel_read_psr_cap(panel); -end: + return rc; } =20 @@ -173,7 +154,7 @@ int dp_panel_read_sink_caps(struct dp_panel *dp_panel, return -EINVAL; } =20 - if (dp_panel->dfp_present) { + if (drm_dp_is_branch(dp_panel->dpcd)) { count =3D drm_dp_read_sink_count(panel->aux); if (!count) { DRM_ERROR("no downstream ports connected\n"); diff --git a/drivers/gpu/drm/msm/dp/dp_panel.h b/drivers/gpu/drm/msm/dp/dp_= panel.h index 6d733480a62d..3cb1f8dcfd3b 100644 --- a/drivers/gpu/drm/msm/dp/dp_panel.h +++ b/drivers/gpu/drm/msm/dp/dp_panel.h @@ -13,9 +13,6 @@ =20 struct edid; =20 -#define DP_DOWNSTREAM_PORTS 4 -#define DP_DOWNSTREAM_CAP_SIZE 4 - struct dp_display_mode { struct drm_display_mode drm_mode; u32 capabilities; @@ -39,9 +36,6 @@ struct dp_panel_psr { struct dp_panel { /* dpcd raw data */ u8 dpcd[DP_RECEIVER_CAP_SIZE]; - u8 ds_cap_info[DP_DOWNSTREAM_PORTS * DP_DOWNSTREAM_CAP_SIZE]; - u32 ds_port_cnt; - u32 dfp_present; =20 struct dp_link_info link_info; struct drm_dp_desc desc; --=20 https://chromeos.dev From nobody Fri Dec 19 14:21:13 2025 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 B7B3BC83F14 for ; Tue, 29 Aug 2023 18:48:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238314AbjH2SsP (ORCPT ); Tue, 29 Aug 2023 14:48:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238371AbjH2Srt (ORCPT ); Tue, 29 Aug 2023 14:47:49 -0400 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E7361A2 for ; Tue, 29 Aug 2023 11:47:45 -0700 (PDT) Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1c0d0bf18d7so29366075ad.0 for ; Tue, 29 Aug 2023 11:47:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1693334865; x=1693939665; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ve0TvxUqRJlJKKLuvKm0zT04FAFhZiHAVMwMtJute6s=; b=i6Jfs7UbT8S74Gau5HpO2Cq++3W4Nwv+Sc5IC/PuOnGxQCGchsS6d+AjCM2FrnJXeD 5eVHIfBrChJp7fy6vfXEN1GLV+H4GFIj95yT5fehhqf6C3QHJmQdW0AyI2Wiuv13RtSq BvoM5uooP0Gdt7ti18RjTL06os8iqMXkKV4og= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693334865; x=1693939665; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ve0TvxUqRJlJKKLuvKm0zT04FAFhZiHAVMwMtJute6s=; b=KTe64TqIF3nMT/M5i7gz8u4QMU4azXzh4IWWgwNO1bRrRCuYNO6AtTh6lACxdHayRM adp4aFggPEIOZE0K355hlqoLIVq1aV3rJN//A0wQkd7FHOY9jB0bCbIVZsdiXa31lzwZ LfCq2CtO+liHxxnqZAoZ65mk3dtys9Gb6d5WwFi7CSyx1LZ0rc8tZxQY2qy/29iIA2zA SBdPm6dZqIHjFtj3Dxc5GhoDNnz1YKzq+8NPKjIRwcs+A7zywzED14vtmXUIXDdTLXLA 4NBdcP2n2XF9a9QBZ0vK1yHx/S9L5aDewr1K3KOgSZ97vjYhebbS2dXNXqg06ZJ8i0p6 Y4bg== X-Gm-Message-State: AOJu0YzZVohPD/dSay9ZcouE6fmiqNYQ600F+hMpi3Mp8r2K7pY1mUvK FsXFA5/yA+C/wlAba1eRkTUvaA== X-Google-Smtp-Source: AGHT+IFHhHBo9Psybc2YARcz0/PoU0jc98gokAT1BEhXgw2zEOZ3HQ6Fpg6TBh2Spzq6LjBiUstieA== X-Received: by 2002:a17:902:ec8d:b0:1bc:69d0:a024 with SMTP id x13-20020a170902ec8d00b001bc69d0a024mr31142802plg.33.1693334865380; Tue, 29 Aug 2023 11:47:45 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:11a:201:d603:22a7:5e5e:d239]) by smtp.gmail.com with ESMTPSA id o15-20020a170902d4cf00b001b9e86e05b7sm9697953plg.0.2023.08.29.11.47.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 11:47:44 -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, Vinod Polimera , Kuogee Hsieh Subject: [PATCH 4/7] drm/msm/dp: Remove aux_cfg_update_done and related code Date: Tue, 29 Aug 2023 11:47:29 -0700 Message-ID: <20230829184735.2841739-5-swboyd@chromium.org> X-Mailer: git-send-email 2.42.0.rc2.253.gd59a3bf2b4-goog In-Reply-To: <20230829184735.2841739-1-swboyd@chromium.org> References: <20230829184735.2841739-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" The member 'aux_cfg_update_done' is always false. This is dead code that never runs. Remove it. Cc: Vinod Polimera Cc: Kuogee Hsieh Signed-off-by: Stephen Boyd Reviewed-by: Dmitry Baryshkov Reviewed-by: Kuogee Hsieh Tested-by: Dmitry Baryshkov Tested-by: Kuogee Hsieh --- drivers/gpu/drm/msm/dp/dp_panel.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_panel.c b/drivers/gpu/drm/msm/dp/dp_= panel.c index 9fb4e963fefb..0893522ae158 100644 --- a/drivers/gpu/drm/msm/dp/dp_panel.c +++ b/drivers/gpu/drm/msm/dp/dp_panel.c @@ -17,7 +17,6 @@ struct dp_panel_private { struct dp_link *link; struct dp_catalog *catalog; bool panel_on; - bool aux_cfg_update_done; }; =20 static void dp_panel_read_psr_cap(struct dp_panel_private *panel) @@ -177,19 +176,6 @@ int dp_panel_read_sink_caps(struct dp_panel *dp_panel, } } =20 - if (panel->aux_cfg_update_done) { - drm_dbg_dp(panel->drm_dev, - "read DPCD with updated AUX config\n"); - rc =3D dp_panel_read_dpcd(dp_panel); - bw_code =3D drm_dp_link_rate_to_bw_code(dp_panel->link_info.rate); - if (rc || !is_link_rate_valid(bw_code) || - !is_lane_count_valid(dp_panel->link_info.num_lanes) - || (bw_code > dp_panel->max_bw_code)) { - DRM_ERROR("read dpcd failed %d\n", rc); - return rc; - } - panel->aux_cfg_update_done =3D false; - } end: return rc; } @@ -434,7 +420,6 @@ struct dp_panel *dp_panel_get(struct dp_panel_in *in) =20 dp_panel =3D &panel->dp_panel; dp_panel->max_bw_code =3D DP_LINK_BW_8_1; - panel->aux_cfg_update_done =3D false; =20 return dp_panel; } --=20 https://chromeos.dev From nobody Fri Dec 19 14:21:13 2025 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 C8401C83F1A for ; Tue, 29 Aug 2023 18:48:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238371AbjH2SsP (ORCPT ); Tue, 29 Aug 2023 14:48:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238411AbjH2Srt (ORCPT ); Tue, 29 Aug 2023 14:47:49 -0400 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51E101A4 for ; Tue, 29 Aug 2023 11:47:47 -0700 (PDT) Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-68a42d06d02so3308980b3a.0 for ; Tue, 29 Aug 2023 11:47:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1693334867; x=1693939667; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=buOYirvM4LTz9UY1JGw3dQAfNg4ODZnJm46kyV7UDeA=; b=Xxh3Q8SCgpfoxsg1ZF3jrtLtAsdg/veTKayWHOfoB64sgg/pNfM+PEzYvOcRHsM8E/ bWeR/GIWYbsvZWqJXrH4seNSOO2T/+H1OeDZuWSDo+G+lq1aERCgtFxlI5deb1zTmnsf 3j+OBKAZpWQp3X3GnHWan09VsCrpLyHbUTQOU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693334867; x=1693939667; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=buOYirvM4LTz9UY1JGw3dQAfNg4ODZnJm46kyV7UDeA=; b=dNbR51RbRIyc7+Umvb6v2hSvL5XzwYHtFJP3swBf8LveiyLIH5QrS11qmtFw9Hz7Py zXBbibbpbatu5D8k3L3Z2R1+WoLilvkGaaD+bZJ9ZdJZx9H9g6gP3ziqiIMVIcpU8vtT uUgJXX04RiJfc2Qz5koz4lPwG6QjE/8Z56cCB2RXyZRLaudTaPi4HjJfzoZnQvLcijOF ppry9OwufedgWZKdIcSgOFQ5uXrQEIlghDGSdB4opaomgBpDcxG6JnN9tyTUOLzNTKyk Ytqu1dT4rjJp9vhgZoj7FJ8nNZHeKQUHQ91wSHmJii5kGPZL+TQpT1YkRj65BHAgahGG bobg== X-Gm-Message-State: AOJu0Yz835/MrOQ5W4mSn7KWhHIVZndNJNPSwuGUCBR4fxmSshb+U+Tf jjW6KKe3WW7tNQsNo8zB3ItU7g== X-Google-Smtp-Source: AGHT+IGoA9R8jy+DLGU8vBrurRLkpQ3/Zg84i8rJk8UcpO+wc/82SKC/x3KJjnmNJ9rfBhL040LnrA== X-Received: by 2002:a05:6a20:729d:b0:140:4563:2243 with SMTP id o29-20020a056a20729d00b0014045632243mr138196pzk.50.1693334866790; Tue, 29 Aug 2023 11:47:46 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:11a:201:d603:22a7:5e5e:d239]) by smtp.gmail.com with ESMTPSA id o15-20020a170902d4cf00b001b9e86e05b7sm9697953plg.0.2023.08.29.11.47.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 11:47:46 -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, Vinod Polimera , Kuogee Hsieh Subject: [PATCH 5/7] drm/msm/dp: Simplify with drm_dp_{max_link_rate,max_lane_count}() Date: Tue, 29 Aug 2023 11:47:30 -0700 Message-ID: <20230829184735.2841739-6-swboyd@chromium.org> X-Mailer: git-send-email 2.42.0.rc2.253.gd59a3bf2b4-goog In-Reply-To: <20230829184735.2841739-1-swboyd@chromium.org> References: <20230829184735.2841739-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" These are open-coded versions of common functions. Replace them with the common code to improve readability. Cc: Vinod Polimera Cc: Kuogee Hsieh Signed-off-by: Stephen Boyd Reviewed-by: Dmitry Baryshkov Reviewed-by: Kuogee Hsieh Tested-by: Dmitry Baryshkov Tested-by: Kuogee Hsieh --- drivers/gpu/drm/msm/dp/dp_panel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_panel.c b/drivers/gpu/drm/msm/dp/dp_= panel.c index 0893522ae158..97ba41593820 100644 --- a/drivers/gpu/drm/msm/dp/dp_panel.c +++ b/drivers/gpu/drm/msm/dp/dp_panel.c @@ -58,8 +58,8 @@ static int dp_panel_read_dpcd(struct dp_panel *dp_panel) major =3D (link_info->revision >> 4) & 0x0f; minor =3D link_info->revision & 0x0f; =20 - link_info->rate =3D drm_dp_bw_code_to_link_rate(dpcd[DP_MAX_LINK_RATE]); - link_info->num_lanes =3D dpcd[DP_MAX_LANE_COUNT] & DP_MAX_LANE_COUNT_MASK; + link_info->rate =3D drm_dp_max_link_rate(dpcd); + link_info->num_lanes =3D drm_dp_max_lane_count(dpcd); =20 /* Limit data lanes from data-lanes of endpoint property of dtsi */ if (link_info->num_lanes > dp_panel->max_dp_lanes) --=20 https://chromeos.dev From nobody Fri Dec 19 14:21:13 2025 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 DAEF7C83F1B for ; Tue, 29 Aug 2023 18:48:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238452AbjH2SsQ (ORCPT ); Tue, 29 Aug 2023 14:48:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238440AbjH2Srw (ORCPT ); Tue, 29 Aug 2023 14:47:52 -0400 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6ED3C2 for ; Tue, 29 Aug 2023 11:47:48 -0700 (PDT) Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-1bdb7b0c8afso29156365ad.3 for ; Tue, 29 Aug 2023 11:47:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1693334868; x=1693939668; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bWWE+N/R8MiRAhT7N6s5ExY6HMGHBM00+QOLGgmHjWE=; b=mrtXzVZv/KtID+AV6F+cCpMInKxZHGRb0bBendDZgPdkcKmAzQGqQ+ZfWZFBY+ru1E UC/pUTMGqdkddvAH8TZ3C3zr9F1lD7Jmp0Kmi9Lw5pnIBCe53lZHPHQJaHqFY5F4yjLn 8Cj7jg9NNMfz9KpAxC++fNWntkAgsRMVsvhcU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693334868; x=1693939668; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bWWE+N/R8MiRAhT7N6s5ExY6HMGHBM00+QOLGgmHjWE=; b=NRecKqEh3szbL367dJNyjSb9unTTRitVmSG1km1cRQSeqMZ8tsZ87LwmbabCK+JX5I hwCmrOw+nLUpcec5LekvI0RS2hchSMiLLy7kgItvGy1rvRtPNHj6niMvT7zZjjmjx//A ecsrtC26YpiFYkhyO6Bb5VkPrwo8JYJcb6zqZ7E4rQnxOLU8GybEedqxw17mJBoE5Hl1 JDEgWqN9jyWy4UXsmkMvmE7HBUccHe8RjpXVrXX5p/9IWaLd+AeiHwaqXqI49ChyNBNr BCV4lTtoT22/ipdsA/IwggPtN+aO4GT475P9Mw6GS9rv8sjZmJABGTieZJmBymRyMBfT Kqng== X-Gm-Message-State: AOJu0YyYcrWCt6A4zyNlkr6h+RDX2SxDEZ9n/BLUJ1GpFb1/7/tGo+H7 2DsLAi0e/eTizZf4HqHeLVKKCA== X-Google-Smtp-Source: AGHT+IELsr0TJIiQh5QAqmKXDgO6soZkpyO0kaROc+iBPItyZos4zaQHhCtRtZNlvZlNH7/nSZbiMw== X-Received: by 2002:a17:902:e74b:b0:1c1:f5a6:bdfa with SMTP id p11-20020a170902e74b00b001c1f5a6bdfamr5479880plf.7.1693334868188; Tue, 29 Aug 2023 11:47:48 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:11a:201:d603:22a7:5e5e:d239]) by smtp.gmail.com with ESMTPSA id o15-20020a170902d4cf00b001b9e86e05b7sm9697953plg.0.2023.08.29.11.47.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 11:47:47 -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, Vinod Polimera , Kuogee Hsieh Subject: [PATCH 6/7] drm/msm/dp: Inline dp_link_parse_sink_count() Date: Tue, 29 Aug 2023 11:47:31 -0700 Message-ID: <20230829184735.2841739-7-swboyd@chromium.org> X-Mailer: git-send-email 2.42.0.rc2.253.gd59a3bf2b4-goog In-Reply-To: <20230829184735.2841739-1-swboyd@chromium.org> References: <20230829184735.2841739-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" The function dp_link_parse_sink_count() is really just drm_dp_read_sink_count(). It debug prints out the bit for content protection (DP_SINK_CP_READY), but that is not useful beyond debug because 'link->dp_link.sink_count' is overwritten to only contain the sink_count in this same function. Just use drm_dp_read_sink_count() in the one place this function is called to simplify. Cc: Vinod Polimera Cc: Kuogee Hsieh Signed-off-by: Stephen Boyd Reviewed-by: Dmitry Baryshkov Reviewed-by: Kuogee Hsieh Tested-by: Dmitry Baryshkov Tested-by: Kuogee Hsieh --- drivers/gpu/drm/msm/dp/dp_link.c | 38 +++----------------------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_link.c b/drivers/gpu/drm/msm/dp/dp_l= ink.c index 42427129acea..94a37914a47f 100644 --- a/drivers/gpu/drm/msm/dp/dp_link.c +++ b/drivers/gpu/drm/msm/dp/dp_link.c @@ -712,49 +712,17 @@ static int dp_link_parse_request(struct dp_link_priva= te *link) return ret; } =20 -/** - * dp_link_parse_sink_count() - parses the sink count - * @dp_link: pointer to link module data - * - * Parses the DPCD to check if there is an update to the sink count - * (Byte 0x200), and whether all the sink devices connected have Content - * Protection enabled. - */ -static int dp_link_parse_sink_count(struct dp_link *dp_link) -{ - ssize_t rlen; - bool cp_ready; - - struct dp_link_private *link =3D container_of(dp_link, - struct dp_link_private, dp_link); - - rlen =3D drm_dp_dpcd_readb(link->aux, DP_SINK_COUNT, - &link->dp_link.sink_count); - if (rlen < 0) { - DRM_ERROR("sink count read failed. rlen=3D%zd\n", rlen); - return rlen; - } - - cp_ready =3D link->dp_link.sink_count & DP_SINK_CP_READY; - - link->dp_link.sink_count =3D - DP_GET_SINK_COUNT(link->dp_link.sink_count); - - drm_dbg_dp(link->drm_dev, "sink_count =3D 0x%x, cp_ready =3D 0x%x\n", - link->dp_link.sink_count, cp_ready); - return 0; -} - static int dp_link_parse_sink_status_field(struct dp_link_private *link) { - int len =3D 0; + int len; =20 link->prev_sink_count =3D link->dp_link.sink_count; - len =3D dp_link_parse_sink_count(&link->dp_link); + len =3D drm_dp_read_sink_count(link->aux); if (len < 0) { DRM_ERROR("DP parse sink count failed\n"); return len; } + link->dp_link.sink_count =3D len; =20 len =3D drm_dp_dpcd_read_link_status(link->aux, link->link_status); --=20 https://chromeos.dev From nobody Fri Dec 19 14:21:13 2025 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 0876CC83F1D for ; Tue, 29 Aug 2023 18:48:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238499AbjH2SsR (ORCPT ); Tue, 29 Aug 2023 14:48:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238449AbjH2Srw (ORCPT ); Tue, 29 Aug 2023 14:47:52 -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 13776FC for ; Tue, 29 Aug 2023 11:47:50 -0700 (PDT) Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-68c576d35feso1904410b3a.2 for ; Tue, 29 Aug 2023 11:47:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1693334869; x=1693939669; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KDFi+t2HGk6Ez2m1E1bDJmYF5dLdXGiplCl4kzCCGIw=; b=oJz2sD2C3Cvjxf2FVvMIRUzL397azxk6BUKu5biuSbwp6dD4XVebY3fok88O1Q727T z9qRCc9e+2/Xq7HodYU9n7GkoRyQHiC4wOmOE37hnZ4d9Bdxv3QOQhAphMRMRxGWAluZ YZgonyITYkZXrrUm7/50OiBepbxYVb5KkROjo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693334869; x=1693939669; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KDFi+t2HGk6Ez2m1E1bDJmYF5dLdXGiplCl4kzCCGIw=; b=IxR8v3bKZqvyEim/2O91f+saGKNrBX6cXpoch0MJbDq3EEnQ/WHUGhYoy73jdD10lc 2Wfocgezm95lx2im2FwFPgntRo/+MAz4hPM0Cf45HRpoiGH00yJ5OzvpA62BPyGr4YRo RCoeO/3kXyJX//hM+OahQy9Q8Z8AuZmwKcje+md+EKtrssHUJr1q5QVUqhPdiXH3O8fX UTPW53IWuwtYt+V5wI0GPICmFi/qeBiwWg00g2GKJMNcZSKJra5SaqklnQ3h9hQssxnc aydSrc2BYRZ7wS+1k/ky2XtiyWxifMncf1zT2hza1ylXcS9x0ifsNbrjrTUni3c5IFaz xJlQ== X-Gm-Message-State: AOJu0Ywl15AUTX31Dh66aCuA5zq01/KbmO9eN4KcCFisirKjG4Y7dytf qnR3UK5W/oEDpLWXrj48ce1Pyw== X-Google-Smtp-Source: AGHT+IG58CNBx1V/eqpVdTw/QvBwIlAZBBILyaosLO9zrBbi7Cn4JE3QPxGI+6zG/AqLakLHAjK+GQ== X-Received: by 2002:a05:6a21:66cb:b0:138:2fb8:6b42 with SMTP id ze11-20020a056a2166cb00b001382fb86b42mr180543pzb.14.1693334869676; Tue, 29 Aug 2023 11:47:49 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:11a:201:d603:22a7:5e5e:d239]) by smtp.gmail.com with ESMTPSA id o15-20020a170902d4cf00b001b9e86e05b7sm9697953plg.0.2023.08.29.11.47.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 11:47:49 -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, Vinod Polimera , Kuogee Hsieh Subject: [PATCH 7/7] drm/msm/dp: Remove dp_display_is_ds_bridge() Date: Tue, 29 Aug 2023 11:47:32 -0700 Message-ID: <20230829184735.2841739-8-swboyd@chromium.org> X-Mailer: git-send-email 2.42.0.rc2.253.gd59a3bf2b4-goog In-Reply-To: <20230829184735.2841739-1-swboyd@chromium.org> References: <20230829184735.2841739-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 function is simply drm_dp_is_branch() so use that instead of open-coding it. Cc: Vinod Polimera Cc: Kuogee Hsieh Signed-off-by: Stephen Boyd Reviewed-by: Dmitry Baryshkov Reviewed-by: Kuogee Hsieh Tested-by: Dmitry Baryshkov Tested-by: Kuogee Hsieh --- drivers/gpu/drm/msm/dp/dp_display.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/d= p_display.c index 76f13954015b..96bbf6fec2f1 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -341,19 +341,12 @@ static const struct component_ops dp_display_comp_ops= =3D { .unbind =3D dp_display_unbind, }; =20 -static bool dp_display_is_ds_bridge(struct dp_panel *panel) -{ - return (panel->dpcd[DP_DOWNSTREAMPORT_PRESENT] & - DP_DWN_STRM_PORT_PRESENT); -} - static bool dp_display_is_sink_count_zero(struct dp_display_private *dp) { drm_dbg_dp(dp->drm_dev, "present=3D%#x sink_count=3D%d\n", dp->panel->dpcd[DP_DOWNSTREAMPORT_PRESENT], dp->link->sink_count); - return dp_display_is_ds_bridge(dp->panel) && - (dp->link->sink_count =3D=3D 0); + return drm_dp_is_branch(dp->panel->dpcd) && dp->link->sink_count =3D=3D 0; } =20 static void dp_display_send_hpd_event(struct msm_dp *dp_display) --=20 https://chromeos.dev