From patchwork Sat May 26 17:24:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 137007 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp976517lji; Sat, 26 May 2018 10:26:23 -0700 (PDT) X-Google-Smtp-Source: AB8JxZr6aVqjYMgn9kdzr1Lc22nCPtnmaOBzI13rfqC3l1n9f/ofFS8S5ZJ28AbJH5keOmecJM0J X-Received: by 2002:a63:6c03:: with SMTP id h3-v6mr5559537pgc.28.1527355583816; Sat, 26 May 2018 10:26:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527355583; cv=none; d=google.com; s=arc-20160816; b=kplH/fEm8hZy07fhemzooDH2kQ11bffFQ6EDfFV45/LACUYM6GoRMESI0EjVGNSupF OpG3jr/vOYY1EoFKm2NArBvSkXtDpmXSYFAkdCdzZCvTUS3e41QBaJ8lON3bZ/w4E06E 2/Yljf6AbRRXLxaDwx2PewMJhOwLTN+jzs9RHqWpSxWdEiHGGpwH5UnTVZgGqj7HBuyH Wgqt+5WntriiPyDdUSe+kYr+eFKAk9b9pL91c3kl/TSZ3UgAeCh/spFfIG6wEQEDbT8w aOQ5RLGTSySkjeY3nqBgww+GViLcExJxYAW5iqcSOA/9xeBN6Jsqav4wOEgod0hQbWrk vfqw== 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=Qhv/049EAHSlbd3d+ysmBuCD8idzThpFS3Jm4SGRDCg=; b=yxw6ahxy2eWrdsQ0kwyp7lR5h1+B6Fk3g8jD4GF9arExOgk2CM1fFDvd5/wLLPdzaF WRZhMWBXAlxDkyKCqXeLs4FsneTl43nPwP7nKDMcTNGiV5wuPogdHGo69kk3hDDItmtW IX0EnT4WoqASHdRSV9pWcgEEqsIn6mvv+8N+Hs7I88DK73sSwCMZUSfEzjjd741oUure Z99tWkoVfB6zPgLnkg6aXANQ8i4zFB6maKfQ2nn7Dmu08khkah5soKtItImrV1iZ57CB L4u5Vnh3JwXePm6irgmsZ4RJNVD01KMENC6R1/2T4E3ph90dBXyDYljQ6iNO052BP/jg ZoYA== 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 t7-v6si736887pgo.559.2018.05.26.10.26.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 26 May 2018 10:26:23 -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 1728F6E35A; Sat, 26 May 2018 17:25:34 +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 [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by gabe.freedesktop.org (Postfix) with ESMTPS id A38B56E351 for ; Sat, 26 May 2018 17:25:30 +0000 (UTC) Received: from avalon.bb.dnainternet.fi (unknown [IPv6:2001:14ba:21f5:5b00:2e86:4862:ef6a:2804]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 023C51C5E; Sat, 26 May 2018 19:25:25 +0200 (CEST) From: Laurent Pinchart To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 06/60] drm/omap: dss: Move platform_device_register from core.c to dss.c probe Date: Sat, 26 May 2018 20:24:24 +0300 Message-Id: <20180526172518.18710-7-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180526172518.18710-1-laurent.pinchart@ideasonboard.com> References: <20180526172518.18710-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 acef7ece5783..6c9f667f9982 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 d27d7f85bcd1..abd45b08f3a1 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 847c78ade024..4f1eb7f5b922 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss.h +++ b/drivers/gpu/drm/omapdrm/dss/dss.h @@ -235,6 +235,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;