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 E2C41E99062 for ; Fri, 10 Apr 2026 09:34:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4585610E903; Fri, 10 Apr 2026 09:34:06 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="OSyw+UXJ"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="MBJqTQxd"; 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 5CB6C10E903 for ; Fri, 10 Apr 2026 09:34:05 +0000 (UTC) Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63A4kWnI2698454 for ; Fri, 10 Apr 2026 09:34:04 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= fg70xtusfN77l4edYTdi7IRcKoTkvyoEWLzCZzOuv8g=; b=OSyw+UXJZ6GcMaOW 9Vo9HJ7bnW0K2/1T3tLvhcsNefPeVFPPQkS0LUh84c7feoSijUL+WTeoQyffjrwj haT3/c2Ve142fyTkz1gu1zr//spUIoYdkvm3lnTvAbcsUiXhBlmyf8bSFlduCoyR nlmkNFkdoohKFJea0yYVtGx+NW7xJDCrtnztJ9/XETEMd4O36mPSR8JM3FS8FtIs VkN+Bv/5GPu+7HYd6QC8rPiQnaB8y8wG9pa51+5rVi8J+f2hJ0jvz0LailEa5xrN a75WDNnLD4SJgEmEDuQICWrpmV18haifKg2egSoIXz2xKI2pMYsRz4OBQvzKZ32W /BeJTw== Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4degt9tjch-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 10 Apr 2026 09:34:04 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-89463017976so46577746d6.2 for ; Fri, 10 Apr 2026 02:34:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1775813644; x=1776418444; 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=fg70xtusfN77l4edYTdi7IRcKoTkvyoEWLzCZzOuv8g=; b=MBJqTQxdVVVuBZWLro4myDszRBsx0mn+yNWQGGMXa5eTRuPrao2BDUE5bLwdte4du3 bzRUkljv5oZYmLuMB3PYvFjLaq2I8UExsoYnNq7fBvuaI9FAe/yrIXEDsvi2kaa/+r8Y zSEfCszsEIKeb9I78CHYCkcWVji8u5hh7GNcui8KyRfIMKvo5ZWftQfPXUlgH8Y4L7dr KVhxPGPDv7jdmUb1TPfxlWbKex7UV5HgTtIXUCWif8dgDKV52TWAmMjSM/Hw0BhS0cFK Te8O925NvzOE78DmNPLLhzjRS77xDbtOd5TmDYx2ff0aCT3PP8df1tKM40vPITjhR2Ex GB4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775813644; x=1776418444; 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=fg70xtusfN77l4edYTdi7IRcKoTkvyoEWLzCZzOuv8g=; b=fLGnnGOrd6R7xQyrseuBS0yydMCGTSdH8/A1R+zof/fVX52KXcmSLicLh2vfayJpz5 woH+y4i3+sdzhRNXvkPJ8Mm4BfIKtMm2fLg5PYPFxfZKQHlqXtPpEvIlsWlHzZFm1ABw KcipGj/RVudk8lPyoLwd191JsLW4axEwSfowk9o5psFlc6SCuh4vsZTC6FdQ9uLbCoKN 2xOKiXuttQgGWUTVIJm0TRsaPO/3BUfmyUUkG+xlOhYawHtDj+C16VOsVjKQRkUdNjjs F2wsWCOb9+HPrWfsIgzJv6ihilNkmEecVhn81UAtEnvnNLB3C+TGMyQ7OpOr83XwxeOZ 8ffQ== X-Forwarded-Encrypted: i=1; AJvYcCWTDZYQTYh3oLqEksKmLimkBVk58OpMBzB+bT1WUwwfG+Yn9uW3+q1C8aGB60j33WLuqwTsqY+jwx8=@lists.freedesktop.org X-Gm-Message-State: AOJu0YwJUXChrvyETYnJrANLoF6LW/TaV0QDo1v+OllcniVPtTTscAOm njWrL7dZ2xeqPa/JQin8EGekmDcyjUTBRFU21V5usjAk4/H5Bli3JucW60dwpSdZkIv4wVxGY8j M4KM3pRXSNK4BX0ed+RFyjo6J/h3WjuNZE0yco9WY1KCYwiFrdWZVT3r6HNO+Z8CN9RU+uXA= X-Gm-Gg: AeBDievhlOn2wT6HDmU9KjO4a7YrKVWshPum2yq55VhF8gyfOynoRfkFEAC1kDiFctv 1cEnrr8SHfwbTVRjekx5KBymC6ttExF8tKkIuyjnREzGomULFvgvWzmTpnBU7lVbEJ1r2Luekwf beJ2xa8843GbzWPQVpQeUJlj6o6jIAoEfEbkPHZ9nw8vqi1T1tNQZmS0ZMdNpUKcWISJ5gKTL/R /ibKOOtF8/USUEcMC+VuqXaqADHy7PbMqr0Axa2DNPGRo0qmhpYvlk0lkTqznRxsJhgAddK2A75 OTaybglbabKIQcCv/haqm+KFiB7TgNl6oyJHhuDLa9Dgh/wWlRephK1+NDbxzcqHof5QdK2VQCm 0/Wm1xo/G4yUXTqlfzdb3BoQxWHf8XHP+WH0b3AusjtlKv19W7c6WC1Ok8uOffgltWdlrm0srBV damcyu7CY= X-Received: by 2002:a05:6214:590a:b0:8a0:f8b7:3921 with SMTP id 6a1803df08f44-8ac862b616fmr37621646d6.41.1775813643770; Fri, 10 Apr 2026 02:34:03 -0700 (PDT) X-Received: by 2002:a05:6214:590a:b0:8a0:f8b7:3921 with SMTP id 6a1803df08f44-8ac862b616fmr37621316d6.41.1775813643326; Fri, 10 Apr 2026 02:34:03 -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 6a1803df08f44-8ac84cb135fsm19223386d6.38.2026.04.10.02.33.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Apr 2026 02:34:03 -0700 (PDT) From: Yongxing Mou Date: Fri, 10 Apr 2026 17:33:37 +0800 Subject: [PATCH v4 02/39] drm/msm/dp: drop deprecated .mode_set() and use .atomic_enable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260410-msm-dp-mst-v4-2-b20518dea8de@oss.qualcomm.com> References: <20260410-msm-dp-mst-v4-0-b20518dea8de@oss.qualcomm.com> In-Reply-To: <20260410-msm-dp-mst-v4-0-b20518dea8de@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Jessica Zhang 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.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1775813628; l=8088; i=yongxing.mou@oss.qualcomm.com; s=20250910; h=from:subject:message-id; bh=/8I1D20k5pe6RwV9Jpppj+obqELe9VfhV15Tbm4kzzU=; b=pGsItULXtVsRnYvB8oGeS2J5jxWyb2f5WlOiVLDk6gaWnXrpfnOeitpPk3HH+2Qa8GRJAWG6P fFBe1n4Vdc5Axe3iudpNvrfMTWBjEx+T9C8qqGobkHyOBeUtekkJPkA X-Developer-Key: i=yongxing.mou@oss.qualcomm.com; a=ed25519; pk=rAy5J1eP+V7OXqH5FJ7ngMCtUrnHhut30ZTldOj52UM= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDEwMDA4OCBTYWx0ZWRfX8Mhm7xyGSNY0 1fKj6kjN+16KKJLgMEbyMN2IRVM8IqLOly7sCuXG9J3UV0+w8FZMh2HJFhVgTM7Au/Q2Byh+Yra 7tBQ6FurUwNvrOvMbzy155m6GgAOUxuB7Z8lzQUoYGRZmbxtGwk9m/dAELZcAEE3YYlhs4ns5E7 cP3prQ8ODSxUnVyI9vSQHHmO2gYLR/U3lY2jCyyOflqjErIgnzsI6UzqZmimcibKYniSKPooD6M xijqxEKwPxjnGWDe1yfXPNPwVCn/b562JUFWxlzQvRZ9TWRUJOG2jEt/OBG2cZ5fvudlgi5bKiy 0khexGWWYKN18e1Y3qZf/yHrWCCKcsnCM6ZnWtYVaZ39BhGDX1njWj8U3+RYAlDQYECGtb48Dig llBmN03KJ/xt/KPTC7LnoQZWAH1gNJc/D+DJDpfLzEznskSwlKluHZgelhFYjr/Hl5lfl65z21y y80zx4xT9hn5aK5G8Ew== X-Proofpoint-ORIG-GUID: fOBEsYkBfHU-b7L9zBv-FmettNlHWE0p X-Proofpoint-GUID: fOBEsYkBfHU-b7L9zBv-FmettNlHWE0p X-Authority-Analysis: v=2.4 cv=BJyDalQG c=1 sm=1 tr=0 ts=69d8c40c cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=C3Dk8TwHQYyIj7nOf9RCJw==:17 a=IkcTkHD0fZMA:10 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=ohAeICWEHyx3i1rom8gA:9 a=QEXdDO2ut3YA:10 a=1HOtulTD9v-eNWfpl4qZ:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-10_03,2026-04-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 bulkscore=0 adultscore=0 priorityscore=1501 impostorscore=0 clxscore=1015 phishscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604010000 definitions=main-2604100088 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" The bridge .mode_set() callback is deprecated. Remove it and move all mode setup logic to .atomic_enable(), where the adjusted_mode is available from the atomic CRTC state. Drop msm_dp_mode from msm_dp_display_private and store the mode directly in the panel, as it was only used as a temporary cache. Both changes are limited to msm_dp_display_set_mode and are kept in a single patch. Signed-off-by: Abhinav Kumar Signed-off-by: Yongxing Mou --- drivers/gpu/drm/msm/dp/dp_display.c | 81 ++++++++++++++----------------------- drivers/gpu/drm/msm/dp/dp_drm.c | 2 - drivers/gpu/drm/msm/dp/dp_drm.h | 3 -- 3 files changed, 31 insertions(+), 55 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index e28cc1bbb5b1..e9f0b96c3ebd 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -63,7 +63,6 @@ struct msm_dp_display_private { struct msm_dp_panel *panel; struct msm_dp_ctrl *ctrl; - struct msm_dp_display_mode msm_dp_mode; struct msm_dp msm_dp_display; /* wait for audio signaling */ @@ -593,16 +592,33 @@ static int msm_dp_init_sub_modules(struct msm_dp_display_private *dp) } static int msm_dp_display_set_mode(struct msm_dp *msm_dp_display, - struct msm_dp_display_mode *mode) + const struct drm_display_mode *adjusted_mode, + struct msm_dp_panel *msm_dp_panel) { struct msm_dp_display_private *dp; + u32 bpp; dp = container_of(msm_dp_display, struct msm_dp_display_private, msm_dp_display); - drm_mode_copy(&dp->panel->msm_dp_mode.drm_mode, &mode->drm_mode); - dp->panel->msm_dp_mode.bpp = mode->bpp; - dp->panel->msm_dp_mode.out_fmt_is_yuv_420 = mode->out_fmt_is_yuv_420; - msm_dp_panel_init_panel_info(dp->panel); + drm_mode_copy(&msm_dp_panel->msm_dp_mode.drm_mode, adjusted_mode); + if (msm_dp_display_check_video_test(msm_dp_display)) + bpp = msm_dp_display_get_test_bpp(msm_dp_display); + else + bpp = msm_dp_panel->connector->display_info.bpc * 3; + + msm_dp_panel->msm_dp_mode.bpp = bpp ? bpp : 24; /* Default bpp */ + msm_dp_panel->msm_dp_mode.v_active_low = + !!(adjusted_mode->flags & DRM_MODE_FLAG_NVSYNC); + msm_dp_panel->msm_dp_mode.h_active_low = + !!(adjusted_mode->flags & DRM_MODE_FLAG_NHSYNC); + msm_dp_panel->msm_dp_mode.out_fmt_is_yuv_420 = + drm_mode_is_420_only(&msm_dp_panel->connector->display_info, adjusted_mode) && + msm_dp_panel->vsc_sdp_supported; + msm_dp_panel_init_panel_info(msm_dp_panel); + + /* populate wide_bus_support to different layers */ + dp->ctrl->wide_bus_en = + msm_dp_panel->msm_dp_mode.out_fmt_is_yuv_420 ? false : dp->wide_bus_supported; return 0; } @@ -1305,7 +1321,7 @@ bool msm_dp_wide_bus_available(const struct msm_dp *msm_dp_display) dp = container_of(msm_dp_display, struct msm_dp_display_private, msm_dp_display); - if (dp->msm_dp_mode.out_fmt_is_yuv_420) + if (dp->panel->msm_dp_mode.out_fmt_is_yuv_420) return false; return dp->wide_bus_supported; @@ -1361,15 +1377,19 @@ void msm_dp_bridge_atomic_enable(struct drm_bridge *drm_bridge, { struct msm_dp_bridge *msm_dp_bridge = to_dp_bridge(drm_bridge); struct msm_dp *dp = msm_dp_bridge->msm_dp_display; + struct drm_crtc *crtc; + struct drm_crtc_state *crtc_state; int rc = 0; struct msm_dp_display_private *msm_dp_display; bool force_link_train = false; msm_dp_display = container_of(dp, struct msm_dp_display_private, msm_dp_display); - if (!msm_dp_display->msm_dp_mode.drm_mode.clock) { - DRM_ERROR("invalid params\n"); + + crtc = drm_atomic_get_new_crtc_for_encoder(state, + drm_bridge->encoder); + if (!crtc) return; - } + crtc_state = drm_atomic_get_new_crtc_state(state, crtc); if (dp->is_edp) msm_dp_hpd_plug_handle(msm_dp_display); @@ -1382,7 +1402,7 @@ void msm_dp_bridge_atomic_enable(struct drm_bridge *drm_bridge, if (msm_dp_display->link->sink_count == 0) return; - rc = msm_dp_display_set_mode(dp, &msm_dp_display->msm_dp_mode); + rc = msm_dp_display_set_mode(dp, &crtc_state->adjusted_mode, msm_dp_display->panel); if (rc) { DRM_ERROR("Failed to perform a mode set, rc=%d\n", rc); return; @@ -1440,45 +1460,6 @@ void msm_dp_bridge_atomic_post_disable(struct drm_bridge *drm_bridge, pm_runtime_put_sync(&dp->pdev->dev); } -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 *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; - struct msm_dp_panel *msm_dp_panel; - - msm_dp_display = container_of(dp, struct msm_dp_display_private, msm_dp_display); - msm_dp_panel = msm_dp_display->panel; - - memset(&msm_dp_display->msm_dp_mode, 0x0, sizeof(struct msm_dp_display_mode)); - - if (msm_dp_display_check_video_test(dp)) - msm_dp_display->msm_dp_mode.bpp = msm_dp_display_get_test_bpp(dp); - else /* Default num_components per pixel = 3 */ - msm_dp_display->msm_dp_mode.bpp = dp->connector->display_info.bpc * 3; - - if (!msm_dp_display->msm_dp_mode.bpp) - msm_dp_display->msm_dp_mode.bpp = 24; /* Default bpp */ - - drm_mode_copy(&msm_dp_display->msm_dp_mode.drm_mode, adjusted_mode); - - msm_dp_display->msm_dp_mode.v_active_low = - !!(msm_dp_display->msm_dp_mode.drm_mode.flags & DRM_MODE_FLAG_NVSYNC); - - msm_dp_display->msm_dp_mode.h_active_low = - !!(msm_dp_display->msm_dp_mode.drm_mode.flags & DRM_MODE_FLAG_NHSYNC); - - msm_dp_display->msm_dp_mode.out_fmt_is_yuv_420 = - drm_mode_is_420_only(&dp->connector->display_info, adjusted_mode) && - msm_dp_panel->vsc_sdp_supported; - - /* populate wide_bus_support to different layers */ - msm_dp_display->ctrl->wide_bus_en = - msm_dp_display->msm_dp_mode.out_fmt_is_yuv_420 ? false : msm_dp_display->wide_bus_supported; -} - void msm_dp_bridge_hpd_enable(struct drm_bridge *bridge) { struct msm_dp_bridge *msm_dp_bridge = to_dp_bridge(bridge); diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c index 8dc0dabd275c..af3d3e3a2d84 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.c +++ b/drivers/gpu/drm/msm/dp/dp_drm.c @@ -56,7 +56,6 @@ static const struct drm_bridge_funcs msm_dp_bridge_ops = { .atomic_enable = msm_dp_bridge_atomic_enable, .atomic_disable = msm_dp_bridge_atomic_disable, .atomic_post_disable = msm_dp_bridge_atomic_post_disable, - .mode_set = msm_dp_bridge_mode_set, .mode_valid = msm_dp_bridge_mode_valid, .get_modes = msm_dp_bridge_get_modes, .detect = msm_dp_bridge_detect, @@ -233,7 +232,6 @@ static const struct drm_bridge_funcs msm_edp_bridge_ops = { .atomic_enable = msm_edp_bridge_atomic_enable, .atomic_disable = msm_edp_bridge_atomic_disable, .atomic_post_disable = msm_edp_bridge_atomic_post_disable, - .mode_set = msm_dp_bridge_mode_set, .mode_valid = msm_edp_bridge_mode_valid, .atomic_reset = drm_atomic_helper_bridge_reset, .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, diff --git a/drivers/gpu/drm/msm/dp/dp_drm.h b/drivers/gpu/drm/msm/dp/dp_drm.h index 6c0426803d78..6d4cbb9f3918 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.h +++ b/drivers/gpu/drm/msm/dp/dp_drm.h @@ -36,9 +36,6 @@ void msm_dp_bridge_atomic_post_disable(struct drm_bridge *drm_bridge, 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, -- 2.43.0