From nobody Fri Oct 3 20:53:09 2025 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D9F52FE059 for ; Mon, 25 Aug 2025 14:17:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756131475; cv=none; b=F3tDmzJ3Kgkg8d6RPpjUl3ugeBDHYmXND2j+tcmkdgnY8aIEmOUDfyGd02cU+6+80p8bSZnNEhooHeMfxIsB8EJaLGQMVtjNXkFqZxt3hTJjVJn8Rlxf4jwAZxfrfoW0akNNFYNXxVgUdBYOF5BhFq1GQcuNbQUbG2YxJBHgNNM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756131475; c=relaxed/simple; bh=Y3mBQMu8i0yptDOPl+HEAhENVyzSOBDITRS06WOJX4M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=D+FcUkbyJwM5ccQXAQy4PjkscmKZHimQ3KFMSlcO+WOL5bSuWIkANLgi2uiYujDUik5wZFZjipQSmVB0wsZuotamkeVuoDrKTJYt1cUTZwV66NvFFtP3vuxOqIzE4ALTgRKl13TnV8B9EFgHw+l5XzEtYKY9V6e+MqRQqbZ53Co= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=dqX/wJcT; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="dqX/wJcT" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 57P8uMoT028160 for ; Mon, 25 Aug 2025 14:17:52 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= KugB/lBYbS+s3dqphJMlpBFe1NsSwNAbfXTjg/sGCOw=; b=dqX/wJcTvCqmS5nP o+QVTrtm7+HK2sdR7nbCELCVcc3FagT/NKjiW60j0TqVPFrotFEnY9V2xmf2so1l fIvS5kAIln9HpDfYDYF6GjbaopMeuMXOH282eSJpumKgsVDVrSL4/bw4AaH+0gd7 rrvVNRfNHMjm3nnW4207KEmFHVJI3vegiQhXSJi4WA49pjtSiJ267kHthlGcpYnO gJQKTcpvE14j2dIuRt26HGa13KsBXbBkbS72hJqHzr0SpU3IBA6LVbxGFUPcsAvK ISC6oiULJ1huFBlEr5MUcW+n23hzj+szm+C+gRuwZjk3C6CrbGmwT1Qz8KXgHKpK E4ASeg== Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 48q5uc57gg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 25 Aug 2025 14:17:52 +0000 (GMT) Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-771f1645e31so228261b3a.1 for ; Mon, 25 Aug 2025 07:17:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756131471; x=1756736271; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KugB/lBYbS+s3dqphJMlpBFe1NsSwNAbfXTjg/sGCOw=; b=HStgtkepyHWoFXl0uiUDqG7eYNRxfImiH6x7Yw9Epl8nX0LX5pmiUrU9zKHEdb7hXn RTe5AHFCaZ+E/Qy64xSkpU9g/IiWLvuypz/5MIBydwPKkBs92DiXMsa6c/+F8Jj9t7y+ 7O/3/Hk363iUbxw6vwBeBScuCFJegU7qycI0yYPKMmCW3wseEIyRb8lIGlv1GK6OBsAk gshG6Goddx8WktWXqFmgwS5GcS0gid3jZt6AjrFB1TgaBkEqVnzoJ3xFgCHPPILdgQty 5PgR9EXnTlzUGoj7zFIw2Ouz5N6BXfZtnkks7QdmYPfCdX5MQ1xomzaqaEoVlvPdLBYK XX5Q== X-Forwarded-Encrypted: i=1; AJvYcCW1z7ZTqy/lohVnEa+C9OKhqowCdBJ+eIomSgF2TIqumidzuD4BlV7haUs8AyIMbMwJQwvH11nJt9d4EKs=@vger.kernel.org X-Gm-Message-State: AOJu0YxeMJisZ4xydl9gA921s+Db+eqBeWkQCUUfMRsqiZHggiOVxZnx NrwCFE4iKoJue+lMgLPUbNzTY36zuLUm9WZmlL6UDAaVewCWVWTjDbM3++bUD6Q/jq2OqU3GSny V++rSU78isNP8SRH6A2ml4MAYDMoPXaQZtScrQqPxSrtYMW3QoxhLO8RsUOSHWHM/xuM= X-Gm-Gg: ASbGncvtOR4ERGbCfDpqzqwNGiR3Y5shGMLrD11Shns8avAZZva56rlTJGGGaKCod9R t8E9gul84bp6PE2U68zwrI6FsIdsErMoKZtUNplVlglB8CwpRGj66IsqtkT1+3ABtExHyw/qfSO J7LxrmBwKPQAO4+4D9Thxkz3oIGnB+8aFf5WqTLmoKrxqcWOLP3Lp4G/CBzdpkLDq852u3IzMTg 5ovP1orxHNyU+HmcdM8/rzjfyQDdY19nfluqM1F/3URQCoNihh2abWjIDyk9sl+L1Gku2R9w2qh /qqd6OdI7uPYqs1kxvYhRP52dR+hLrsXh67tlonvAkFiOWVJaVSD685D2zw7vkaD65MCGDY= X-Received: by 2002:a05:6a00:4088:b0:770:4753:b984 with SMTP id d2e1a72fcca58-7704753bbf6mr10686930b3a.16.1756131470605; Mon, 25 Aug 2025 07:17:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IESblHr8j5NFyLN5uWT6iFyICWQfQtyu/HKk7Hdm+TtQVYAYSZzGRYOzkrj7SkUFw6lTnEbEA== X-Received: by 2002:a05:6a00:4088:b0:770:4753:b984 with SMTP id d2e1a72fcca58-7704753bbf6mr10686886b3a.16.1756131470070; Mon, 25 Aug 2025 07:17:50 -0700 (PDT) Received: from cse-cd01-lnx.ap.qualcomm.com ([114.94.8.21]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-770401eb20dsm7672339b3a.79.2025.08.25.07.17.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Aug 2025 07:17:49 -0700 (PDT) From: Yongxing Mou Date: Mon, 25 Aug 2025 22:15:56 +0800 Subject: [PATCH v3 10/38] drm/msm/dp: make bridge helpers use dp_display to allow re-use Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250825-msm-dp-mst-v3-10-01faacfcdedd@oss.qualcomm.com> References: <20250825-msm-dp-mst-v3-0-01faacfcdedd@oss.qualcomm.com> In-Reply-To: <20250825-msm-dp-mst-v3-0-01faacfcdedd@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Yongxing Mou , Abhinav Kumar X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1756131420; l=9466; i=yongxing.mou@oss.qualcomm.com; s=20241121; h=from:subject:message-id; bh=L994Yy2QrMAOiXO+x2w/GZyZBMG20Sb7wl+50OQR9Vs=; b=lSDFMm6CWvGhNucrPveqSxz7GjSC/0X3EOcKyFyqCimdElz3VzVR1l1Nsbp96Qt9UPY4VDTan nTrqaPPpkfSD7J29Dx7BKLq2RNzW5+O/rHLyOegRYKYFhex/rnlXnQm X-Developer-Key: i=yongxing.mou@oss.qualcomm.com; a=ed25519; pk=zeCnFRUqtOQMeFvdwex2M5o0Yf67UHYfwCyBRQ3kFbU= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwODIzMDAzMiBTYWx0ZWRfX2Ln8hjCjpVQA Cat8ReJltsLzkZbke0JLlUuOj1VcrrLDYET5wB6YG15uQdz+PZhRe54b7jnE2th/Jxl7CLy9Fsm CIMwfnnWpEY+q4lELin0T8nwqLMkD7dZFxpy6yKSWZsJEWCD83ZoYh9NCAzBtqIw0Km7emNk1EN y42YJqMKyVH3U6MmxbJ6zBZ5FQx2BLmpOzBNyqICH2wQVApQ8S82E2e4DwIKNSI7c0QBYKuAKww xLH8T7m5S8HgfmDHKcD+dDjAkQ+v2WLUNYi2Frr00t1WDX0R4WrChvA+uXpddxefwqfZgH3OQSk 5ghZ2VlFrs8Sfq348de/b1rS32YkU9zZ6BQVbLxvBxekd5R6fAZPCMYwYiItMtmGtDEb1DDlaih G2q80Fdv X-Proofpoint-ORIG-GUID: kfd3oVYUv1NkpYaelat_Y_iEBy_QhYNx X-Authority-Analysis: v=2.4 cv=I85lRMgg c=1 sm=1 tr=0 ts=68ac7090 cx=c_pps a=rEQLjTOiSrHUhVqRoksmgQ==:117 a=Uz3yg00KUFJ2y2WijEJ4bw==:17 a=IkcTkHD0fZMA:10 a=2OwXVqhp2XgA:10 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=iEZZ7kfMCVqEHj8YyOgA:9 a=QEXdDO2ut3YA:10 a=2VI0MkxyNR6bbpdq8BZq:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-GUID: kfd3oVYUv1NkpYaelat_Y_iEBy_QhYNx X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-08-25_06,2025-08-20_03,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 spamscore=0 adultscore=0 bulkscore=0 malwarescore=0 suspectscore=0 phishscore=0 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2507300000 definitions=main-2508230032 From: Abhinav Kumar dp_bridge helpers take drm_bridge as an input and extract the dp_display object to be used in the dp_display module. Rather than doing it in a roundabout way, directly pass the dp_display object to these helpers so that the MST bridge can also re-use the same helpers. Signed-off-by: Abhinav Kumar Signed-off-by: Yongxing Mou --- drivers/gpu/drm/msm/dp/dp_display.c | 34 ++++++++----------------- drivers/gpu/drm/msm/dp/dp_display.h | 9 +++++++ drivers/gpu/drm/msm/dp/dp_drm.c | 49 +++++++++++++++++++++++++++++++++= +++- drivers/gpu/drm/msm/dp/dp_drm.h | 12 --------- 4 files changed, 67 insertions(+), 37 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/d= p_display.c index c5c502e51b94a6ac4b9a893b43eb88e87a0c0d46..8e95cfb98bd08088a707ffb5643= a5021a288095f 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -806,24 +806,21 @@ static int msm_dp_display_disable(struct msm_dp_displ= ay_private *dp) =20 /** * msm_dp_bridge_mode_valid - callback to determine if specified mode is v= alid - * @bridge: Pointer to drm bridge structure + * @dp: Pointer to dp display structure * @info: display info * @mode: Pointer to drm mode structure * Returns: Validity status for specified mode */ -enum drm_mode_status msm_dp_bridge_mode_valid(struct drm_bridge *bridge, - const struct drm_display_info *info, - const struct drm_display_mode *mode) +enum drm_mode_status msm_dp_display_mode_valid(struct msm_dp *dp, + const struct drm_display_info *info, + const struct drm_display_mode *mode) { const u32 num_components =3D 3, default_bpp =3D 24; struct msm_dp_display_private *msm_dp_display; struct msm_dp_link_info *link_info; u32 mode_rate_khz =3D 0, supported_rate_khz =3D 0, mode_bpp =3D 0; - struct msm_dp *dp; int mode_pclk_khz =3D mode->clock; =20 - dp =3D to_dp_bridge(bridge)->msm_dp_display; - if (!dp || !mode_pclk_khz || !dp->connector) { DRM_ERROR("invalid params\n"); return -EINVAL; @@ -1441,11 +1438,8 @@ int msm_dp_modeset_init(struct msm_dp *msm_dp_displa= y, struct drm_device *dev, return 0; } =20 -void msm_dp_bridge_atomic_enable(struct drm_bridge *drm_bridge, - struct drm_atomic_state *state) +void msm_dp_display_atomic_enable(struct msm_dp *msm_dp_display) { - struct msm_dp_bridge *msm_dp_bridge =3D to_dp_bridge(drm_bridge); - struct msm_dp *msm_dp_display =3D msm_dp_bridge->msm_dp_display; int rc =3D 0; struct msm_dp_display_private *dp; =20 @@ -1475,11 +1469,8 @@ void msm_dp_bridge_atomic_enable(struct drm_bridge *= drm_bridge, drm_dbg_dp(msm_dp_display->drm_dev, "type=3D%d Done\n", msm_dp_display->c= onnector_type); } =20 -void msm_dp_bridge_atomic_disable(struct drm_bridge *drm_bridge, - struct drm_atomic_state *state) +void msm_dp_display_atomic_disable(struct msm_dp *dp) { - struct msm_dp_bridge *msm_dp_bridge =3D to_dp_bridge(drm_bridge); - struct msm_dp *dp =3D msm_dp_bridge->msm_dp_display; struct msm_dp_display_private *msm_dp_display; =20 msm_dp_display =3D container_of(dp, struct msm_dp_display_private, msm_dp= _display); @@ -1496,11 +1487,8 @@ static void msm_dp_display_unprepare(struct msm_dp_d= isplay_private *dp) msm_dp_display->prepared =3D false; } =20 -void msm_dp_bridge_atomic_post_disable(struct drm_bridge *drm_bridge, - struct drm_atomic_state *state) +void msm_dp_display_atomic_post_disable(struct msm_dp *dp) { - struct msm_dp_bridge *msm_dp_bridge =3D to_dp_bridge(drm_bridge); - struct msm_dp *dp =3D msm_dp_bridge->msm_dp_display; struct msm_dp_display_private *msm_dp_display; =20 msm_dp_display =3D container_of(dp, struct msm_dp_display_private, msm_dp= _display); @@ -1520,12 +1508,10 @@ void msm_dp_bridge_atomic_post_disable(struct drm_b= ridge *drm_bridge, drm_dbg_dp(dp->drm_dev, "type=3D%d Done\n", dp->connector_type); } =20 -void msm_dp_bridge_mode_set(struct drm_bridge *drm_bridge, - const struct drm_display_mode *mode, - const struct drm_display_mode *adjusted_mode) +void msm_dp_display_mode_set(struct msm_dp *dp, + const struct drm_display_mode *mode, + const struct drm_display_mode *adjusted_mode) { - struct msm_dp_bridge *msm_dp_bridge =3D to_dp_bridge(drm_bridge); - struct msm_dp *dp =3D msm_dp_bridge->msm_dp_display; struct msm_dp_display_private *msm_dp_display; struct msm_dp_panel *msm_dp_panel; =20 diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/d= p_display.h index 2fbf16f27842bb7639efaa2baecac7bdf8908432..e12496ac73f853a2bc120e68eeb= 84e5a2de6aabe 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.h +++ b/drivers/gpu/drm/msm/dp/dp_display.h @@ -36,5 +36,14 @@ void msm_dp_display_signal_audio_start(struct msm_dp *ms= m_dp_display); void msm_dp_display_signal_audio_complete(struct msm_dp *msm_dp_display); void msm_dp_display_set_psr(struct msm_dp *dp, bool enter); void msm_dp_display_debugfs_init(struct msm_dp *msm_dp_display, struct den= try *dentry, bool is_edp); +void msm_dp_display_atomic_post_disable(struct msm_dp *dp_display); +void msm_dp_display_atomic_disable(struct msm_dp *dp_display); +void msm_dp_display_atomic_enable(struct msm_dp *dp_display); +void msm_dp_display_mode_set(struct msm_dp *dp, + const struct drm_display_mode *mode, + const struct drm_display_mode *adjusted_mode); +enum drm_mode_status msm_dp_display_mode_valid(struct msm_dp *dp, + const struct drm_display_info *info, + const struct drm_display_mode *mode); =20 #endif /* _DP_DISPLAY_H_ */ diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_dr= m.c index f935093c4df4681770ab487916584cc76834b0d0..b6b77ee96c30ca60e31cf76569e= 262a237493aeb 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.c +++ b/drivers/gpu/drm/msm/dp/dp_drm.c @@ -81,6 +81,53 @@ static void msm_dp_bridge_debugfs_init(struct drm_bridge= *bridge, struct dentry msm_dp_display_debugfs_init(dp, root, false); } =20 +static void msm_dp_bridge_atomic_enable(struct drm_bridge *drm_bridge, + struct drm_atomic_state *state) +{ + struct msm_dp_bridge *dp_bridge =3D to_dp_bridge(drm_bridge); + struct msm_dp *dp =3D dp_bridge->msm_dp_display; + + msm_dp_display_atomic_enable(dp); +} + +static void msm_dp_bridge_atomic_disable(struct drm_bridge *drm_bridge, + struct drm_atomic_state *state) +{ + struct msm_dp_bridge *dp_bridge =3D to_dp_bridge(drm_bridge); + struct msm_dp *dp =3D dp_bridge->msm_dp_display; + + msm_dp_display_atomic_disable(dp); +} + +static void msm_dp_bridge_atomic_post_disable(struct drm_bridge *drm_bridg= e, + struct drm_atomic_state *state) +{ + struct msm_dp_bridge *dp_bridge =3D to_dp_bridge(drm_bridge); + struct msm_dp *dp =3D dp_bridge->msm_dp_display; + + msm_dp_display_atomic_post_disable(dp); +} + +static void msm_dp_bridge_mode_set(struct drm_bridge *drm_bridge, + const struct drm_display_mode *mode, + const struct drm_display_mode *adjusted_mode) +{ + struct msm_dp_bridge *dp_bridge =3D to_dp_bridge(drm_bridge); + struct msm_dp *dp =3D dp_bridge->msm_dp_display; + + msm_dp_display_mode_set(dp, mode, adjusted_mode); +} + +static enum drm_mode_status msm_dp_bridge_mode_valid(struct drm_bridge *dr= m_bridge, + const struct drm_display_info *info, + const struct drm_display_mode *mode) +{ + struct msm_dp_bridge *dp_bridge =3D to_dp_bridge(drm_bridge); + struct msm_dp *dp =3D dp_bridge->msm_dp_display; + + return msm_dp_display_mode_valid(dp, info, mode); +} + static const struct drm_bridge_funcs msm_dp_bridge_ops =3D { .atomic_duplicate_state =3D drm_atomic_helper_bridge_duplicate_state, .atomic_destroy_state =3D drm_atomic_helper_bridge_destroy_state, @@ -149,7 +196,7 @@ static void msm_edp_bridge_atomic_enable(struct drm_bri= dge *drm_bridge, return; } =20 - msm_dp_bridge_atomic_enable(drm_bridge, state); + msm_dp_display_atomic_enable(dp); } =20 static void msm_edp_bridge_atomic_disable(struct drm_bridge *drm_bridge, diff --git a/drivers/gpu/drm/msm/dp/dp_drm.h b/drivers/gpu/drm/msm/dp/dp_dr= m.h index 0d026bc9becf777aee192b9200197f477012bf8f..1066bb181a50b462203647618db= 6386e72a8eb32 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.h +++ b/drivers/gpu/drm/msm/dp/dp_drm.h @@ -26,18 +26,6 @@ int msm_dp_bridge_init(struct msm_dp *msm_dp_display, st= ruct drm_device *dev, bool yuv_supported); =20 enum drm_connector_status msm_dp_bridge_detect(struct drm_bridge *bridge, = struct drm_connector *connector); -void msm_dp_bridge_atomic_enable(struct drm_bridge *drm_bridge, - struct drm_atomic_state *state); -void msm_dp_bridge_atomic_disable(struct drm_bridge *drm_bridge, - struct drm_atomic_state *state); -void msm_dp_bridge_atomic_post_disable(struct drm_bridge *drm_bridge, - struct drm_atomic_state *state); -enum drm_mode_status msm_dp_bridge_mode_valid(struct drm_bridge *bridge, - const struct drm_display_info *info, - const struct drm_display_mode *mode); -void msm_dp_bridge_mode_set(struct drm_bridge *drm_bridge, - const struct drm_display_mode *mode, - const struct drm_display_mode *adjusted_mode); void msm_dp_bridge_hpd_enable(struct drm_bridge *bridge); void msm_dp_bridge_hpd_disable(struct drm_bridge *bridge); void msm_dp_bridge_hpd_notify(struct drm_bridge *bridge, --=20 2.34.1