From:   Liu Ying <victor.liu@nxp.com>
To:     dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc:     marex@denx.de, stefan@agner.ch, airlied@gmail.com, daniel@ffwll.ch,
        robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org,
        shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de,
        festevam@gmail.com, linux-imx@nxp.com,
        krzysztof.kozlowski@linaro.org, LW@KARO-electronics.de,
        alexander.stein@ew.tq-group.com
Subject: [PATCH v2 2/6] drm: lcdif: Drop unnecessary NULL pointer check on lcdif->bridge
Date:   Wed, 25 Jan 2023 14:40:26 +0800
Message-Id: <20230125064030.1222121-3-victor.liu@nxp.com>
In-Reply-To: <20230125064030.1222121-1-victor.liu@nxp.com>
References: <20230125064030.1222121-1-victor.liu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qbOZTeP5OTaLqLek23Ejj8VlXtMnboI21oZ+PsBanW1wrqZiLjntyZJfffYv?=
 =?us-ascii?Q?2VppWvXW+A1xu3daOx218CjNdr22vGrYy1o8PHgX0H+/P7p1Y7LdJtMQsloY?=
 =?us-ascii?Q?C5ZgFgiyEZUJBHsVLtong/lAX6Ksay6dNFVepk3lBOcwkSAlZMVooNyrCIbL?=
 =?us-ascii?Q?n2SYrrSjNw3THYQEmondKdRqWCMJz/Y4Pz+z/xAqGzMTdqbEf+pXAfoLJgq0?=
 =?us-ascii?Q?JDdGark2+WVrPbWEloK9AzDPj/lw27isWZgnV3wpN+5QPpYjAvYapk+HV2ZG?=
 =?us-ascii?Q?oi2wYtzGA9wN2fhb6vkl1rdMX5irW508ZbI/+SuOOVCwrJSbvfT2wliRtzsn?=
 =?us-ascii?Q?UMKV++6mdqzTEadORqDTXRUdKIqwZPexCB5pcIUPqGtH7ffPDSrGs4yiLjIa?=
 =?us-ascii?Q?aSkXLYCzz05IXmh/Ty7qniCPcD3auhuDWHpXX3kK1IhsCBXKuTdC6P24LqyK?=
 =?us-ascii?Q?1T5IaAvWrFA9w3dq1lLUKJREnapWCSAWD0svEzSzTjTw15KXuGIO9JxWHVm4?=
 =?us-ascii?Q?XEarC4+sRbOYkStbXbafpFp/FElQtsqhwTb2n22e44Tv1QnOitf2PTyhiQwl?=
 =?us-ascii?Q?pI5GwGMW+9r89gIm/0uAoOu6TtyD6F+EtWyou9jjHyhQgNLSWHViG0cg6xPe?=
 =?us-ascii?Q?q+Sc7W5mOJTSQTrdFHNpqs4GsEtwXOTmUCUsdNi4oe4pFrudW6l+hU1vnVaa?=
 =?us-ascii?Q?rFox+m7Oxnop2vu0HOmxpMxUEbkpiFsBjxiEH5NilbyB/rzFlUM4GaB9eozy?=
 =?us-ascii?Q?Ik5h49ZernnROPVDE1KuKjZNRZOcFuYUxAPdoLOArQI19pcsyBwB3BzRIYEC?=
 =?us-ascii?Q?UaayxGHRzhUUqQtpvBcY+LhMGQFIezdYrq3QsfOdRiKt3JZLDj4HK3lC4L4n?=
 =?us-ascii?Q?MN5vbt5gYtRzWA1Gah9PYLhs1533yVWX0txT1/ip9N8+op/1xpRTQR8/dpgm?=
 =?us-ascii?Q?UCc3wIrFewstnc5CBZuClkbPdFpewoCHQnSpt28iUtv/hIT866QXzV6XNBcZ?=
 =?us-ascii?Q?k/JEzW1EEQ4DmVmlizYgNhJO6TvSyBqkl8b4PhyyLCdNbJ+mr8cmkcAB53ps?=
 =?us-ascii?Q?7L+NnSykgeyTTor/6GO6oK0XW9W8aFfN6TiDBkGqhFn1ytzBCSwvOIXz2qNu?=
 =?us-ascii?Q?T7wFiYRz9WYXe1IQNIC3L8HEoTz4SM0xpOLGeK3RbvbeRyw7tcXAp2kinSxU?=
 =?us-ascii?Q?tMF01u3oJ9MQAi+J40b2p2KGFoscC8VRpCqcK7A2GPG0kprBYsR9ukMHbVLy?=
 =?us-ascii?Q?ZQ+6BzfTBfcHNfq1cLik1uUjUR0EPpT90QUteiIcY2awPMyulmFTO6UlU0XR?=
 =?us-ascii?Q?+a4HS85IR+rWRIugxfaAFVv6SOhbllblXnQ+JI1MJWRJYFDvNXyvlpj5BW1c?=
 =?us-ascii?Q?MnM0V+fbLALq2b2NYUcWDAX/aImG70Mtq56sUMQPm/l3wotfD6Aoj4pgB3EZ?=
 =?us-ascii?Q?5vTxGBovqubzUnrXu6ejKHPToQlBsFlLEFOpAWCg0oiv1l8nQmVfsCl/KqtF?=
 =?us-ascii?Q?1lOIc8QJ0U4yOE2V+TWNuK0SXsEeFDpKrupZ+d0vhogS7HGBkQX6xSQl0MlI?=
 =?us-ascii?Q?PQGpdfPtoHQ3kFWhY9cXYLnXdGRN1NnXfGxDHNDF?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ebda579c-04e8-474f-eada-08dafe9ee9a4
X-MS-Exchange-CrossTenant-AuthSource: AM7PR04MB7046.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2023 06:39:30.7189
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: BUyxYH44GP/L/YjQtnziTMfepEx1jcGERWJ1NHP4N1KE1ed2hs+Np5ddSqAIfk2wYcWPNH8p4mbUo7mInZLY0A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9425
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

A valid bridge is already found in lcdif_attach_bridge() and set
to lcdif->bridge, so lcdif->bridge cannot be a NULL pointer. Drop
the unnecessary NULL pointer check in KMS stage.

Signed-off-by: Liu Ying <victor.liu@nxp.com>
---
v1->v2:
* Split from patch 2/2 in v1. (Marek, Alexander)

 drivers/gpu/drm/mxsfb/lcdif_kms.c | 33 +++++++++++--------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/drivers/gpu/drm/mxsfb/lcdif_kms.c b/drivers/gpu/drm/mxsfb/lcdif_kms.c
index 262bc43b1079..e54200a9fcb9 100644
--- a/drivers/gpu/drm/mxsfb/lcdif_kms.c
+++ b/drivers/gpu/drm/mxsfb/lcdif_kms.c
@@ -394,7 +394,7 @@ static void lcdif_crtc_mode_set_nofb(struct lcdif_drm_private *lcdif,
 	struct drm_display_mode *m = &lcdif->crtc.state->adjusted_mode;
 	u32 bus_flags = 0;
 
-	if (lcdif->bridge && lcdif->bridge->timings)
+	if (lcdif->bridge->timings)
 		bus_flags = lcdif->bridge->timings->input_bus_flags;
 	else if (bridge_state)
 		bus_flags = bridge_state->input_bus_cfg.flags;
@@ -463,30 +463,21 @@ static void lcdif_crtc_atomic_enable(struct drm_crtc *crtc,
 	struct drm_display_mode *m = &lcdif->crtc.state->adjusted_mode;
 	struct drm_bridge_state *bridge_state = NULL;
 	struct drm_device *drm = lcdif->drm;
-	u32 bus_format = 0;
+	u32 bus_format;
 	dma_addr_t paddr;
 
-	/* If there is a bridge attached to the LCDIF, use its bus format */
-	if (lcdif->bridge) {
-		bridge_state =
-			drm_atomic_get_new_bridge_state(state,
-							lcdif->bridge);
-		if (!bridge_state)
-			bus_format = MEDIA_BUS_FMT_FIXED;
-		else
-			bus_format = bridge_state->input_bus_cfg.format;
-
-		if (bus_format == MEDIA_BUS_FMT_FIXED) {
-			dev_warn_once(drm->dev,
-				      "Bridge does not provide bus format, assuming MEDIA_BUS_FMT_RGB888_1X24.\n"
-				      "Please fix bridge driver by handling atomic_get_input_bus_fmts.\n");
-			bus_format = MEDIA_BUS_FMT_RGB888_1X24;
-		}
-	}
+	bridge_state = drm_atomic_get_new_bridge_state(state, lcdif->bridge);
+	if (!bridge_state)
+		bus_format = MEDIA_BUS_FMT_FIXED;
+	else
+		bus_format = bridge_state->input_bus_cfg.format;
 
-	/* If all else fails, default to RGB888_1X24 */
-	if (!bus_format)
+	if (bus_format == MEDIA_BUS_FMT_FIXED) {
+		dev_warn_once(drm->dev,
+			      "Bridge does not provide bus format, assuming MEDIA_BUS_FMT_RGB888_1X24.\n"
+			      "Please fix bridge driver by handling atomic_get_input_bus_fmts.\n");
 		bus_format = MEDIA_BUS_FMT_RGB888_1X24;
+	}
 
 	clk_set_rate(lcdif->clk, m->crtc_clock * 1000);
 
-- 
2.37.1