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 v3 2/6] drm: lcdif: Drop unnecessary NULL pointer check on lcdif->bridge
Date:   Mon, 13 Feb 2023 16:56:08 +0800
Message-Id: <20230213085612.1026538-3-victor.liu@nxp.com>
In-Reply-To: <20230213085612.1026538-1-victor.liu@nxp.com>
References: <20230213085612.1026538-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?JSLu4/LZ1HUxum3HLJCF5pQbu1v0D4SpfM/g7BrsAX2+mKqEKnrfxIqFDac6?=
 =?us-ascii?Q?6CyCRCMIPDuZVmfap589qywLNEHOaPNrAzAYXy1ljfhrcKk4F0BwbnoV6B+Z?=
 =?us-ascii?Q?PWetsKgjHfmdF7M4SxQpLee6tkhU/pYznFt1uaAupj+oF0j6PGPiWVdQEqsi?=
 =?us-ascii?Q?DIvkHnTHBjHxR7b2ar/9YBGZcsnR7z5Vt79ss8aAoZ7g7+AMJ3funP/qYmSa?=
 =?us-ascii?Q?M6OcW9yHKn3vzho4FnWBMixZNAveS30b+D01qqqHXRfiaVaEKSYP9FS2YmW+?=
 =?us-ascii?Q?hvVuzkiXhTf9pd94gJWLGwlm+1gpdPdBn8GNM29B9KoB8cNOsmpR6fEpUQqj?=
 =?us-ascii?Q?qBsAHO17WRfaDqAG/tWsGe+c8Xk2N55ZV2aDfL83y0jpAniCwixJz5ALqEM0?=
 =?us-ascii?Q?UID+8vinX+VNx/wyTgD11ijvmc9Pp+E/hH0zC8WICHyQLHVPbjKxPJp96Kvy?=
 =?us-ascii?Q?+PUIbgKXt8hiWjJjDxlXL2oqLHqXVZN132H9ugKT0HQwhTmjo2/KBpevHJb0?=
 =?us-ascii?Q?GojgHOnetMcK+GF+trhysevIpuO9NcZLQhX94LBn4c8yNlxH/4W4R6juIgIw?=
 =?us-ascii?Q?36PSX1u2pQgulxZEb+nd1PVoYKTln+J8tAmq+gJdbA7F/siGD6PMyxB2f2fv?=
 =?us-ascii?Q?FmiJKyG87PbfSTj5w2PmNGNF0gxQ9Dg09a3j23i96gokj3RneKXfg2krpSX/?=
 =?us-ascii?Q?c+OSKZ9PqF9QllWCXctf0y4oSxzSM7MfxlPV1Xo6KClBy0ifBxM3FEGp1ORz?=
 =?us-ascii?Q?UTEpD8gmpwjzHn8Jb1YLoMNP3M2xFpYa0lF5sf+EHzhyHkzvQIzTO7VlCfzk?=
 =?us-ascii?Q?JrvMKA7Mky7JPXT7mSddEzS3/Uoy+byWe9rcYw7K/8dhTm+fyyaohlanMXv0?=
 =?us-ascii?Q?O5SuDwMG/LsUsk2DGO95t2bY03oMESWhfydgWBoNLvyxDxLtgwkrfQYqYsKP?=
 =?us-ascii?Q?5WUZACPzELlGqEvDnHCFP2hYLyclnOEZUuN7qmwPB3K/QGHFjawz4TcOtna5?=
 =?us-ascii?Q?Ysh9FEwjH3LX6OL1XXpTSZXdUbpX6c7HKJSX5ZZy7mjeuKQO+Yd+RoVU4V1S?=
 =?us-ascii?Q?0dQNQvZ6lDyWYA9ks+7NH2wilbdqeWugXEp5+AVSSK4FcYa2/s9PCpudttnZ?=
 =?us-ascii?Q?eVVc8eOYOycbUP3DZefc8bcDQy/y5WPky4GMIYh6bYxCxdaPtckmgfCQQ0YD?=
 =?us-ascii?Q?3bTSaWoUINVwYba+//aF8xc243PXHpSHVuHMXtx5oHngf/uBYeUFslEFwkrI?=
 =?us-ascii?Q?/18wNXEzVdaWAhZwOmEUSVMzOU/m4m40W9cucYOSWcPaKMBTcC3LFxa0g6cj?=
 =?us-ascii?Q?yYksejjA9girr/ncBYExTm3mAL4ptTTtbKJ5XCjGSKuOfqM7RSpv7xKl5vEb?=
 =?us-ascii?Q?3bwSale6ayurti0FMnXLISrjikMaO0Fx7VpOaSPdFUAl2NxPqTAbAg0pV7nU?=
 =?us-ascii?Q?KJ87QvRmi2kAzewFOcXG/xEMtS/10qvW+X1bZUa5XoB/93mQjEam6xv+KQp5?=
 =?us-ascii?Q?BIR9mKJ0gQig45BbLVo+Ur14SXidKj832qyBo+4YtuBnohaLWAefnO0Si3b3?=
 =?us-ascii?Q?Gabvs13FCTNOHdlRbCg2GQURI+zhATUELzZAcbAD?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2c4ac0f3-54ee-489f-a698-08db0da007d5
X-MS-Exchange-CrossTenant-AuthSource: AM7PR04MB7046.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2023 08:55:18.6080
 (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: ycYhzj9qSi6HicPSH9RHRrEtSShYizG1zaPE2sLdKzv+U6dRTvR3YEI4RP5MNpqf8MZ/GMTyTQJ5axmBcT7KYQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7600
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>
---
v2->v3:
* No change.

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