Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
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,
        conor+dt@kernel.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 v5 2/6] drm: lcdif: Drop unnecessary NULL pointer check on lcdif->bridge
Date:   Mon,  8 May 2023 13:57:36 +0800
Message-Id: <20230508055740.635256-3-victor.liu@nxp.com>
In-Reply-To: <20230508055740.635256-1-victor.liu@nxp.com>
References: <20230508055740.635256-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?sDY/XlUWavRNrKnsDsQPxHnGGuR6QQLAWMTcvivWxSLLDaUEUww5CBAzG0m2?=
 =?us-ascii?Q?CJTtuQ2QR1sbHFMrxDE3XIXXVKDsVjCXJ1SE9/2+d2slr/+l4hElAyWAlhJr?=
 =?us-ascii?Q?eepNwGKqi3PadvHwpGI/0BYrep6KOz/h/pn37u9XNwDWe2UGrJox7/NjF7lq?=
 =?us-ascii?Q?15amh2bx0kX3Xb/x4AKDNFO55XipKdFqnefmShdfIbnRbzxLlutF/FJXggIB?=
 =?us-ascii?Q?5onUJaAIzGwvWiC9lCDuBGu36Grh8J/ASoI/L+VngIoNP/QwKN+UUBMe1uvo?=
 =?us-ascii?Q?RzJi95yElmnXHZuvDXJpoBWVOmSupRCQ31OM1rPckvb+LxnOA2VQsLI9MQJV?=
 =?us-ascii?Q?4maoh+Hr2XEkAeVFJMpnlP/wlfcrJPuai1x6RDsB6YNloEyaS9+bZ5O7mVkQ?=
 =?us-ascii?Q?K1WmhSwQfRwzcdwnnLBBZpnQ+yU9p8Gqgl6/AWmr3St9fGir3TvWyUuF/A7w?=
 =?us-ascii?Q?tx1o9GyDT+RebkxiNGXYSANgl6RlISkzk1fBgbgVIKcVTr43UK8HUp77xyzV?=
 =?us-ascii?Q?zXDzDzpOoGpUEstC6JPPDx6CFpYNRPFfzNOqiSMWoNexZHb4HzTORdoMfwxM?=
 =?us-ascii?Q?z2pugnasmIaKWL2OL3JQYpxhemOiEGyfdDR4iJwfLWXqtPeYh5RdZzaZ1dTh?=
 =?us-ascii?Q?FHHMGM1o56AIWPlwWqgWObh4gyFWbReqv6Iru6HtLv9kL+A9CAPUjfoV3ky2?=
 =?us-ascii?Q?dEHmEChYCKfaozLyF03bPa9lXiQybtaKRqUXKfTF3dRMsF3ta5iaURmza3Sd?=
 =?us-ascii?Q?yUMdJoi30yoxh925slfxxV2sl8Xpl+Q9wybr7lebX0Phy15ZGnRsLli6VUog?=
 =?us-ascii?Q?sGg+2ymSC+Ciww0Mx1wbf03nxFCTpIgkTr94TaBRY9/+/UsWH1KU1p+mOckw?=
 =?us-ascii?Q?ypeG6gF5k+a83XuV8KaUQk24hTxwGPht4Zo+BETmxFtx8FoyuKYxnufHSAO7?=
 =?us-ascii?Q?Sp2ZgSaTdaLoydg1K1R//GRVfQV5NWRV61FXUFQReaDEXM/4jHW4aNbidTF4?=
 =?us-ascii?Q?JJLc3i/lzFpZ5AGVT1UHvHrGghkl6zcoLgdtzmJWlV8WfUL0E1V9+brtYd20?=
 =?us-ascii?Q?tUzSTv2llWY9BYZCWGnCuH0Ufe/8dV1+ZfPgqhj2kVTJM5VSFuYHWOanx+bx?=
 =?us-ascii?Q?HLto773P8UKSVIylNPO/Qbc7DbxiGnpCuVIbfI64icZ4EYEDvAs5qy3v5QqG?=
 =?us-ascii?Q?f/oo1UkNdpHsdyBu1x94MMwWJP8vVIHWA9MurUistkCnwYG7Xlxo0tb9q2R8?=
 =?us-ascii?Q?DF9kS9e5Qpu6WOJEJYnP3/vbTp347JVBe21+zdwp9ylhm7Bs/DKAuLZwOjsn?=
 =?us-ascii?Q?lZwW0s3NJc1rNsOVEFJFNXVfduLgBbtCGCz7qWICCYHo7Z7j9Lm/Ry7r19+o?=
 =?us-ascii?Q?IN9PpGWBNSv+JiIaKd4vG2eXickGGGWDTuXW5LaSGzyeUdFz8n10US0VRNUN?=
 =?us-ascii?Q?dAd5YZOzkD2Syke1dwlVTFuVJSTXWFGjd02LoZpWkOC3Gw2kkO4O7vZCEtF0?=
 =?us-ascii?Q?Rxz+jpVEuWcZVbm0+qtYYjH1pIlC/C1T4H/LGQkWNgjVxW8e9MKABxpV/pM9?=
 =?us-ascii?Q?lh1NpKUEALDPvagUu6QhH30DS/MhL9CQR89nwlUz?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bfb6126b-35ba-464d-2a71-08db4f88859f
X-MS-Exchange-CrossTenant-AuthSource: AM7PR04MB7046.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2023 05:53:18.1004
 (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: 1KG03fBWWCizHXCHZFZEIgvKTFVebqpD60LP9W/rrHyecOl00lG40gMl0ec0W59dCU1FjT5WxCHnE2wSZ7hikQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8523
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
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.

Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: Liu Ying <victor.liu@nxp.com>
---
v4->v5:
* Add Alexander's T-b tag.

v3->v4:
* Add Alexander's R-b tag.

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