From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 F1F20CD6E57 for ; Tue, 2 Jun 2026 09:12:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 42A4310EDBA; Tue, 2 Jun 2026 09:12:28 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="P41Qh0UB"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="b6ryjlWD"; dkim-atps=neutral Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by gabe.freedesktop.org (Postfix) with ESMTPS id 69DA810EDB5 for ; Tue, 2 Jun 2026 09:12:27 +0000 (UTC) Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6527geLO3302790 for ; Tue, 2 Jun 2026 09:12:26 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= PrpKel4Av768jUzNR25shjZmFALdbmxo17UJsOuCq8E=; b=P41Qh0UBJwUMVqAH +WeQYemVTDFeIzz70XPe1rSvikEx0j/H2iFo6Ncy+IO0JtUewsvD7tNMbuDjd2D0 gpd0IlJ8zQil0/eGAXTnpgDVz2Z+MQhUeAPCczBco/XY6N3W2Okskto2F3ZnCGLt hUfYM2XCv/x4HbOWeXOWlsb2xfd02x3145thAjy1dj3E6tQVsOFKhBRB/OAxHVX/ j1l5qGd/7XSrWuIrAf/WVAaevTXfUysvc+dbei5zyPaqeXMZAnObYovvjFlBXfBj +ZQ2SOUHgZvrl9cTRcGTD2tJeOuDGgTt5013+LJzcA+QJctay9/qgDj6pggtqpQ4 mSNiWg== Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ehu18gcj2-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 02 Jun 2026 09:12:26 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-51771d41426so4633181cf.2 for ; Tue, 02 Jun 2026 02:12:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780391546; x=1780996346; darn=lists.freedesktop.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=PrpKel4Av768jUzNR25shjZmFALdbmxo17UJsOuCq8E=; b=b6ryjlWDMn3U819+jtRQsWNwL4R1D/0pXzuiuFFYOVmjxfET9hbAat879MLQa72PRv 9XOdGeGaeIfBB3v5yEhDKkkWv7PvLmASA6wofIKOlDRB+gRgPr0sGW//Jkf520EFvhbM ahLxXM+UO1esU2HtIL/Jk9QL2oAZhWCadlxGwdYMbaKX47CCXMj7IsbigFXdAJANIyvv STSnu/oWocYcRTqNxZRzFNjGZFw0KqWljPHM6axZb1fTyWHx4IqioOofGUVvss3Yf5O+ YFhX+9t9iXDqyRznBASMdLOllOhWAAZ//+oD/rFHzzoqsZlPpcUR41ri49JhT8Q2pcCC AHfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780391546; x=1780996346; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=PrpKel4Av768jUzNR25shjZmFALdbmxo17UJsOuCq8E=; b=FB/6tBuHo12vtPQo7O+zeiVqxY3WkytFh5sce/WJtdIYmT9PRH3xIZYlnI4XzBYDe+ +ag13pZPSm8hIeHGwr78xjHRNezI/c8WOuvEpLSnj7xyJBJQyqnkZ/OqR79SRojH+z8T RYmwLQj/iD4Uy6UpgQoSgWXCuQKNrYfICpULofXRM8tFcYz70oQRy4vzn6ZbaUVNCo40 rSuaarQPvAQCdVGPXC+tXDTLUok0XuFJtBI5w0l+vu7c6w0YGfxkKzADPTDUWwVq0RKb l+8347/OwoBiEl40h9KR5o2tce3ndxA30JHdPNidgOXqGc0cpTmaHIzdpvDU8xJS3h2o orTg== X-Forwarded-Encrypted: i=1; AFNElJ9eYGz76FqU/dzvDq5lH6aSq5hRpzZysEx4BclYDOGw/ZJQplHx8jyFm9s5hKSxGPOTqvsNnvT5b/s=@lists.freedesktop.org X-Gm-Message-State: AOJu0Ywz1lv/GWKBb3dGiyvqbDud+CYV/MaCWZkjNgU5iWJOi+AbDnHJ APAjmWmguOuyAOPf/mWOOGayhpNM8WYs1eFWU/U+6cvp1DJiUSNgkhUV504MXgY2I7A2m7TJAIQ T4pYun9rS/f6+YVdnviWtmsSWB8g4rAZwLcQ7Q3hynlmaO/HcHJ2axwzDwR3P3MC6G/hAz+0= X-Gm-Gg: Acq92OEaOs7F0wMyoSGzPdpKLGf/tAIMNi9hP8kv3/PDOd/i0qc3OQ9Ub4vaX7bVgwh LJyGacSflYtY5Us1iMPbSDuLQaIP53hayDc0K2OGYNDbdFUgCA5QZvM/Dd9KtyXakDApx7R/q9b SIGQyTaA6hcPcDqZg4T5PTiXVe3ENyTCMOixT3c8QsOg+l3U7NNeoQuRHKDITA79Ouc8Wnw1zWc ZeY77Z7AqNdXqwWTVrZcJ8z8kk4yXEMt3KyY+WcLBGKYG6Q3ut3A2LdXv/z/G76yitF9nBXB8J9 tUoFMpjRnpf5XP31TYBrCWV1x/kr6cEpzA9n5eh3dEFeaOHlc6IZqsG7aWSWRqICiaJvUF0dgIs 7gJePxJ0cmIvTVmQ1+QP62EmcwAofbOMHiGt4JpF864KXahoIP3nZlNcSFGamlc+JCfCtM4xU8j pxSXHnreGBq3ygbp9Neg== X-Received: by 2002:a05:622a:418a:b0:516:c8ec:5f67 with SMTP id d75a77b69052e-5173a84a3f1mr198592491cf.56.1780391545603; Tue, 02 Jun 2026 02:12:25 -0700 (PDT) X-Received: by 2002:a05:622a:418a:b0:516:c8ec:5f67 with SMTP id d75a77b69052e-5173a84a3f1mr198592131cf.56.1780391545156; Tue, 02 Jun 2026 02:12:25 -0700 (PDT) Received: from yongmou2.ap.qualcomm.com (Global_NAT1_IAD_FW.qualcomm.com. [129.46.232.65]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-51768c76e53sm12480851cf.4.2026.06.02.02.12.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 02:12:24 -0700 (PDT) From: Yongxing Mou Date: Tue, 02 Jun 2026 17:11:25 +0800 Subject: [PATCH v6 13/15] drm/msm/dp: make bridge helpers use dp_display to allow re-use MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260602-dp_mstclean-v6-13-2c17ff40a9b2@oss.qualcomm.com> References: <20260602-dp_mstclean-v6-0-2c17ff40a9b2@oss.qualcomm.com> In-Reply-To: <20260602-dp_mstclean-v6-0-2c17ff40a9b2@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 , Dmitry Baryshkov X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1780391476; l=8509; i=yongxing.mou@oss.qualcomm.com; s=20250910; h=from:subject:message-id; bh=js7Ds0kDP3MA2PA3qJwTal/QoxqVBRyKdoKt/vuLT7c=; b=ZIKUZVz4daNTz0P7bthYlY4nnsEdqpv9D4FX1PiLsqSkdPb+Ap4IAbCOx2h0GKWct4PCbB+Eg gACCsLNcWNdCcbNqO9aJtUKjhurRfJLyZAEGoCcgEQSArxbs8jLgRgi X-Developer-Key: i=yongxing.mou@oss.qualcomm.com; a=ed25519; pk=rAy5J1eP+V7OXqH5FJ7ngMCtUrnHhut30ZTldOj52UM= X-Authority-Analysis: v=2.4 cv=POA/P/qC c=1 sm=1 tr=0 ts=6a1e9e7a cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=C3Dk8TwHQYyIj7nOf9RCJw==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=LmD7BKvqrCyCckpIDn8A:9 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjAyMDA4NiBTYWx0ZWRfX78EW9i8fGQzg RsXpMxxmFnG70O6mCZgHR4LZh1DY5+jgt++zp+Qj/aG5t+jc9eel9rAY8dcEnaFve6PnG57rRJF Ll9vKaABHxhcIKy4NzdF+IVKRRt/iHhsqR2X4h+iyVi6c5GisXDJ4Yyj+Rc+FEBPNKFP0FNW4iK 3FM4qn7M5efUEtB338MGO3ZMriqZTAf80vaKtr7Y3VTHZpuTXpDCOfPx8/vMr6/Cx46aCyjMB9V NYhNxxnEx6YI6VlPkt+NGL1kKFs1OdNv/dac1twjyeZMHvVdsRkEvPrzSjuMbrBsPUw2NVXHX9l M7DoQUe8LoH6/AdSuh2mDGNhJR95HPQBIB/ax1JCYk5IZRtCDbMaSFBIiLUUpyo9EzgoYqI4gvw eppp2TTzeSiYMdNRNdfT5YDxsAdpOTzVnO7VZpUqgZyfjljn1jqKBJ5qcNiJDrwCjkGJepwojt3 io48qmWB/nDY3qrcUvA== X-Proofpoint-GUID: jdt70WbL-Bay7YH0GoDPy8gNVcNz5e6u X-Proofpoint-ORIG-GUID: jdt70WbL-Bay7YH0GoDPy8gNVcNz5e6u X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-01_07,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 lowpriorityscore=0 priorityscore=1501 spamscore=0 bulkscore=0 adultscore=0 phishscore=0 impostorscore=0 clxscore=1015 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606020086 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/dp/dp_display.c | 29 +++++++++------------------ drivers/gpu/drm/msm/dp/dp_display.h | 7 +++++++ drivers/gpu/drm/msm/dp/dp_drm.c | 39 ++++++++++++++++++++++++++++++++++++- drivers/gpu/drm/msm/dp/dp_drm.h | 9 --------- 4 files changed, 54 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 63e5b191f95c..2d5ef087648c 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -738,24 +738,21 @@ static int msm_dp_display_disable(struct msm_dp_display_private *dp) /** * msm_dp_bridge_mode_valid - callback to determine if specified mode is valid - * @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 = 3, default_bpp = 24; struct msm_dp_display_private *msm_dp_display; struct msm_dp_link_info *link_info; u32 mode_rate_khz = 0, supported_rate_khz = 0, mode_bpp = 0; - struct msm_dp *dp; int mode_pclk_khz = mode->clock; - dp = to_dp_bridge(bridge)->msm_dp_display; - if (!dp || !mode_pclk_khz || !dp->connector) { DRM_ERROR("invalid params\n"); return -EINVAL; @@ -1406,11 +1403,9 @@ int msm_dp_modeset_init(struct msm_dp *msm_dp_display, struct drm_device *dev, return 0; } -void msm_dp_bridge_atomic_enable(struct drm_bridge *drm_bridge, - struct drm_atomic_commit *state) +void msm_dp_display_atomic_enable(struct msm_dp *msm_dp_display, + struct drm_atomic_commit *state) { - struct msm_dp_bridge *msm_dp_bridge = to_dp_bridge(drm_bridge); - struct msm_dp *msm_dp_display = msm_dp_bridge->msm_dp_display; struct drm_crtc *crtc; struct drm_crtc_state *crtc_state; int rc = 0; @@ -1419,7 +1414,7 @@ void msm_dp_bridge_atomic_enable(struct drm_bridge *drm_bridge, dp = container_of(msm_dp_display, struct msm_dp_display_private, msm_dp_display); crtc = drm_atomic_get_new_crtc_for_encoder(state, - drm_bridge->encoder); + msm_dp_display->bridge->encoder); if (!crtc) return; crtc_state = drm_atomic_get_new_crtc_state(state, crtc); @@ -1449,11 +1444,8 @@ void msm_dp_bridge_atomic_enable(struct drm_bridge *drm_bridge, drm_dbg_dp(msm_dp_display->drm_dev, "type=%d Done\n", msm_dp_display->connector_type); } -void msm_dp_bridge_atomic_disable(struct drm_bridge *drm_bridge, - struct drm_atomic_commit *state) +void msm_dp_display_atomic_disable(struct msm_dp *dp) { - struct msm_dp_bridge *msm_dp_bridge = to_dp_bridge(drm_bridge); - struct msm_dp *dp = msm_dp_bridge->msm_dp_display; struct msm_dp_display_private *msm_dp_display; msm_dp_display = container_of(dp, struct msm_dp_display_private, msm_dp_display); @@ -1470,11 +1462,8 @@ static void msm_dp_display_unprepare(struct msm_dp_display_private *dp) drm_dbg_dp(dp->drm_dev, "type=%d Done\n", msm_dp_display->connector_type); } -void msm_dp_bridge_atomic_post_disable(struct drm_bridge *drm_bridge, - struct drm_atomic_commit *state) +void msm_dp_display_atomic_post_disable(struct msm_dp *dp) { - struct msm_dp_bridge *msm_dp_bridge = to_dp_bridge(drm_bridge); - struct msm_dp *dp = msm_dp_bridge->msm_dp_display; struct msm_dp_display_private *msm_dp_display; msm_dp_display = container_of(dp, struct msm_dp_display_private, msm_dp_display); diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h index 0b65e16c790d..5116f7bbbd02 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.h +++ b/drivers/gpu/drm/msm/dp/dp_display.h @@ -33,5 +33,12 @@ void msm_dp_display_signal_audio_start(struct msm_dp *msm_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 dentry *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, + struct drm_atomic_commit *state); +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); #endif /* _DP_DISPLAY_H_ */ diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c index 6ac5bac903d9..6b8923d9dff4 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.c +++ b/drivers/gpu/drm/msm/dp/dp_drm.c @@ -49,6 +49,43 @@ static void msm_dp_bridge_debugfs_init(struct drm_bridge *bridge, struct dentry msm_dp_display_debugfs_init(dp, root, false); } +static void msm_dp_bridge_atomic_enable(struct drm_bridge *drm_bridge, + struct drm_atomic_commit *state) +{ + struct msm_dp_bridge *dp_bridge = to_dp_bridge(drm_bridge); + struct msm_dp *dp = dp_bridge->msm_dp_display; + + msm_dp_display_atomic_enable(dp, state); +} + +static void msm_dp_bridge_atomic_disable(struct drm_bridge *drm_bridge, + struct drm_atomic_commit *state) +{ + struct msm_dp_bridge *dp_bridge = to_dp_bridge(drm_bridge); + struct msm_dp *dp = dp_bridge->msm_dp_display; + + msm_dp_display_atomic_disable(dp); +} + +static void msm_dp_bridge_atomic_post_disable(struct drm_bridge *drm_bridge, + struct drm_atomic_commit *state) +{ + struct msm_dp_bridge *dp_bridge = to_dp_bridge(drm_bridge); + struct msm_dp *dp = dp_bridge->msm_dp_display; + + msm_dp_display_atomic_post_disable(dp); +} + +static enum drm_mode_status msm_dp_bridge_mode_valid(struct drm_bridge *drm_bridge, + const struct drm_display_info *info, + const struct drm_display_mode *mode) +{ + struct msm_dp_bridge *dp_bridge = to_dp_bridge(drm_bridge); + struct msm_dp *dp = dp_bridge->msm_dp_display; + + return msm_dp_display_mode_valid(dp, info, mode); +} + static const struct drm_bridge_funcs msm_dp_bridge_ops = { .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, @@ -115,7 +152,7 @@ static void msm_edp_bridge_atomic_enable(struct drm_bridge *drm_bridge, return; } - msm_dp_bridge_atomic_enable(drm_bridge, state); + msm_dp_display_atomic_enable(dp, state); } 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_drm.h index 4bd788ea05d5..da412c788503 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.h +++ b/drivers/gpu/drm/msm/dp/dp_drm.h @@ -27,15 +27,6 @@ int msm_dp_bridge_init(struct msm_dp *msm_dp_display, struct drm_device *dev, 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_commit *state); -void msm_dp_bridge_atomic_disable(struct drm_bridge *drm_bridge, - struct drm_atomic_commit *state); -void msm_dp_bridge_atomic_post_disable(struct drm_bridge *drm_bridge, - struct drm_atomic_commit *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_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, -- 2.43.0