From patchwork Mon Mar 6 11:52:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 6160 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1802252wrd; Mon, 6 Mar 2023 04:12:53 -0800 (PST) X-Google-Smtp-Source: AK7set8w9N1lVztDoIlR5ZoZ4/X2vIbC6EhIQuZ8902P0/rNfRU4nmkY4RhSUK9YcBuYXPD2vt8z X-Received: by 2002:a17:906:6a90:b0:8af:45d5:426f with SMTP id p16-20020a1709066a9000b008af45d5426fmr13471285ejr.33.1678104773153; Mon, 06 Mar 2023 04:12:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678104773; cv=none; d=google.com; s=arc-20160816; b=zUMOSKd39LXYYHnGdHH49d+YVOJsOG1KXMzF5vQqKCeer7cXPu/RfOeVQuRvpeo1DO /vq9ZKXZrx1tsrESG0xrwo0vLgdbIAUNfuTpWPEiS4X/fKKlSLzoqe8YWE9Cd2iTZE7y UyDTbncX1gNugyq4mLNm7S6VsH1aBD5XPiSl8yQgYIKfGhM3SyYBxNpzKeyFCYtDuHB1 dt8ACFYqAz9V6yUM0von2lf6Gs3U5ElRXs0+/5QLFW+jPMfhVvarNrPdDGA7PAzkjgGW wCmwUyHGvXYYhqpqdzj+mKoBBSgXIeD+UrGvr2MIePZs8smWuacsJzcV+QB+jbXqJYhn 4DmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=GkZQgSBRE9Mnb1yrz5baCSSO4m9ogk5Wycf9cG4Z8XM=; b=eXnTniRNebo2Lx2FC+bbk0jvM6pM/FgYHSjjAZCsoC8bZXGPXd/pe9zcJXn5Is+Ejs unfQLG1VSdnPfLCCuunADlDgODGOhHddxkNs7WBaPWkpnKm4jEx50KQnBV4yeyPsaELw 4+1XdgELWo1mxoNCTkcNkkJJ72HlCqsHmFhtDZPqLrC3RcXusVF+GYtmFh73brGWvPuv Y+A1Q6QYVF+bubmehII4Z5V9j9tSLmrL8IcKSNYv/xO41NIdELwWd37NkUjtrNNv9b8h 2Avv7R9I2LU4f+qKjjv6xx7XT1O5KUTNMbU6PnmwxVuMSwKg3bFrmULpt4Hz5ZNYkfV7 +vvQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l2-20020a170906938200b008b90d160acbsi5398999ejx.579.2023.03.06.04.12.29; Mon, 06 Mar 2023 04:12:53 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230124AbjCFLxd (ORCPT + 99 others); Mon, 6 Mar 2023 06:53:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230089AbjCFLxV (ORCPT ); Mon, 6 Mar 2023 06:53:21 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43D1EBBA8 for ; Mon, 6 Mar 2023 03:53:20 -0800 (PST) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pZ9Os-0007KQ-PC; Mon, 06 Mar 2023 12:53:06 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pZ9Or-002EWp-JP; Mon, 06 Mar 2023 12:53:05 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pZ9Oq-002fPD-PC; Mon, 06 Mar 2023 12:53:04 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Philipp Zabel , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Shawn Guo , Sascha Hauer , Sam Ravnborg , Liu Ying , Danilo Krummrich , Lucas Stach Cc: Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 0/2] drm/imx/lcdc: Implement DRM driver for imx25 Date: Mon, 6 Mar 2023 12:52:47 +0100 Message-Id: <20230306115249.2223042-1-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3863; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=ZQafLqCvrOyZY9GT64lmcJ9KbCJ2Ja9qncvaOCm+puA=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBkBdQGEdUD2U+Xyvo7WylhH+eF+hQLUlq7f/ur2 LM+59tTkmCJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCZAXUBgAKCRDB/BR4rcrs Cd3uB/0dLeqthuy9cKdU311vR1haAD7mxhjdjiV4Nb3bnOVuAOLMqo6e6w5uB+MLBLeuHrHK7Ad IVKxegVb1/E5Iad9FL6fxMfsd3jtAd870F0g2I3w42MOb5UC0YEjrttr9MydxHHGjrR5j9K4PmN LhJfgySBl/0Q1YE1hLHLumH5Sm169X4fM9n3YHSpt9BmcmKGLKlzuYZYMyzCflu/M93AudcTPxx 5tN8FJJCMvVvrv5CCLEtRUGWh/4b8YQKVWQi2EfCB/8pXqai0avu3cvdG4uP0cMZkt7sc2aS1gf ZopBZRt+POG+ak+EQmXPbHxmWEuzciPWaLjKCPTAKHRIOpLe X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759619822747694791?= X-GMAIL-MSGID: =?utf-8?q?1759620391045787147?= Hello, in response to Philipp's reply to v5 here comes a v6. The code changes are: | diff --git a/drivers/gpu/drm/imx/lcdc/imx-lcdc.c b/drivers/gpu/drm/imx/lcdc/imx-lcdc.c | index c2197fc50306..24bc7b310367 100644 | --- a/drivers/gpu/drm/imx/lcdc/imx-lcdc.c | +++ b/drivers/gpu/drm/imx/lcdc/imx-lcdc.c | @@ -7,7 +7,6 @@ | #include | #include | #include | -#include | #include | #include | #include | @@ -101,8 +100,6 @@ | struct imx_lcdc { | struct drm_device drm; | struct drm_simple_display_pipe pipe; | - const struct drm_display_mode *mode; | - struct drm_bridge *bridge; | struct drm_connector *connector; | void __iomem *base; | | @@ -122,23 +119,17 @@ static inline struct imx_lcdc *imx_lcdc_from_drmdev(struct drm_device *drm) | | static unsigned int imx_lcdc_get_format(unsigned int drm_format) | { | - unsigned int bpp; | - | switch (drm_format) { | default: | DRM_WARN("Format not supported - fallback to XRGB8888\n"); | fallthrough; | | case DRM_FORMAT_XRGB8888: | - bpp = BPP_XRGB8888; | - break; | + return BPP_XRGB8888; | | case DRM_FORMAT_RGB565: | - bpp = BPP_RGB565; | - break; | + return BPP_RGB565; | } | - | - return bpp; | } | | static void imx_lcdc_update_hw_registers(struct drm_simple_display_pipe *pipe, | @@ -401,6 +392,7 @@ static int imx_lcdc_probe(struct platform_device *pdev) | { | struct imx_lcdc *lcdc; | struct drm_device *drm; | + struct drm_bridge *bridge; | int irq; | int ret; | struct device *dev = &pdev->dev; | @@ -416,9 +408,9 @@ static int imx_lcdc_probe(struct platform_device *pdev) | if (IS_ERR(lcdc->base)) | return dev_err_probe(dev, PTR_ERR(lcdc->base), "Cannot get IO memory\n"); | | - lcdc->bridge = devm_drm_of_get_bridge(dev, dev->of_node, 0, 0); | - if (IS_ERR(lcdc->bridge)) | - return dev_err_probe(dev, PTR_ERR(lcdc->bridge), "Failed to find bridge\n"); | + bridge = devm_drm_of_get_bridge(dev, dev->of_node, 0, 0); | + if (IS_ERR(bridge)) | + return dev_err_probe(dev, PTR_ERR(bridge), "Failed to find bridge\n"); | | /* Get Clocks */ | lcdc->clk_ipg = devm_clk_get(dev, "ipg"); | @@ -454,7 +446,7 @@ static int imx_lcdc_probe(struct platform_device *pdev) | if (ret < 0) | return dev_err_probe(drm->dev, ret, "Failed to initialize vblank\n"); | | - ret = drm_bridge_attach(&lcdc->pipe.encoder, lcdc->bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR); | + ret = drm_bridge_attach(&lcdc->pipe.encoder, bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR); | if (ret) | return dev_err_probe(drm->dev, ret, "Cannot attach bridge\n"); (I quoted the patch in the hope that this way it won't interfere with b4 am or whatever is used to pickup this series.) Other than that I rebased the series to v6.3-rc1 and added the tags by Rob and Phillip that I got for v5. Marian Cichy (1): drm/imx/lcdc: Implement DRM driver for imx25 Uwe Kleine-König (1): dt-bindings: display: imx: Describe drm binding for fsl,imx-lcdc .../bindings/display/imx/fsl,imx-lcdc.yaml | 46 +- drivers/gpu/drm/imx/Kconfig | 1 + drivers/gpu/drm/imx/Makefile | 1 + drivers/gpu/drm/imx/lcdc/Kconfig | 7 + drivers/gpu/drm/imx/lcdc/Makefile | 1 + drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 545 ++++++++++++++++++ 6 files changed, 600 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/imx/lcdc/Kconfig create mode 100644 drivers/gpu/drm/imx/lcdc/Makefile create mode 100644 drivers/gpu/drm/imx/lcdc/imx-lcdc.c base-commit: fe15c26ee26efa11741a7b632e9f23b01aca4cc6