From patchwork Mon Aug 6 00:26:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 143469 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2700349ljj; Sun, 5 Aug 2018 17:27:53 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfLznORofCGryfi+SJ5LSZ8ae6oy2VU3DM0uqvhtqipXSC27kJlLVoIgxGMqSHRJ6+qvKQF X-Received: by 2002:a62:1219:: with SMTP id a25-v6mr14833477pfj.104.1533515273420; Sun, 05 Aug 2018 17:27:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533515273; cv=none; d=google.com; s=arc-20160816; b=SgUng38mX5f7UgzByaS5KSkjgUwtl5djuICmFEp7L5Izlp2TV5l7GZM9lsJSe983Ml 2W2x8X6/Xzt1z6g1s1CXnItKEcJdfm5jQNk5oLWWKzaPc8DjVBK1mzKNVzPAVe4eDuB0 VqxZkffdaGLVAFU62/KBpQQWrMacO/9vy0XIPBHJKTB2p3kJ4I0bc41agpwbQ++uB32W V59Nz25/6UEbWIShtmeRT0Ut9or23YIyPh3CquC0SpLck8ZeKKyjmtaehFF9u3Enuwwa 8uK/xdNa7p9PWezKIq0hyZMnOmT5X5QTyPmL0yR8sOzDEOyDHIzgKA8+6DRzpjp7IB8H P6kA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:references:in-reply-to:message-id:date:subject :to:from:delivered-to:arc-authentication-results; bh=2si998zYHH4OH29cF9tdQNjj46r8BBro7blRVgh++4g=; b=WE2hnEXdnozB8nI++sd+MCxhWrSEeXnUfrfl6qIbXUzWro4rn803XugEY+VxyHTSLG mrLN6Nb517gK/+C+KnL/EvE45l+c0S4kZgI/e0glDI3FludftVx9MbwasvNq94cdrQ5E rK1newI27k0IXbbyj108k1/wR8KH0bVqgcyW8GLQgTBS5HOZXX5NmeZhAH0B9l/kyng3 U9SW78gMQLI2i8KcV+uTMEUwu9jyL9kz1219rp6QkLd3DC5UcGYBteLVs41MHX4VmWit +3zetJRsb0Q5N/LmQ/ByikU17+7l2qTaSV7VEWRafNh4XpAXEx8e4o8igXhV0Tc2pE61 plEA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id r192-v6si11677268pgr.17.2018.08.05.17.27.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 05 Aug 2018 17:27:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0E71A6E16C; Mon, 6 Aug 2018 00:27:13 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5A2706E168 for ; Mon, 6 Aug 2018 00:27:09 +0000 (UTC) Received: from avalon.bb.dnainternet.fi (dfj612ybrt5fhg77mgycy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:2e86:4862:ef6a:2804]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E8E911BD7; Mon, 6 Aug 2018 02:27:04 +0200 (CEST) From: Laurent Pinchart To: dri-devel@lists.freedesktop.org Subject: [PATCH v3 06/61] drm/omap: dss: Move platform_device_register from core.c to dss.c probe Date: Mon, 6 Aug 2018 03:26:46 +0300 Message-Id: <20180806002741.30929-7-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180806002741.30929-1-laurent.pinchart@ideasonboard.com> References: <20180806002741.30929-1-laurent.pinchart@ideasonboard.com> 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: Tomi Valkeinen MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Jyri Sarha Register the omapdrm device when we know that dss device probe going to succeed. This avoids DSS6 and DSS2 omapdrm device registration from colliding with each other. Signed-off-by: Jyri Sarha Signed-off-by: Laurent Pinchart Reviewed-by: Sebastian Reichel --- Changes since v0: - Store the OMAP DRM platform device pointer in struct dss_device - Register the OMAP DRM platform device at the very end of dss_bind() --- drivers/gpu/drm/omapdrm/dss/core.c | 26 ++------------------------ drivers/gpu/drm/omapdrm/dss/dss.c | 13 +++++++++++++ drivers/gpu/drm/omapdrm/dss/dss.h | 2 ++ 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/dss/core.c b/drivers/gpu/drm/omapdrm/dss/core.c index 07d00a186f15..a2edabc9f6b3 100644 --- a/drivers/gpu/drm/omapdrm/dss/core.c +++ b/drivers/gpu/drm/omapdrm/dss/core.c @@ -45,36 +45,14 @@ static struct platform_driver * const omap_dss_drivers[] = { #endif }; -static struct platform_device *omap_drm_device; - static int __init omap_dss_init(void) { - int r; - - r = platform_register_drivers(omap_dss_drivers, - ARRAY_SIZE(omap_dss_drivers)); - if (r) - goto err_reg; - - omap_drm_device = platform_device_register_simple("omapdrm", 0, NULL, 0); - if (IS_ERR(omap_drm_device)) { - r = PTR_ERR(omap_drm_device); - goto err_reg; - } - - return 0; - -err_reg: - platform_unregister_drivers(omap_dss_drivers, - ARRAY_SIZE(omap_dss_drivers)); - - return r; + return platform_register_drivers(omap_dss_drivers, + ARRAY_SIZE(omap_dss_drivers)); } static void __exit omap_dss_exit(void) { - platform_device_unregister(omap_drm_device); - platform_unregister_drivers(omap_dss_drivers, ARRAY_SIZE(omap_dss_drivers)); } diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c index 9af7108dbf5f..64479b209c1f 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss.c +++ b/drivers/gpu/drm/omapdrm/dss/dss.c @@ -1315,6 +1315,7 @@ static const struct soc_device_attribute dss_soc_devices[] = { static int dss_bind(struct device *dev) { struct dss_device *dss = dev_get_drvdata(dev); + struct platform_device *drm_pdev; int r; r = component_bind_all(dev, NULL); @@ -1325,11 +1326,23 @@ static int dss_bind(struct device *dev) omapdss_set_dss(dss); + drm_pdev = platform_device_register_simple("omapdrm", 0, NULL, 0); + if (IS_ERR(drm_pdev)) { + component_unbind_all(dev, NULL); + return PTR_ERR(drm_pdev); + } + + dss->drm_pdev = drm_pdev; + return 0; } static void dss_unbind(struct device *dev) { + struct dss_device *dss = dev_get_drvdata(dev); + + platform_device_unregister(dss->drm_pdev); + omapdss_set_dss(NULL); component_unbind_all(dev, NULL); diff --git a/drivers/gpu/drm/omapdrm/dss/dss.h b/drivers/gpu/drm/omapdrm/dss/dss.h index 38302631b64b..e6baad7e653f 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss.h +++ b/drivers/gpu/drm/omapdrm/dss/dss.h @@ -238,6 +238,8 @@ struct dss_device { struct regmap *syscon_pll_ctrl; u32 syscon_pll_ctrl_offset; + struct platform_device *drm_pdev; + struct clk *parent_clk; struct clk *dss_clk; unsigned long dss_clk_rate;