From patchwork Wed Jan 25 06:40:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Ying X-Patchwork-Id: 646717 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E158C27C76 for ; Wed, 25 Jan 2023 06:39:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234653AbjAYGjj (ORCPT ); Wed, 25 Jan 2023 01:39:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229778AbjAYGjf (ORCPT ); Wed, 25 Jan 2023 01:39:35 -0500 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2064.outbound.protection.outlook.com [40.107.249.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E98943914; Tue, 24 Jan 2023 22:39:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ahUWC4iM9wXk1DZ4c4GTqBHijMPoe/K51PrEW5LJZf2zdcaBKNWtY0Xs2tPhQgK8z+7GOtyvtOwxG480zoaUiMKhiudtyt1TgLj34FvdMP6h1HIWFCPp/wy34Toww9zT8NuYyvDN406pAEI8vHJ3OXZI4og0VdW29Y18B35j6D6PL+/l+2GLjRWK6O+wj8qdTdEx7W/EU4eTgF2O4/Kirnb93clIq78695ML1/mp/v0YqTTwHg7KGjDDL8ADtaORNxhkwTk5P/TCsuegKOIE4aoJMpNtZxuiEkpqTWKDPykK4j5fRvCstYjnnOryD+hamPRX5iR9YHU0ri+nOqh1DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2U0gbmUoC4+W5rjQLnYtTRF9r98eDVl9pbLgOQspI00=; b=ehmu3DReYW2Qrr2JmaR0jbP5YcZ2ghyP4+TAKL3UpExhqbBqwDcSkVWBfxUySB9rrtB3LOuxxukPNdupSvKdX/moNdV2UeCdGTwJcXib7vntQmzlf64SarXujzTLXv7qUErxOIuRd7kBqAXR80OslJ2OiXXe4LTPUOd/BF4yfloJfmJusmZLexyjDPyP/t6EOySoR/BSHV+xCa6hhei0IlS6jRha1vV3YEmOQP+fZTCqmf4wCWks313OpRDywUZmFBoJhUIcTrDV2VlhhGdHFQxMTtpHJ73F1x+0YPhPw3nnJxiKzcB28Xx0gl/+QDTQidHE0DdOzQbwrI+Xg0Mbqg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2U0gbmUoC4+W5rjQLnYtTRF9r98eDVl9pbLgOQspI00=; b=cYyDVcB4qXpc4PgBqagPKu2BYoHezPAW08fwxDOaXi+7gXkSNRPOPhCch+KB0EQRQA1JpbMTJhBILu4BSbkICudVVZzQX6K8y5t1ptTKG3cplgVAwkXaitVo97Qi1k6YQgy157u1ExiVq+CH/sUDbExhmwc0qcEBSwJyFefg9ZA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM7PR04MB7046.eurprd04.prod.outlook.com (2603:10a6:20b:113::22) by DB9PR04MB9425.eurprd04.prod.outlook.com (2603:10a6:10:36b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Wed, 25 Jan 2023 06:39:30 +0000 Received: from AM7PR04MB7046.eurprd04.prod.outlook.com ([fe80::5725:92ec:f43e:f5fc]) by AM7PR04MB7046.eurprd04.prod.outlook.com ([fe80::5725:92ec:f43e:f5fc%7]) with mapi id 15.20.6002.028; Wed, 25 Jan 2023 06:39:30 +0000 From: Liu Ying 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> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230125064030.1222121-1-victor.liu@nxp.com> References: <20230125064030.1222121-1-victor.liu@nxp.com> X-ClientProxiedBy: SG2PR02CA0073.apcprd02.prod.outlook.com (2603:1096:4:90::13) To AM7PR04MB7046.eurprd04.prod.outlook.com (2603:10a6:20b:113::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM7PR04MB7046:EE_|DB9PR04MB9425:EE_ X-MS-Office365-Filtering-Correlation-Id: ebda579c-04e8-474f-eada-08dafe9ee9a4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LLth+mLn7crIGRpH/l3k13SIwmzeNDHiMOac6OlG3ZBgznT0FaxDeYKr/1mjK2bnZ+w/92kSe4jvuaxNFav9QMuijeREu5wWk5pX2in9B6QlutnpzehzJoexpoEBNohmmT+5n19mK+VAN/NM5if1Wr98TxQ+dq5WUyMKulSWUxrejzCf8If1wUXOK0iID1pdoi1/Dsa0qxPTqDelyEKVXw0d90IitSzvedE3apazNy0dm6x/YSRE81uO8M5wUyr4rWO9HeNucrgcY+D4EX9Q0Jo17x2Seu5qDDu7790OYrOPacY0MgMmDA/nf79o66QRTgtkcM0eVy4cPbj5e4bhNcRPHUo//2N99xbg/fqbiu8WMh158T1rey7VcpQyoawNYHzJ/M2GgLtU9kgobFINfoIcjKxS4Ml3RNr6sCf2YLlmePQ817hIvrE3W+EaW9dADVW70jUrOvL5JourU+KxksgldcXoGPNqD4tzZhZBua2rVwa+cX9tOWiACeabK74V8SffzzB+q/7f68xK1g3pUO93cBuTk5+ap/XvBC6vIfcuOaZtRnTXWvquvUh+OHvOMq42elUJ7+Tt9LIlRmQQE67VvqrjdJY69ZYboPbQQcz+vbsGoFJJ1I03BOk+HdBOjrey8ygtoaJ5OCBgUk2aRs5rbr8OJ/ukEEGinrBIJc2/LnEvXw+NhlL8hndxeeUU3oCSdWVFJWAckz0MKKRgxg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR04MB7046.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(136003)(39860400002)(396003)(346002)(376002)(366004)(451199018)(36756003)(1076003)(38100700002)(8936002)(316002)(5660300002)(38350700002)(2616005)(2906002)(4326008)(86362001)(66476007)(6512007)(66946007)(8676002)(66556008)(41300700001)(83380400001)(6506007)(26005)(6486002)(478600001)(6666004)(52116002)(186003)(7416002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qbOZTeP5OTaLqLek23Ejj8VlXtMnboI21oZ+PsBanW1wrqZiLjntyZJfffYv2VppWvXW+A1xu3daOx218CjNdr22vGrYy1o8PHgX0H+/P7p1Y7LdJtMQsloYC5ZgFgiyEZUJBHsVLtong/lAX6Ksay6dNFVepk3lBOcwkSAlZMVooNyrCIbLn2SYrrSjNw3THYQEmondKdRqWCMJz/Y4Pz+z/xAqGzMTdqbEf+pXAfoLJgq0JDdGark2+WVrPbWEloK9AzDPj/lw27isWZgnV3wpN+5QPpYjAvYapk+HV2ZGoi2wYtzGA9wN2fhb6vkl1rdMX5irW508ZbI/+SuOOVCwrJSbvfT2wliRtzsnUMKV++6mdqzTEadORqDTXRUdKIqwZPexCB5pcIUPqGtH7ffPDSrGs4yiLjIaaSkXLYCzz05IXmh/Ty7qniCPcD3auhuDWHpXX3kK1IhsCBXKuTdC6P24LqyK1T5IaAvWrFA9w3dq1lLUKJREnapWCSAWD0svEzSzTjTw15KXuGIO9JxWHVm4XEarC4+sRbOYkStbXbafpFp/FElQtsqhwTb2n22e44Tv1QnOitf2PTyhiQwlpI5GwGMW+9r89gIm/0uAoOu6TtyD6F+EtWyou9jjHyhQgNLSWHViG0cg6xPeq+Sc7W5mOJTSQTrdFHNpqs4GsEtwXOTmUCUsdNi4oe4pFrudW6l+hU1vnVaarFox+m7Oxnop2vu0HOmxpMxUEbkpiFsBjxiEH5NilbyB/rzFlUM4GaB9eozyIk5h49ZernnROPVDE1KuKjZNRZOcFuYUxAPdoLOArQI19pcsyBwB3BzRIYECUaayxGHRzhUUqQtpvBcY+LhMGQFIezdYrq3QsfOdRiKt3JZLDj4HK3lC4L4nMN5vbt5gYtRzWA1Gah9PYLhs1533yVWX0txT1/ip9N8+op/1xpRTQR8/dpgmUCc3wIrFewstnc5CBZuClkbPdFpewoCHQnSpt28iUtv/hIT866QXzV6XNBcZk/JEzW1EEQ4DmVmlizYgNhJO6TvSyBqkl8b4PhyyLCdNbJ+mr8cmkcAB53ps7L+NnSykgeyTTor/6GO6oK0XW9W8aFfN6TiDBkGqhFn1ytzBCSwvOIXz2qNuT7wFiYRz9WYXe1IQNIC3L8HEoTz4SM0xpOLGeK3RbvbeRyw7tcXAp2kinSxUtMF01u3oJ9MQAi+J40b2p2KGFoscC8VRpCqcK7A2GPG0kprBYsR9ukMHbVLyZQ+6BzfTBfcHNfq1cLik1uUjUR0EPpT90QUteiIcY2awPMyulmFTO6UlU0XR+a4HS85IR+rWRIugxfaAFVv6SOhbllblXnQ+JI1MJWRJYFDvNXyvlpj5BW1cMnM0V+fbLALq2b2NYUcWDAX/aImG70Mtq56sUMQPm/l3wotfD6Aoj4pgB3EZ5vTxGBovqubzUnrXu6ejKHPToQlBsFlLEFOpAWCg0oiv1l8nQmVfsCl/KqtF1lOIc8QJ0U4yOE2V+TWNuK0SXsEeFDpKrupZ+d0vhogS7HGBkQX6xSQl0MlIPQGpdfPtoHQ3kFWhY9cXYLnXdGRN1NnXfGxDHNDF 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: X-Mailing-List: devicetree@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 --- 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); From patchwork Wed Jan 25 06:40:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Ying X-Patchwork-Id: 646716 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F17AC54E94 for ; Wed, 25 Jan 2023 06:40:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234138AbjAYGkL (ORCPT ); Wed, 25 Jan 2023 01:40:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233983AbjAYGkJ (ORCPT ); Wed, 25 Jan 2023 01:40:09 -0500 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2049.outbound.protection.outlook.com [40.107.249.49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 714D844BD5; Tue, 24 Jan 2023 22:39:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mquCdv2phPvTbt4otGFYy6Xe1mnRjRbiIQPxD257xkM8JIXiHVsnnmZXLzp5PaUioWhj/1VZpwQDAVEOsjnH6JDSPmaKLcLBW/EpfPpHEzZyGminEJzZWvlr12OG4u7KlJau1bhYfPJY9hgSZyHLoJBiQCf0WkKz+UED2c2gJhcUwK63XoI0GLllko+7pHBvndDRVbyL0AYQjrvroComg025SmV0WBLfbvJIgzhtE7UldkkfpxVfHeX4YAFWo2EGdp9mVjpinrLw/lmTIVQS6Lh06YQRP6zN7Iml2kugXou1fmTSsE89iYZ/i10dNSjbXY45KrHPPa0jxfJaLcVlKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=C4KpjDAKpcyfTxfU+kwq99MhSKRDzG7SBeZbAwQR2wo=; b=KVYyPqmep1M2DraXVp0lmOmJYP0Fyhnjy1Sq1J33wokP3BL4QFVx4L38FTDzr3vKg5k1PZfgeSRsOnKCMalchHKv3Vi6zLD5G0xuh6dwWussp3QxLNGAXs3XB7AhgiloSMd1H2NOcAcvOwKmMDArok+JIdQWsMu/3uPxAkYSTfTiMu6tiXenzgf0K8fZBIPR/iJKTjiG7F19yp5HraGniSQQ9ztqSpNWG7GHoLOxAZzH4eHBH55lFoTSgesDe20pDBVjOScuZbYHp9C3B/rPwz91zHhlom0i7/R9z5XLpPyk45140Tgq1+isgnZMH6qCK4JgxnLhqg4KJO/6qzluLg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=C4KpjDAKpcyfTxfU+kwq99MhSKRDzG7SBeZbAwQR2wo=; b=ZloBV6W6Vl5AE9+BQd4t/aoRiQVW7f8Jw9lAI44pJPFRz8KXt7LSpkU4aLMopkxk/x+wiQE2URlJMM7M/Wh2xPrQM4p2q5DufsyC9l743983Vri+5Ls2uXKerWUHRLAGVmuxDnvXfpboy2MHkkKsDDApgx4j6VwOY39ROx2ej60= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM7PR04MB7046.eurprd04.prod.outlook.com (2603:10a6:20b:113::22) by DB9PR04MB9425.eurprd04.prod.outlook.com (2603:10a6:10:36b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Wed, 25 Jan 2023 06:39:41 +0000 Received: from AM7PR04MB7046.eurprd04.prod.outlook.com ([fe80::5725:92ec:f43e:f5fc]) by AM7PR04MB7046.eurprd04.prod.outlook.com ([fe80::5725:92ec:f43e:f5fc%7]) with mapi id 15.20.6002.028; Wed, 25 Jan 2023 06:39:41 +0000 From: Liu Ying 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 4/6] drm: lcdif: Check consistent bus format and flags across first bridges Date: Wed, 25 Jan 2023 14:40:28 +0800 Message-Id: <20230125064030.1222121-5-victor.liu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230125064030.1222121-1-victor.liu@nxp.com> References: <20230125064030.1222121-1-victor.liu@nxp.com> X-ClientProxiedBy: SG2PR02CA0073.apcprd02.prod.outlook.com (2603:1096:4:90::13) To AM7PR04MB7046.eurprd04.prod.outlook.com (2603:10a6:20b:113::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM7PR04MB7046:EE_|DB9PR04MB9425:EE_ X-MS-Office365-Filtering-Correlation-Id: 8ec461c5-0760-47f9-0883-08dafe9eefc6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +GOae8EvoESq9wq7Ciy0670r4dvlzHjqXs5TH7OltSrrefhNP2PfuZx/yPTEthV4LDalKlPfl6Xc2opqjsuYdkSLaVmhDGxEMyjMkHqKg/i9Op8Nieia1yr/rfiVcExTXtVkL/SUwlwIkszInmAzL/a1LmvfXrNcHVF2e2rV96FBVKezT1Ig7vJFPA+oG/l3FW8LtXuPPOP/0qCeVSv1jEAfnvHlBfbM4miSf8rW+HOF1odBpTsxDV5JOm0OPyuRLp6n859nP1AqOOOaGotuG7XWAjzeWC27oq2f3guut0H1MqGHlK6I3nnYTI4pyyS1Cpb+ER/oh1gVh1czYvx5jDvwcpXtLc43tAlzqdfRd8LXCQD8hwJutJyGcLZSqWfP9AjWiR37vMxYhcDzzbpIDdxSaT8/U02SE4g1aJlXYLky4Bsg38B0iy+8jDO1KUIktwtvynlbZPqtIWkDo5DMk/FZbl2D+c8NFUYJF76F9frW1IX9Hao+pkJlCwKs9/vsLLj7YWyeturgTDnOf2jZTMVQ7VtFyJA7BVeYc0pGYUFIpjd0f+7Z32pIDQQ8PGLdcNw1YhMIpx8ubF+IoGYkCfQhLwjKt2cmhOxgalwu5+LFFMKW8FQ+JnmjcWXTonlXL+qGRVQh+qfXhsKRaQPJ6IHnaAhttucKOVZlzR4BGHcc+rKpSkkZVDeeKdfhtE0jf1iYtZNw+NYQfQwkcqS08w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR04MB7046.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(136003)(39860400002)(396003)(346002)(376002)(366004)(451199018)(36756003)(1076003)(38100700002)(8936002)(316002)(5660300002)(38350700002)(2616005)(2906002)(4326008)(86362001)(66476007)(6512007)(66946007)(8676002)(66556008)(41300700001)(83380400001)(6506007)(26005)(6486002)(478600001)(6666004)(52116002)(186003)(7416002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0QXiuIHKYFVVnhBhSZ/5VHn8Aku71Y+mfc4DQp95WVEXnvdWrXZGR4mAYPB+gBI5qiz2h0MlOjqAsM7A/VqkrY79bgRGDXCel+q3wHWR5pkcoAtWR327YiVce0ZWlQG3atFBLamXUuLeJcsFepjWLvlW7yCTbSBk/CMweledPOYp6cJX8TF5N395iYDTfQG29fuj5kOo+1SmSE8GQZf0gqVMRYfE3/b35yPrw+4uSoHUKCT4NDnnb2DrQvYz0SCvPwPydEN18RhdsF11Qu55lD/ilX65HHx/Pp/OO5fICbS7SgLYY3dkcW0Xsp5mFyzhTJteoFvhY0ZRIvG4yHDpHCzgDiga/x5o/TiPAFMvjTCy+rKHsxYFzTyoB1emBitrHDMlKE5gG5M782ke7xf7t2Hycwxn+OvbeGzZX2gMXkovSjqTs4jmr7H1eyyNHf82oQi/LnNpKh8Na98ZOB1ilk/c2Xc+kiiEks4+hdD2JX6z/Yupa46ocyPV2W4Cf/oPF4zXQj3JWUpFwz19FomcA5BCI+Z/1yHU8YiCYUO/onEvCdCgnEtagGKuqpd09tMqQl09mpkuYGK0jTLwrR+YcpNGNnndX7wClNc6iBz7OZffDa4oRLQ+YaQ+NVhjrw1wlb0ZFCN2jKRNbB3CXCN/zxpY+fgynYagFpfhjKsxkVIPwSLqTN0l6JqGDXLUsmEJjF41RF+TO/ZutBa5pfzjhBFflDICKvQtiQjKHTDEW93NSUjTbajOGIBktXup5Wt0QA1KzBXOhpq5t3miygmf8FEEROmzqx2ta4haZJMU6HobsgrOBqybCeLIjTeVC+/YCzjf3o3IigKHo9PZQ34BVKQjZyA4DxL/0wQZkTklf7UV56sCyPgdCQul1pGARhfD8n1xFo6KPdZ9qtZkXbfFQOy5rKQglApUdEGv06R+P5jFEqemgeC5XUYWaCSLlXvvB8cgGxaZ6Eit8hfWT5LRtAhsxhhRHviKKPLYmUzQcHUrKhdzKFpJiyZtKThdS8vDONpNTiAeT9iOxCF6VCbYv8w8cdXs/0DzDbZRwc/824SaNDrDKkVoIzmlDIKjkfFw55fNs3iWIXNNoIc8UFPKOKvcK7qz9CStgCBSz+tJsiVhC+xqgH+WTKvgauQoo9yJ+6i8N83zgj7YyC4RvQdETXe5s3L1Tpopep/49ukwvlhXiJfVzFUVBQIHRNm+UZPH2aEG8NDuCwZXhHRg84o4zbMyMZfF6sCLAFpEk5ntJQqsEEAIYnHMV+i+XOrOosEmjbRz1/+6Jedo4VIGcWxggcisCpiGodWNhqchKvsurpkfz9Rb7sQiO++YBbzjUvp5C+0aw7gOkJgxFABUOiPqhuuUA/nyOqYsZPXI8EuuPBy2C0M5iAS9yM5qd9n9W8cqFKGlYRAiNHc1IEQO6VLKVRk+UEVGHIcWcJaCaa70YyojZ5VfZpIfXmE22J3J9Fg5roe0nvmbbmnwe2iE6+0tIoizo3fLcnVx7+Liyd1NjFXwmYvEIPSTJOMDbwzK6k9JPhLjE8SdHUPxuOB69Dx1HGmIuUAnjbIf6aMYhkvfzfYrNThrkCImSKg2Ts0v4W/4 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ec461c5-0760-47f9-0883-08dafe9eefc6 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:41.1911 (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: 4ZMZjpanTfqzrVkZuQ1rv9j5dB6b0335Ay5rMqzx9bw2/Ka5q+LrPLDLCyFjIn1MYK1wzIPEHVuommfZVf/8ig== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9425 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The single LCDIF embedded in i.MX93 SoC may drive multiple displays simultaneously. Check bus format and flags across first bridges in ->atomic_check() to ensure they are consistent. This is a preparation for adding i.MX93 LCDIF support. Signed-off-by: Liu Ying --- v1->v2: * Split from patch 2/2 in v1. (Marek, Alexander) * Drop a comment about bridge input bus format from lcdif_crtc_atomic_check(). drivers/gpu/drm/mxsfb/lcdif_drv.c | 2 - drivers/gpu/drm/mxsfb/lcdif_drv.h | 1 - drivers/gpu/drm/mxsfb/lcdif_kms.c | 76 ++++++++++++++++++++++--------- 3 files changed, 55 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/mxsfb/lcdif_drv.c b/drivers/gpu/drm/mxsfb/lcdif_drv.c index cc2ceb301b96..b5b9a8e273c6 100644 --- a/drivers/gpu/drm/mxsfb/lcdif_drv.c +++ b/drivers/gpu/drm/mxsfb/lcdif_drv.c @@ -52,8 +52,6 @@ static int lcdif_attach_bridge(struct lcdif_drm_private *lcdif) if (ret) return dev_err_probe(drm->dev, ret, "Failed to attach bridge\n"); - lcdif->bridge = bridge; - return 0; } diff --git a/drivers/gpu/drm/mxsfb/lcdif_drv.h b/drivers/gpu/drm/mxsfb/lcdif_drv.h index 6cdba6e20c02..aa6d099a1897 100644 --- a/drivers/gpu/drm/mxsfb/lcdif_drv.h +++ b/drivers/gpu/drm/mxsfb/lcdif_drv.h @@ -31,7 +31,6 @@ struct lcdif_drm_private { } planes; struct drm_crtc crtc; struct drm_encoder encoder; - struct drm_bridge *bridge; }; static inline struct lcdif_drm_private * diff --git a/drivers/gpu/drm/mxsfb/lcdif_kms.c b/drivers/gpu/drm/mxsfb/lcdif_kms.c index 294cecdf5439..4ea3d2b2cf61 100644 --- a/drivers/gpu/drm/mxsfb/lcdif_kms.c +++ b/drivers/gpu/drm/mxsfb/lcdif_kms.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -424,15 +425,19 @@ static int lcdif_crtc_atomic_check(struct drm_crtc *crtc, struct drm_atomic_state *state) { struct drm_device *drm = crtc->dev; - struct lcdif_drm_private *lcdif = to_lcdif_drm_private(drm); struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc); struct lcdif_crtc_state *lcdif_crtc_state = to_lcdif_crtc_state(crtc_state); bool has_primary = crtc_state->plane_mask & drm_plane_mask(crtc->primary); + struct drm_connector_state *connector_state; + struct drm_connector *connector; + struct drm_encoder *encoder; struct drm_bridge_state *bridge_state; - struct drm_bridge *bridge = lcdif->bridge; - int ret; + struct drm_bridge *bridge; + u32 bus_format, bus_flags; + bool format_set = false, flags_set = false; + int ret, i; /* The primary plane has to be enabled when the CRTC is active. */ if (crtc_state->active && !has_primary) @@ -442,26 +447,55 @@ static int lcdif_crtc_atomic_check(struct drm_crtc *crtc, if (ret) return ret; - bridge_state = drm_atomic_get_new_bridge_state(state, bridge); - if (!bridge_state) - lcdif_crtc_state->bus_format = MEDIA_BUS_FMT_FIXED; - else - lcdif_crtc_state->bus_format = bridge_state->input_bus_cfg.format; - - if (lcdif_crtc_state->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"); - lcdif_crtc_state->bus_format = MEDIA_BUS_FMT_RGB888_1X24; + /* Try to find consistent bus format and flags across first bridges. */ + for_each_new_connector_in_state(state, connector, connector_state, i) { + if (!connector_state->crtc) + continue; + + encoder = connector_state->best_encoder; + + bridge = drm_bridge_chain_get_first_bridge(encoder); + if (!bridge) + continue; + + bridge_state = drm_atomic_get_new_bridge_state(state, 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(drm->dev, + "[ENCODER:%d:%s]'s 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", + encoder->base.id, encoder->name); + bus_format = MEDIA_BUS_FMT_RGB888_1X24; + } + + if (!format_set) { + lcdif_crtc_state->bus_format = bus_format; + format_set = true; + } else if (lcdif_crtc_state->bus_format != bus_format) { + DRM_DEV_DEBUG_DRIVER(drm->dev, "inconsistent bus format\n"); + return -EINVAL; + } + + if (bridge->timings) + bus_flags = bridge->timings->input_bus_flags; + else if (bridge_state) + bus_flags = bridge_state->input_bus_cfg.flags; + else + bus_flags = 0; + + if (!flags_set) { + lcdif_crtc_state->bus_flags = bus_flags; + flags_set = true; + } else if (lcdif_crtc_state->bus_flags != bus_flags) { + DRM_DEV_DEBUG_DRIVER(drm->dev, "inconsistent bus flags\n"); + return -EINVAL; + } } - if (bridge->timings) - lcdif_crtc_state->bus_flags = bridge->timings->input_bus_flags; - else if (bridge_state) - lcdif_crtc_state->bus_flags = bridge_state->input_bus_cfg.flags; - else - lcdif_crtc_state->bus_flags = 0; - return 0; } From patchwork Wed Jan 25 06:40:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Ying X-Patchwork-Id: 646715 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61BAAC27C76 for ; Wed, 25 Jan 2023 06:41:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233965AbjAYGlR (ORCPT ); Wed, 25 Jan 2023 01:41:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231563AbjAYGlQ (ORCPT ); Wed, 25 Jan 2023 01:41:16 -0500 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2049.outbound.protection.outlook.com [40.107.249.49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E28B458AA; Tue, 24 Jan 2023 22:40:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dhHnt4BKGBPsxdoyFRnTuGaazglidi4eeBMJDO3HfectOFLMXxn7QbHoVHjTf4jrQi45O1ovrihDEQkXZLb0ld3lO65wVW2SuS+UepB2x/jFhP/+jb8F+PDmSg8INgT7M/X/t/XgQ+aNbaMlO8l41BhB2/6rEvjBBHcAqtT414djHFvXE+OFyEe+7pgM1WjwZ2wwg2grSeMGUar8t4UsIZJ9LmUEJiYxKN2DGYPdN7WgV+ey9IAYzjoB8H3EDhUMKFRHoW/v0UbbQdA6mgfzRf7j51Mbok2F8cZ4EcvztgFcMMGnJaVH/LRsOVT01NAAElgO3mKYT87yd4fav+DiMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ejD37PBFxcbuR9dxvWzFzWD6+snC12C1C9vO7diPB1w=; b=RDHqWCwHhzqdEX/ze8ZdK/i1Ouk9aH2vV3Rdw7Wfbq+I6Re6y191ADCem19AptnR3LzbEGQR3jwENnmiD9/5IeUFcDIJzkVTR53HWYdKSIc6tI4p6C6FQmtsfpFhqcukRZNjki2LzFGYEvatIHn2Hvu8kwMl7cAaGdziYmhA6IC0q81rpEoZJSR/kDOOTZHJGPcRogGU3XyEI9zk/iZ0JvD6LS62pm/Reid+YAu9O/epCgxDOvkcc8uNg+16r0ag8RufdRA/Ms2DkWMmC+eC7liktiQ2+p3/+/SuaAQq+NNmK7viZwy311gdMPk+xEzLy1W01EadXR4Tn7ZZIZNiAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ejD37PBFxcbuR9dxvWzFzWD6+snC12C1C9vO7diPB1w=; b=gFhpJMTx9+2vD9ER2tefTByjGn3zXhBr1YXnQIYW6GAh1QGIsjFc1PtowH1buM1D46EkcmhOYsyyDy5T3uV0jxjnnZ6ZGbyKCakg36/ivuy61/5bMjWER16S8NFpwdY82LVmfEHf9yy7GWVPAbWFcvKmiBKeyRVXKsVMzsUGYuo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM7PR04MB7046.eurprd04.prod.outlook.com (2603:10a6:20b:113::22) by DB9PR04MB9425.eurprd04.prod.outlook.com (2603:10a6:10:36b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Wed, 25 Jan 2023 06:39:51 +0000 Received: from AM7PR04MB7046.eurprd04.prod.outlook.com ([fe80::5725:92ec:f43e:f5fc]) by AM7PR04MB7046.eurprd04.prod.outlook.com ([fe80::5725:92ec:f43e:f5fc%7]) with mapi id 15.20.6002.028; Wed, 25 Jan 2023 06:39:51 +0000 From: Liu Ying 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 6/6] drm: lcdif: Add i.MX93 LCDIF compatible string Date: Wed, 25 Jan 2023 14:40:30 +0800 Message-Id: <20230125064030.1222121-7-victor.liu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230125064030.1222121-1-victor.liu@nxp.com> References: <20230125064030.1222121-1-victor.liu@nxp.com> X-ClientProxiedBy: SG2PR02CA0073.apcprd02.prod.outlook.com (2603:1096:4:90::13) To AM7PR04MB7046.eurprd04.prod.outlook.com (2603:10a6:20b:113::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM7PR04MB7046:EE_|DB9PR04MB9425:EE_ X-MS-Office365-Filtering-Correlation-Id: f8b9efd1-6279-42ff-e591-08dafe9ef5e7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: q434lK9riU2qPq2dWw2X58jFWynx9WeEGAxfP/472WJUB6zNZGSQtZH4n7ntcjaKMTfm5+ZbCH+/rygLpAMm6bZWQ2gMlCTpi3c/CEzB81yf/v20062mpG31fI6zcncIQd0kXluM1BpKQu2AgmrHjWNZt4hTbhEqEq1SE7b8xT+4simoevTW+mBhB2IvrNYOoHM83rcuw86ALOL695xwkFCrLLBtu2x0HRETUa7kBgSPmalxZ2jJnhlINYpWW2+W2DIuHxghsvl9QL6JTs7I5RR89mhR5Lj01ra0TrSGHLwEZuhPVzhl7qkHWLFPG/2hX22ml0iHbTuCw7yVKcfE1gOqhxAmain4+wphEPOCfcVuyS7CQCxJSrFoOQ28X25ExzWglEvkMzI0IV6m3yHVyIAwh7UiynIOcPbqtqDvqOPfWeRZt6iMRgsy9iNlSabcv5fGk63/1bVaL1HWvrwLlE5ZyW4IDFD/6UC6E/tWS9uF+vNRWpyo5kgQzzQjUtkGFwMlHOLBm3Dpzn77tKueS6YDv1DaxKewMd6hs6GE2KQdarivAeaevKvjUUCBr94Oa1tl3MHLYzodAfvbY8aUW/PtrMYRSXT0QloGDuSI8wmAbvlldZKSIOlBIHyiBQVNAKt3kj2NfWN5lxQ/QHD6NoksvEB2HaovOj+ar5VE5em/L9bk7gWCIfcqb8g+K3hcSWEBJxSjpTOzGrdrUiLMCA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR04MB7046.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(136003)(39860400002)(396003)(346002)(376002)(366004)(451199018)(36756003)(1076003)(38100700002)(8936002)(316002)(5660300002)(38350700002)(2616005)(4744005)(2906002)(4326008)(86362001)(66476007)(6512007)(66946007)(8676002)(66556008)(41300700001)(6506007)(26005)(6486002)(478600001)(6666004)(52116002)(186003)(7416002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: C7WUG6S6yxy44lu3fekVmW+XtCtc4mjlIKgSce7guKcVFOA4zvlQ0zxcz69PgimVZ1rCvVJ93DFIX/ulkrDtq23pHWlXhwnCo15+bMi8r16uG1XMupAmtpP+L1Ai+rjtUVZZLTipY2HGcqSpuhcMGpTUb3+qoIybCirO6jFMCGyPgzjG5Y7pS1unrxM/Z4QRS1nioZMr++I3EucYj0n40TwzdtKW+3WqUMqM//nzgk8Cy6fvaFIuHmUmOygqYKI/KbJCWuWObQUtXMYU4fQCWHvHc+B0KkeWafoJ/FgQxd9gfFtGLZ/Qa8uSSpQwUcBHFtwJHUJA392rEsmBAa7wSR01/w5TFfjOXfxEqKH69G8N83SiEhjcuKP3OhXqAsEopSdnh2adAtjXHMOg10Lsk/04HMz1LIsd/ayqpFWdRJWtlD8vfb5ZzWFw99Y9pBtON9JhGkIYH8p+7NSWN8u4YyYtQSFqniP9Bq5aG5A0zNGWQ2cVEmF9an2/c/NZB2Ohgfn56qlW5YvQ0V1w70+Ls+ayb+eb1ESwzetP5Abf/BQMF3ag4w8tNnFe7wcZ62Hdiy56Q46v0rf4yUVW1Wl/2U1zbJzZmIf41mZbnCz+87C1X0CvyogZMeUvO9booT+wcAoRlpxWvfV8PBEtNslx8nTyUHkOHmFGT2ScoafWFXcPhowjiuTOIdlFU1bPsGsSxWCmfFaZk8Shrsf4ZXJ3Iak0Dg6N2I59TUzHqOyGW/UMYEfaBeWhbSDagCW5bF65yPvjrr/1IaEbf9j9yvBqPPSVeSX7rCVVvOxq9h8aoyOAXucRQiShrg2buxtGBXwCtZVJlFzuZYhUWYuDtqHQ/iEvPSWMUO8QH+b1mocj3RQ9AEu8vG0I1I4Tr1YvK5w4UwqZNsUVKyt/nE1Ve2jYhsUuLtyMIWMAg6OFdiDi2+PYFYYwefsGsezZ19uVVDl6UvRgcqeaAEkc3hGZPPvuYnHX3G/r9wtlwbobn0ePbXHdekLVoqEICOdlZRkucR2LSWr8qg9+x0lVIZxmOoZy+bhiiRMM4phfylpoTE2d7EibiykhdxQxPbqSgH7ziw4kepTNc0dybLDdqezOklbYG6ZPa4Igf3DVzUupeJpu/xhVH3rC9tQMZcmz6HJPPWCKuf62ewoi15YFX6W8sk7lOzgT2o7OLUA4lzv/1hUKwNKaSsk5W7QTl6g2FjuEdI4Dq44MedNb7duTjbLsUULpzgrWqZcLSxRPGhfyZGuURM+ArDlFV1A6OPLE7FuDJ5fIZPHiS/AL1OuAl1CJCkmnknQPb+IOpKiIorzGUKQ3HX3JM6vLbFvWSrM/jh+kywV1r7d3lhjBW6vwZ6NuxP8RDP0ecZ6eaC32EX37rK478hwFaw0hBGjX9rwYyhYCBsh5yk3+9xe1razr07Cxs1i2IRkgs4VoBLUva/KcP+61b8Ophd/nAmJudNPM6M5ygm5k4TpfX0XyCESUo9+4UF8PdMAn8DBRprcXq2dzojtzFLFnvN4qg/6vU7GyrUnKzaCLPyR5FJcRaFiexZOcuxmXn0spsBt3o32VGRuNbtI1anurF8v2kROhEhcTBOq6Ak5x X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f8b9efd1-6279-42ff-e591-08dafe9ef5e7 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:51.3999 (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: nUnvN282wvhanGqAszl5g3O7Sl8zuvRgoUF03fPVcksFudYT4aVkK3+OxgSnVP08wrJbjMVyA3UgO05rNVD0wg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9425 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org With all previous preparations done to make it possible for the single LCDIF embedded in i.MX93 SoC to drive multipledisplays simultaneously, add i.MX93 LCDIF compatible string as the last step of adding i.MX93 LCDIF support. Signed-off-by: Liu Ying --- drivers/gpu/drm/mxsfb/lcdif_drv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/mxsfb/lcdif_drv.c b/drivers/gpu/drm/mxsfb/lcdif_drv.c index eb6c265fa2fe..48c43b273a4a 100644 --- a/drivers/gpu/drm/mxsfb/lcdif_drv.c +++ b/drivers/gpu/drm/mxsfb/lcdif_drv.c @@ -249,6 +249,7 @@ static const struct drm_driver lcdif_driver = { static const struct of_device_id lcdif_dt_ids[] = { { .compatible = "fsl,imx8mp-lcdif" }, + { .compatible = "fsl,imx93-lcdif" }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, lcdif_dt_ids);