From nobody Thu Dec 18 21:11:53 2025 Received: from out-186.mta0.migadu.com (out-186.mta0.migadu.com [91.218.175.186]) (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 8A94423A574 for ; Tue, 14 Jan 2025 05:57:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.186 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736834266; cv=none; b=Q1QoN+bz7Mxa8hjeZZ6kB40e5eQS3hZWbc7OD5U+yoZFtXxcZ5Nr9LlF5a8iIjYRIJ07ngnHu9zM5kJFpglFgX3pXifrhefO7ksKa9n4+Zl7X8jGhObeO6w6bNfC1QHtBoJTY28VNE0WIktHy+yv5z9Wwwq2V2+tOuJkVdmHrsA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736834266; c=relaxed/simple; bh=jCml8uNXBeT8OSXsueM0NByRMcF89g7YSkjGHtOW5D4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZjDrD07nN5jF00gbl444GthiEc+c3S1ryh1rVSWHCyLWuMoKS4xvCnlOnHqAx4jRyccPdaQjv4b0uRm0XHX4NY1qFiPh0GA3kQ199P3cDCdf3aKfQ500wx6AcIw69DBXYE6/n5qHHQLgsHYC5Wy7dN6+R/Rnj6m0aIS0viWBZ5w= 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=s7hkoMbd; arc=none smtp.client-ip=91.218.175.186 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="s7hkoMbd" 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=1736834262; 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=p3JWe8oOdcXlgSJ5p1oI8e1KrNT2qLS5EFEbJbvUfQ4=; b=s7hkoMbdDAVmYNLWNAHjxkie6YzdasCJ1Rj3VfM40l/Y2CqkQH7n92C/pK/3BOXrdNG+UZ qS/UvcISaA0y8Vs4AJTqFf7bM9INxFr8QirJRAJaEI6k8MLlRhEz39LB5Qz3+stR3Bzqb2 OEhwow1WWOLfFs0bz7pY6Buhlkw8CCs= 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 09/12] drm/bridge: cdns-dsi: Support atomic bridge APIs Date: Tue, 14 Jan 2025 11:26:23 +0530 Message-Id: <20250114055626.18816-10-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 Change the existing (and deprecated) bridge hooks, to the bridge atomic APIs. Add drm helpers for duplicate_state, destroy_state, and bridge_reset bridge hooks. Further add support for the input format negotiation hook. Reviewed-by: Dmitry Baryshkov Reviewed-by: Tomi Valkeinen Signed-off-by: Aradhya Bhatia Signed-off-by: Aradhya Bhatia --- .../gpu/drm/bridge/cadence/cdns-dsi-core.c | 51 ++++++++++++++++--- 1 file changed, 43 insertions(+), 8 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 713003e6c210..b8db984ea9fa 100644 --- a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c +++ b/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c @@ -658,7 +658,8 @@ cdns_dsi_bridge_mode_valid(struct drm_bridge *bridge, return MODE_OK; } =20 -static void cdns_dsi_bridge_disable(struct drm_bridge *bridge) +static void cdns_dsi_bridge_atomic_disable(struct drm_bridge *bridge, + struct drm_bridge_state *old_bridge_state) { struct cdns_dsi_input *input =3D bridge_to_cdns_dsi_input(bridge); struct cdns_dsi *dsi =3D input_to_dsi(input); @@ -683,7 +684,8 @@ static void cdns_dsi_bridge_disable(struct drm_bridge *= bridge) pm_runtime_put(dsi->base.dev); } =20 -static void cdns_dsi_bridge_post_disable(struct drm_bridge *bridge) +static void cdns_dsi_bridge_atomic_post_disable(struct drm_bridge *bridge, + struct drm_bridge_state *old_bridge_state) { struct cdns_dsi_input *input =3D bridge_to_cdns_dsi_input(bridge); struct cdns_dsi *dsi =3D input_to_dsi(input); @@ -760,7 +762,8 @@ static void cdns_dsi_init_link(struct cdns_dsi *dsi) dsi->link_initialized =3D true; } =20 -static void cdns_dsi_bridge_enable(struct drm_bridge *bridge) +static void cdns_dsi_bridge_atomic_enable(struct drm_bridge *bridge, + struct drm_bridge_state *old_bridge_state) { struct cdns_dsi_input *input =3D bridge_to_cdns_dsi_input(bridge); struct cdns_dsi *dsi =3D input_to_dsi(input); @@ -913,7 +916,8 @@ static void cdns_dsi_bridge_enable(struct drm_bridge *b= ridge) writel(tmp, dsi->regs + MCTL_MAIN_EN); } =20 -static void cdns_dsi_bridge_pre_enable(struct drm_bridge *bridge) +static void cdns_dsi_bridge_atomic_pre_enable(struct drm_bridge *bridge, + struct drm_bridge_state *old_bridge_state) { struct cdns_dsi_input *input =3D bridge_to_cdns_dsi_input(bridge); struct cdns_dsi *dsi =3D input_to_dsi(input); @@ -925,13 +929,44 @@ static void cdns_dsi_bridge_pre_enable(struct drm_bri= dge *bridge) cdns_dsi_hs_init(dsi); } =20 +static u32 *cdns_dsi_bridge_get_input_bus_fmts(struct drm_bridge *bridge, + struct drm_bridge_state *bridge_state, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state, + u32 output_fmt, + unsigned int *num_input_fmts) +{ + 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; + u32 *input_fmts; + + *num_input_fmts =3D 0; + + input_fmts =3D kzalloc(sizeof(*input_fmts), GFP_KERNEL); + if (!input_fmts) + return NULL; + + input_fmts[0] =3D drm_mipi_dsi_get_input_bus_fmt(output->dev->format); + if (!input_fmts[0]) + return NULL; + + *num_input_fmts =3D 1; + + return input_fmts; +} + 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, - .disable =3D cdns_dsi_bridge_disable, - .pre_enable =3D cdns_dsi_bridge_pre_enable, - .enable =3D cdns_dsi_bridge_enable, - .post_disable =3D cdns_dsi_bridge_post_disable, + .atomic_disable =3D cdns_dsi_bridge_atomic_disable, + .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_get_input_bus_fmts =3D cdns_dsi_bridge_get_input_bus_fmts, }; =20 static int cdns_dsi_attach(struct mipi_dsi_host *host, --=20 2.34.1