From patchwork Wed Mar 7 00:24:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 130836 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp4567838lja; Tue, 6 Mar 2018 16:25:07 -0800 (PST) X-Google-Smtp-Source: AG47ELuStOBIIHya6PFV9zjWprztQGi2gBH1FcEI/stgbBQzZtg3Xs3kcAdQpzHgFElweOlTz3xV X-Received: by 10.99.125.25 with SMTP id y25mr16683195pgc.227.1520382307581; Tue, 06 Mar 2018 16:25:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520382307; cv=none; d=google.com; s=arc-20160816; b=dtE2Y5W4/Qo5mfACJUOhrt/oAS6VDwawb7jYpTE1tPtvJ5sks++lU4aAEkKtwKmF0o TVrsCgs++sU5O9vilZ8Kv9Ge119KtCeZWxQis8LD2Kezfts1GLOFkuhSEzuoAklj58Ga atINVLNIqgOdln2vc6S/TajCaKSSa2PUWtxLvFcG0VMU7m+D1bE/S8PWmMQ23Ks1BTIO BcMs23ZGCTvXiGMCto2OSTFYzloKNmqzO74IfE2iQmO40Zo53D8ChedfZcV200BZAbal g82vXZ+4mPsL/xy4iuyHeqZQ6cBdMxK7j/UYv5ntP72d8KcwVmlIuMdwReNkLVIOBPnd sPzg== 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:dkim-signature:delivered-to:arc-authentication-results; bh=08IgJPdwRWqLA02aCxz04pI80FcUjuLLrcaTrrdAQcA=; b=GTQoh3RvNCbZudFFWdi0dNL6Uc/jwBZshau6kGDw84dxWYynKfvI7w+NnQwgX/aDiT EeA5hkAqB29MD0TIWwO9YL8tdhwmdhLBwzvoN3K6kEsIg+BQp9U60O76G+++q7eic45x iinz4QOctz4q9q+tcrE1z4h5IXTJZxWFZirpOpTPhYHXYsBAoFYg24GeRhp5vdwNDhKu mlcAy8/q2HLTb/OHHG+scpCB5cEHr2qao4wSQccgj9JjLhiK0tUctIN+FDhV6rPvFbY1 +90/LCCLIoF1Kth07uf+JyoYcJfKhVEaJE+0OGKOfzx0hwbiw9VM8yY3E7WwuzW6sfp4 IwiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ideasonboard.com header.s=mail header.b=sbYHSyiG; 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 u1si10607010pgq.194.2018.03.06.16.25.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Mar 2018 16:25:07 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@ideasonboard.com header.s=mail header.b=sbYHSyiG; 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 0A12D6E411; Wed, 7 Mar 2018 00:24:23 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from galahad.ideasonboard.com (galahad.ideasonboard.com [IPv6:2001:4b98:dc2:45:216:3eff:febb:480d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 801B06E40B for ; Wed, 7 Mar 2018 00:24:19 +0000 (UTC) Received: from avalon.bb.dnainternet.fi (dfj612ybrt5fhg77mgycy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:2e86:4862:ef6a:2804]) by galahad.ideasonboard.com (Postfix) with ESMTPSA id C857B20D3E; Wed, 7 Mar 2018 01:22:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1520382134; bh=RB1t4et2Q/lmaWsuqlEs9NxB9zcw7HoPBJ4m7NDw4nw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sbYHSyiGVyUP1KlCReBKt4HYxxkGiN510pDq7DUj7nF0S+mHOLdkxEXxjg2PPonZc 1JxfBokGAZ88HIUGtxuvWW7sO4HF94m6iljNnbzLGHaKVlj5FO5nIPimftNMvjN512 dP4EK0QDaUNf6UY3rFblAUbjzfiEJYHyqmqzxTto= From: Laurent Pinchart To: dri-devel@lists.freedesktop.org Subject: [PATCH/RFC 06/60] drm/omap: dss: Move platform_device_register from core.c to dss.c probe Date: Wed, 7 Mar 2018 02:24:09 +0200 Message-Id: <20180307002503.19455-7-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180307002503.19455-1-laurent.pinchart@ideasonboard.com> References: <20180307002503.19455-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 , Jyri Sarha 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 --- 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 f2e32ebda316..5f7789cf43c7 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss.c +++ b/drivers/gpu/drm/omapdrm/dss/dss.c @@ -1317,6 +1317,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); @@ -1327,11 +1328,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 c601ed9a09c2..73f5e8fc18cf 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;