From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB99DC2BA2B for ; Thu, 9 Apr 2020 14:34:58 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A9F4B20A8B for ; Thu, 9 Apr 2020 14:34:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tgKtPySi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A9F4B20A8B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=wTxRFsOo9U/wfffIAzts2n8jsRp6lZdcVqrf9jQ12KQ=; b=tgKtPySinNeuoy tSD5uVibYs7vc8w7SyVU9lVBTL4NYy5zuL1mAsMkFx73h4YNM0VQ2GrhxnYF1Mc4OTmWQpEJUXRi8 Hld4mL1B1LbQCQtF7IVxvuJr1LH1LLx5jXvnA/TgipLSsPsWTraC2tqykAmtkZeTyci8S7wk9eGNd UoPFW93mZscZUjxdgPt8OLhv4XFAf8LglW2pslRLxIYnb9c2uNl7g70RU5eR6JTc/jQd5PEXFHCG8 B7p+eHi3I0hurJlKUoAiTNFccQW5nORaYbspallwnPfJ1uEGcB0ZvnRrNyRXIk12nRXe8SprRecug 2AEmNgEjFOIQ3ZyZTW4w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jMYGf-0000Rh-DY; Thu, 09 Apr 2020 14:34:57 +0000 Received: from asavdk3.altibox.net ([109.247.116.14]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jMYGb-0000R8-1B for linux-arm-kernel@lists.infradead.org; Thu, 09 Apr 2020 14:34:55 +0000 Received: from ravnborg.org (unknown [158.248.194.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by asavdk3.altibox.net (Postfix) with ESMTPS id ED35F20029; Thu, 9 Apr 2020 16:34:49 +0200 (CEST) Date: Thu, 9 Apr 2020 16:34:48 +0200 From: Sam Ravnborg To: Rob Herring Subject: Re: [PATCH 3/3] drm: pl111: Move VExpress setup into versatile init Message-ID: <20200409143448.GC4673@ravnborg.org> References: <20200409013947.12667-1-robh@kernel.org> <20200409013947.12667-4-robh@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200409013947.12667-4-robh@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.3 cv=eMA9ckh1 c=1 sm=1 tr=0 a=UWs3HLbX/2nnQ3s7vZ42gw==:117 a=UWs3HLbX/2nnQ3s7vZ42gw==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=kj9zAlcOel0A:10 a=-VAfIpHNAAAA:8 a=e5mUnYsNAAAA:8 a=VwQbUJbxAAAA:8 a=7gkXJVJtAAAA:8 a=JXkyV6Z2wAxNnFGdFEwA:9 a=CjuIK1q_8ugA:10 a=srlwD-8ojaedGGhPAyx8:22 a=Vxmtnl_E_bksehYqCbjh:22 a=AjGcO6oz07-iQ99wixmX:22 a=E9Po1WZjFZOl8hwRPBS3:22 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200409_073453_605280_F1E4315A X-CRM114-Status: GOOD ( 31.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Anholt , linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Rob. On Wed, Apr 08, 2020 at 07:39:47PM -0600, Rob Herring wrote: > Since the VExpress setup in pl111_vexpress.c is now just a single > function call, let's move it into pl111_versatile.c and we can further > simplify pl111_versatile_init() by moving the other pieces for VExpress > into pl111_vexpress_clcd_init(). > > Cc: Eric Anholt > Cc: dri-devel@lists.freedesktop.org > Signed-off-by: Rob Herring Patch looks good - nits below, but anyway: Acked-by: Sam Ravnborg > --- > drivers/gpu/drm/pl111/Makefile | 1 - > drivers/gpu/drm/pl111/pl111_versatile.c | 122 ++++++++++++++++++++---- > drivers/gpu/drm/pl111/pl111_vexpress.c | 96 ------------------- > drivers/gpu/drm/pl111/pl111_vexpress.h | 22 ----- > 4 files changed, 102 insertions(+), 139 deletions(-) > delete mode 100644 drivers/gpu/drm/pl111/pl111_vexpress.c > delete mode 100644 drivers/gpu/drm/pl111/pl111_vexpress.h > > diff --git a/drivers/gpu/drm/pl111/Makefile b/drivers/gpu/drm/pl111/Makefile > index 0c70f0e91d21..67d430d433e0 100644 > --- a/drivers/gpu/drm/pl111/Makefile > +++ b/drivers/gpu/drm/pl111/Makefile > @@ -3,7 +3,6 @@ pl111_drm-y += pl111_display.o \ > pl111_versatile.o \ > pl111_drv.o > > -pl111_drm-$(CONFIG_ARCH_VEXPRESS) += pl111_vexpress.o > pl111_drm-$(CONFIG_ARCH_NOMADIK) += pl111_nomadik.o > pl111_drm-$(CONFIG_DEBUG_FS) += pl111_debugfs.o > > diff --git a/drivers/gpu/drm/pl111/pl111_versatile.c b/drivers/gpu/drm/pl111/pl111_versatile.c > index 8c2551088f26..1b55f977e945 100644 > --- a/drivers/gpu/drm/pl111/pl111_versatile.c > +++ b/drivers/gpu/drm/pl111/pl111_versatile.c > @@ -11,7 +11,6 @@ > #include > > #include "pl111_versatile.h" > -#include "pl111_vexpress.h" > #include "pl111_drm.h" > > static struct regmap *versatile_syscon_map; > @@ -309,13 +308,110 @@ static const struct pl111_variant_data pl111_vexpress = { > .broken_clockdivider = true, > }; > > +#define VEXPRESS_FPGAMUX_MOTHERBOARD 0x00 > +#define VEXPRESS_FPGAMUX_DAUGHTERBOARD_1 0x01 > +#define VEXPRESS_FPGAMUX_DAUGHTERBOARD_2 0x02 > + > +static int pl111_vexpress_clcd_init(struct device *dev, struct device_node *np, > + struct pl111_drm_dev_private *priv) > +{ > + struct platform_device *pdev; > + struct device_node *root; > + struct device_node *child; > + struct device_node *ct_clcd = NULL; > + struct regmap *map; > + bool has_coretile_clcd = false; > + bool has_coretile_hdlcd = false; > + bool mux_motherboard = true; > + u32 val; > + int ret; > + > + if (!IS_ENABLED(CONFIG_VEXPRESS_CONFIG)) > + return -ENODEV; Thats was a simple way to get out of this. Maybe a WARN() was in place, because should we ever hit this? > + > + /* > + * Check if we have a CLCD or HDLCD on the core tile by checking if a > + * CLCD or HDLCD is available in the root of the device tree. > + */ > + root = of_find_node_by_path("/"); > + if (!root) > + return -EINVAL; > + > + for_each_available_child_of_node(root, child) { > + if (of_device_is_compatible(child, "arm,pl111")) { > + has_coretile_clcd = true; > + ct_clcd = child; > + break; > + } > + if (of_device_is_compatible(child, "arm,hdlcd")) { > + has_coretile_hdlcd = true; > + of_node_put(child); > + break; > + } > + } > + > + of_node_put(root); > + > + /* > + * If there is a coretile HDLCD and it has a driver, > + * do not mux the CLCD on the motherboard to the DVI. > + */ > + if (has_coretile_hdlcd && IS_ENABLED(CONFIG_DRM_HDLCD)) > + mux_motherboard = false; > + > + /* > + * On the Vexpress CA9 we let the CLCD on the coretile > + * take precedence, so also in this case do not mux the > + * motherboard to the DVI. > + */ > + if (has_coretile_clcd) > + mux_motherboard = false; > + > + if (mux_motherboard) { > + dev_info(dev, "DVI muxed to motherboard CLCD\n"); > + val = VEXPRESS_FPGAMUX_MOTHERBOARD; > + } else if (ct_clcd == dev->of_node) { > + dev_info(dev, > + "DVI muxed to daughterboard 1 (core tile) CLCD\n"); > + val = VEXPRESS_FPGAMUX_DAUGHTERBOARD_1; > + } else { > + dev_info(dev, "core tile graphics present\n"); > + dev_info(dev, "this device will be deactivated\n"); > + return -ENODEV; > + } > + > + /* Call into deep Vexpress configuration API */ > + pdev = of_find_device_by_node(np); > + if (!pdev) { > + dev_err(dev, "can't find the sysreg device, deferring\n"); > + return -EPROBE_DEFER; > + } > + > + map = devm_regmap_init_vexpress_config(&pdev->dev); > + if (IS_ERR(map)) { > + platform_device_put(pdev); > + return PTR_ERR(map); > + } > + > + ret = regmap_write(map, 0, val); > + platform_device_put(pdev); > + if (ret) { > + dev_err(dev, "error setting DVI muxmode\n"); > + return -ENODEV; > + } > + > + priv->variant = &pl111_vexpress; > + dev_info(dev, "initializing Versatile Express PL111\n"); > + > + return 0; > +} > + > int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv) > { > const struct of_device_id *clcd_id; > enum versatile_clcd versatile_clcd_type; > struct device_node *np; > struct regmap *map; > - int ret; > > np = of_find_matching_node_and_match(NULL, versatile_clcd_of_match, > &clcd_id); > @@ -326,17 +422,10 @@ int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv) > versatile_clcd_type = (enum versatile_clcd)clcd_id->data; > > /* Versatile Express special handling */ > - if (IS_ENABLED(CONFIG_VEXPRESS_CONFIG) && versatile_clcd_type == VEXPRESS_CLCD_V2M) { > - struct platform_device *pdev; > - /* Call into deep Vexpress configuration API */ > - pdev = of_find_device_by_node(np); > - if (!pdev) { > - dev_err(dev, "can't find the sysreg device, deferring\n"); > - of_node_put(np); > - return -EPROBE_DEFER; > - } > - map = devm_regmap_init_vexpress_config(&pdev->dev); > - platform_device_put(pdev); > + if (versatile_clcd_type == VEXPRESS_CLCD_V2M) { > + int ret = pl111_vexpress_clcd_init(dev, np, priv); > + of_node_put(np); > + return ret; It is often in error situations one return early, but in this case it is a normal case. Maybe a small comment? > } else { > map = syscon_node_to_regmap(np); > } > @@ -380,13 +469,6 @@ int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv) > priv->variant_display_disable = pl111_realview_clcd_disable; > dev_info(dev, "set up callbacks for RealView PL111\n"); > break; > - case VEXPRESS_CLCD_V2M: > - priv->variant = &pl111_vexpress; > - dev_info(dev, "initializing Versatile Express PL111\n"); > - ret = pl111_vexpress_clcd_init(dev, priv, map); > - if (ret) > - return ret; > - break; The switch no longer includes VEXPRESS_CLCD_V2M - because we will never reach the switch in this case. I guess some gcc falgs may cause a warning that not all enums are accounted for. But then again, the default may supress it. Anyway, I noticed so you got a comment. I think current code is fine. Sam > default: > dev_info(dev, "unknown Versatile system controller\n"); > break; > diff --git a/drivers/gpu/drm/pl111/pl111_vexpress.c b/drivers/gpu/drm/pl111/pl111_vexpress.c > deleted file mode 100644 > index 37ed3f1da820..000000000000 > --- a/drivers/gpu/drm/pl111/pl111_vexpress.c > +++ /dev/null > @@ -1,96 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0 > -/* > - * Versatile Express PL111 handling > - * Copyright (C) 2018 Linus Walleij > - * > - * This module binds to the "arm,vexpress-muxfpga" device on the > - * Versatile Express configuration bus and sets up which CLCD instance > - * gets muxed out on the DVI bridge. > - */ > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include "pl111_drm.h" > -#include "pl111_vexpress.h" > - > -#define VEXPRESS_FPGAMUX_MOTHERBOARD 0x00 > -#define VEXPRESS_FPGAMUX_DAUGHTERBOARD_1 0x01 > -#define VEXPRESS_FPGAMUX_DAUGHTERBOARD_2 0x02 > - > -int pl111_vexpress_clcd_init(struct device *dev, > - struct pl111_drm_dev_private *priv, > - struct regmap *map) > -{ > - struct device_node *root; > - struct device_node *child; > - struct device_node *ct_clcd = NULL; > - bool has_coretile_clcd = false; > - bool has_coretile_hdlcd = false; > - bool mux_motherboard = true; > - u32 val; > - int ret; > - > - /* > - * Check if we have a CLCD or HDLCD on the core tile by checking if a > - * CLCD or HDLCD is available in the root of the device tree. > - */ > - root = of_find_node_by_path("/"); > - if (!root) > - return -EINVAL; > - > - for_each_available_child_of_node(root, child) { > - if (of_device_is_compatible(child, "arm,pl111")) { > - has_coretile_clcd = true; > - ct_clcd = child; > - break; > - } > - if (of_device_is_compatible(child, "arm,hdlcd")) { > - has_coretile_hdlcd = true; > - of_node_put(child); > - break; > - } > - } > - > - of_node_put(root); > - > - /* > - * If there is a coretile HDLCD and it has a driver, > - * do not mux the CLCD on the motherboard to the DVI. > - */ > - if (has_coretile_hdlcd && IS_ENABLED(CONFIG_DRM_HDLCD)) > - mux_motherboard = false; > - > - /* > - * On the Vexpress CA9 we let the CLCD on the coretile > - * take precedence, so also in this case do not mux the > - * motherboard to the DVI. > - */ > - if (has_coretile_clcd) > - mux_motherboard = false; > - > - if (mux_motherboard) { > - dev_info(dev, "DVI muxed to motherboard CLCD\n"); > - val = VEXPRESS_FPGAMUX_MOTHERBOARD; > - } else if (ct_clcd == dev->of_node) { > - dev_info(dev, > - "DVI muxed to daughterboard 1 (core tile) CLCD\n"); > - val = VEXPRESS_FPGAMUX_DAUGHTERBOARD_1; > - } else { > - dev_info(dev, "core tile graphics present\n"); > - dev_info(dev, "this device will be deactivated\n"); > - return -ENODEV; > - } > - > - ret = regmap_write(map, 0, val); > - if (ret) { > - dev_err(dev, "error setting DVI muxmode\n"); > - return -ENODEV; > - } > - > - return 0; > -} > diff --git a/drivers/gpu/drm/pl111/pl111_vexpress.h b/drivers/gpu/drm/pl111/pl111_vexpress.h > deleted file mode 100644 > index bb54864ca91e..000000000000 > --- a/drivers/gpu/drm/pl111/pl111_vexpress.h > +++ /dev/null > @@ -1,22 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0 > - > -struct device; > -struct pl111_drm_dev_private; > -struct regmap; > - > -#ifdef CONFIG_ARCH_VEXPRESS > - > -int pl111_vexpress_clcd_init(struct device *dev, > - struct pl111_drm_dev_private *priv, > - struct regmap *map); > - > -#else > - > -static inline int pl111_vexpress_clcd_init(struct device *dev, > - struct pl111_drm_dev_private *priv, > - struct regmap *map) > -{ > - return -ENODEV; > -} > - > -#endif > -- > 2.20.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel