From patchwork Wed Jan 2 17:02:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmad Fatoum X-Patchwork-Id: 10747007 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 59EAD14E2 for ; Thu, 3 Jan 2019 08:46:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 428C0283A5 for ; Thu, 3 Jan 2019 08:46:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 340F8287A6; Thu, 3 Jan 2019 08:46:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B480B283A5 for ; Thu, 3 Jan 2019 08:45:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 221486E971; Thu, 3 Jan 2019 08:45:55 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0F5B76E879 for ; Wed, 2 Jan 2019 17:03:00 +0000 (UTC) Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1gejuy-0003sJ-7r; Wed, 02 Jan 2019 18:02:56 +0100 Received: from afa by dude.hi.pengutronix.de with local (Exim 4.91) (envelope-from ) id 1gejux-0004cE-4m; Wed, 02 Jan 2019 18:02:55 +0100 From: Ahmad Fatoum To: Stefan Agner , Marek Vasut , David Airlie , Daniel Vetter Subject: [PATCH 2/3] drm/mxsfb: implement interface-pix-fmt of_property to override bus format Date: Wed, 2 Jan 2019 18:02:46 +0100 Message-Id: <20190102170247.8208-3-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190102170247.8208-1-a.fatoum@pengutronix.de> References: <20190102170247.8208-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: afa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: dri-devel@lists.freedesktop.org X-Mailman-Approved-At: Thu, 03 Jan 2019 08:45:54 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel@pengutronix.de, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP This way hardware that has the LCD signal lines swapped can express so in the device tree and existing panel support can be reused unmodified. Signed-off-by: Ahmad Fatoum --- drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 4 +++- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 13 +++++++++++++ drivers/gpu/drm/mxsfb/mxsfb_drv.h | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/mxsfb/mxsfb_crtc.c b/drivers/gpu/drm/mxsfb/mxsfb_crtc.c index 1b5b1fddd691..0de48384054d 100644 --- a/drivers/gpu/drm/mxsfb/mxsfb_crtc.c +++ b/drivers/gpu/drm/mxsfb/mxsfb_crtc.c @@ -101,7 +101,9 @@ static void mxsfb_set_bus_fmt(struct mxsfb_drm_private *mxsfb) ctrl = readl(mxsfb->base + LCDC_CTRL); - if (mxsfb->connector.display_info.num_bus_formats) + if (mxsfb->bus_format_override) + bus_format = mxsfb->bus_format_override; + else if (mxsfb->connector.display_info.num_bus_formats) bus_format = mxsfb->connector.display_info.bus_formats[0]; ctrl &= ~CTRL_BUS_WIDTH_MASK; diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c index 2393e6d16ffd..169b458691e4 100644 --- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c +++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c @@ -182,6 +182,7 @@ static int mxsfb_load(struct drm_device *drm, unsigned long flags) struct platform_device *pdev = to_platform_device(drm->dev); struct mxsfb_drm_private *mxsfb; struct resource *res; + const char *fmt; int ret; mxsfb = devm_kzalloc(&pdev->dev, sizeof(*mxsfb), GFP_KERNEL); @@ -208,6 +209,18 @@ static int mxsfb_load(struct drm_device *drm, unsigned long flags) if (IS_ERR(mxsfb->clk_disp_axi)) mxsfb->clk_disp_axi = NULL; + ret = of_property_read_string(drm->dev->of_node, "interface-pix-fmt", &fmt); + if (!ret) { + if (!strcmp(fmt, "rgb24")) + mxsfb->bus_format_override = MEDIA_BUS_FMT_RGB888_1X24; + else if (!strcmp(fmt, "bgr24")) + mxsfb->bus_format_override = MEDIA_BUS_FMT_BGR888_1X24; + else if (!strcmp(fmt, "rbg24")) + mxsfb->bus_format_override = MEDIA_BUS_FMT_RBG888_1X24; + else if (!strcmp(fmt, "gbr24")) + mxsfb->bus_format_override = MEDIA_BUS_FMT_GBR888_1X24; + } + ret = dma_set_mask_and_coherent(drm->dev, DMA_BIT_MASK(32)); if (ret) return ret; diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.h b/drivers/gpu/drm/mxsfb/mxsfb_drv.h index 89fa2076acaf..63d30dd4dc36 100644 --- a/drivers/gpu/drm/mxsfb/mxsfb_drv.h +++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.h @@ -40,6 +40,7 @@ struct mxsfb_drm_private { struct drm_connector connector; struct drm_panel *panel; struct drm_fbdev_cma *fbdev; + unsigned int bus_format_override; }; int mxsfb_setup_crtc(struct drm_device *dev);