From nobody Thu Dec 18 21:13:35 2025 Received: from out-183.mta0.migadu.com (out-183.mta0.migadu.com [91.218.175.183]) (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 6382C23A0E3 for ; Tue, 14 Jan 2025 05:57:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736834275; cv=none; b=rQ7h9sgBW/c8/uM9F9SwiY6oCUOPSk8yO7/OPBONS8T1+YEP+QMk3YU6p3jXuXUZZ+eAXKTO+ECEFrUwZ7kj+GBIBvJy8jA7XqrTa2bW/NQCIZVpClqDDhj0lcyBA0pz7aM8uZlNmjJpLxsYzQMPC6MCePKV++4zG6ihBpopg+A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736834275; c=relaxed/simple; bh=Eykzz9aKfpoM52ErWEEFbTBHuJ/qcKcT+g+Ql2+LRvY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XYiMwpDkcGt19Dl4XPhTyKHuyM2DCvuK8Q9q16imi1x/6Ls6AeSQI+SlgNCLmhCHPktm/Rdbxklk5pfDkWX35C/8Og2glHHE48oy2Xu41XP8AFupPWN1TyuqIQB24LAFTIKDCtqt/dfx1zR28kVit76DZ2R3JGJ7rTLAcSekHsc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=GOJZ0EDu; arc=none smtp.client-ip=91.218.175.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="GOJZ0EDu" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1736834266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eENP3+SFcaPm5FY/S7gTWxP6nLAS6iAurWc+JashkSA=; b=GOJZ0EDuh2YWCDhVbHPs33IRQMsyCI731IbG3S62qGL3rh6epm/+uR/MX5HXzlQDGN/vDv AUuaXJ3E1mKkn1XoVRIYLkKDPF0AY1MsM5yB1kp+twLQeEC3drwUt/ehqNGKaM52cXYDwX ntK0/zNWVpxjzI4hFc6pPvcISRopc1E= From: Aradhya Bhatia To: Tomi Valkeinen , Dmitry Baryshkov , Laurent Pinchart , Andrzej Hajda , Neil Armstrong , Robert Foss , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: Nishanth Menon , Vignesh Raghavendra , Devarsh Thakkar , Praneeth Bajjuri , Udit Kumar , Jayesh Choudhary , DRI Development List , Linux Kernel List , Aradhya Bhatia Subject: [PATCH v7 10/12] drm/bridge: cdns-dsi: Move DSI mode check to _atomic_check() Date: Tue, 14 Jan 2025 11:26:24 +0530 Message-Id: <20250114055626.18816-11-aradhya.bhatia@linux.dev> In-Reply-To: <20250114055626.18816-1-aradhya.bhatia@linux.dev> References: <20250114055626.18816-1-aradhya.bhatia@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: Aradhya Bhatia At present, the DSI mode configuration check happens during the _atomic_enable() phase, which is not really the best place for this. Moreover, if the mode is not valid, the driver gives a warning and continues the hardware configuration. Move the DSI mode configuration check to _atomic_check() instead, which can properly report back any invalid mode, before the _enable phase even begins. Signed-off-by: Aradhya Bhatia Signed-off-by: Aradhya Bhatia Reviewed-by: Dmitry Baryshkov Reviewed-by: Tomi Valkeinen --- .../gpu/drm/bridge/cadence/cdns-dsi-core.c | 87 +++++++++++++++++-- 1 file changed, 82 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c b/drivers/gpu/d= rm/bridge/cadence/cdns-dsi-core.c index b8db984ea9fa..d60254e1270c 100644 --- a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c +++ b/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c @@ -425,6 +425,17 @@ #define DSI_NULL_FRAME_OVERHEAD 6 #define DSI_EOT_PKT_SIZE 4 =20 +struct cdns_dsi_bridge_state { + struct drm_bridge_state base; + struct cdns_dsi_cfg dsi_cfg; +}; + +static inline struct cdns_dsi_bridge_state * +to_cdns_dsi_bridge_state(struct drm_bridge_state *bridge_state) +{ + return container_of(bridge_state, struct cdns_dsi_bridge_state, base); +} + static inline struct cdns_dsi *input_to_dsi(struct cdns_dsi_input *input) { return container_of(input, struct cdns_dsi, input); @@ -768,6 +779,9 @@ static void cdns_dsi_bridge_atomic_enable(struct drm_br= idge *bridge, struct cdns_dsi_input *input =3D bridge_to_cdns_dsi_input(bridge); struct cdns_dsi *dsi =3D input_to_dsi(input); struct cdns_dsi_output *output =3D &dsi->output; + struct drm_atomic_state *state =3D old_bridge_state->base.state; + struct cdns_dsi_bridge_state *dsi_state; + struct drm_bridge_state *new_bridge_state; struct drm_display_mode *mode; struct phy_configure_opts_mipi_dphy *phy_cfg =3D &output->phy_opts.mipi_d= phy; unsigned long tx_byte_period; @@ -778,14 +792,19 @@ static void cdns_dsi_bridge_atomic_enable(struct drm_= bridge *bridge, if (WARN_ON(pm_runtime_get_sync(dsi->base.dev) < 0)) return; =20 + new_bridge_state =3D drm_atomic_get_new_bridge_state(state, bridge); + if (WARN_ON(!new_bridge_state)) + return; + + dsi_state =3D to_cdns_dsi_bridge_state(new_bridge_state); + dsi_cfg =3D dsi_state->dsi_cfg; + if (dsi->platform_ops && dsi->platform_ops->enable) dsi->platform_ops->enable(dsi); =20 mode =3D &bridge->encoder->crtc->state->adjusted_mode; nlanes =3D output->dev->lanes; =20 - WARN_ON_ONCE(cdns_dsi_check_conf(dsi, mode, &dsi_cfg, false)); - cdns_dsi_init_link(dsi); cdns_dsi_hs_init(dsi); =20 @@ -956,6 +975,63 @@ static u32 *cdns_dsi_bridge_get_input_bus_fmts(struct = drm_bridge *bridge, return input_fmts; } =20 +static int cdns_dsi_bridge_atomic_check(struct drm_bridge *bridge, + struct drm_bridge_state *bridge_state, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state) +{ + struct cdns_dsi_input *input =3D bridge_to_cdns_dsi_input(bridge); + struct cdns_dsi *dsi =3D input_to_dsi(input); + struct cdns_dsi_bridge_state *dsi_state =3D to_cdns_dsi_bridge_state(brid= ge_state); + struct drm_display_mode *mode =3D &crtc_state->mode; + struct cdns_dsi_cfg *dsi_cfg =3D &dsi_state->dsi_cfg; + + return cdns_dsi_check_conf(dsi, mode, dsi_cfg, false); +} + +static struct drm_bridge_state * +cdns_dsi_bridge_atomic_duplicate_state(struct drm_bridge *bridge) +{ + struct cdns_dsi_bridge_state *dsi_state; + + if (WARN_ON(!bridge->base.state)) + return NULL; + + dsi_state =3D kzalloc(sizeof(*dsi_state), GFP_KERNEL); + if (!dsi_state) + return NULL; + + __drm_atomic_helper_bridge_duplicate_state(bridge, &dsi_state->base); + + return &dsi_state->base; +} + +static void +cdns_dsi_bridge_atomic_destroy_state(struct drm_bridge *bridge, + struct drm_bridge_state *state) +{ + struct cdns_dsi_bridge_state *dsi_state; + + dsi_state =3D to_cdns_dsi_bridge_state(state); + + kfree(dsi_state); +} + +static struct drm_bridge_state * +cdns_dsi_bridge_atomic_reset(struct drm_bridge *bridge) +{ + struct cdns_dsi_bridge_state *dsi_state; + + dsi_state =3D kzalloc(sizeof(*dsi_state), GFP_KERNEL); + if (!dsi_state) + return NULL; + + memset(dsi_state, 0, sizeof(*dsi_state)); + dsi_state->base.bridge =3D bridge; + + return &dsi_state->base; +} + static const struct drm_bridge_funcs cdns_dsi_bridge_funcs =3D { .attach =3D cdns_dsi_bridge_attach, .mode_valid =3D cdns_dsi_bridge_mode_valid, @@ -963,9 +1039,10 @@ static const struct drm_bridge_funcs cdns_dsi_bridge_= funcs =3D { .atomic_pre_enable =3D cdns_dsi_bridge_atomic_pre_enable, .atomic_enable =3D cdns_dsi_bridge_atomic_enable, .atomic_post_disable =3D cdns_dsi_bridge_atomic_post_disable, - .atomic_duplicate_state =3D drm_atomic_helper_bridge_duplicate_state, - .atomic_destroy_state =3D drm_atomic_helper_bridge_destroy_state, - .atomic_reset =3D drm_atomic_helper_bridge_reset, + .atomic_check =3D cdns_dsi_bridge_atomic_check, + .atomic_duplicate_state =3D cdns_dsi_bridge_atomic_duplicate_state, + .atomic_destroy_state =3D cdns_dsi_bridge_atomic_destroy_state, + .atomic_reset =3D cdns_dsi_bridge_atomic_reset, .atomic_get_input_bus_fmts =3D cdns_dsi_bridge_get_input_bus_fmts, }; =20 --=20 2.34.1