From patchwork Tue Dec 13 23:38:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 9473389 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 40A33607F0 for ; Tue, 13 Dec 2016 23:38:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3583B2855A for ; Tue, 13 Dec 2016 23:38:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A70D286C0; Tue, 13 Dec 2016 23:38:07 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C2BAE2855A for ; Tue, 13 Dec 2016 23:38:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752777AbcLMXiF (ORCPT ); Tue, 13 Dec 2016 18:38:05 -0500 Received: from galahad.ideasonboard.com ([185.26.127.97]:41953 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752746AbcLMXiE (ORCPT ); Tue, 13 Dec 2016 18:38:04 -0500 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 6073620053; Wed, 14 Dec 2016 00:37:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1481672266; bh=a/6hdUhKsaw+V+CkcIfmxVywiKmKlnd9U+W6l6PWbJ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cyQVT7SkCUBoGhVfRtQHjl0BjGYlGsjcSxgUvawbcFUOHjLKsBejukLdEI2Te9BhZ okQmuOrmyx3cYY5GGV/8rdcIueSjMEHYRAw74rD3cBiao17b7+OuZuKCOReSvK+8I9 N3OjrqZi0V/E1YBdbFtafaDon/KCn5On4gsRclH0= From: Laurent Pinchart To: dri-devel@lists.freedesktop.org Cc: linux-omap@vger.kernel.org, Tomi Valkeinen Subject: [PATCH/RFC 6/7] drm: omapdrm: Register omapdrm platform device in omapdss driver Date: Wed, 14 Dec 2016 01:38:25 +0200 Message-Id: <1481672306-22564-7-git-send-email-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1481672306-22564-1-git-send-email-laurent.pinchart@ideasonboard.com> References: <1481672306-22564-1-git-send-email-laurent.pinchart@ideasonboard.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The omapdrm platform device is a virtual device created for the sole purpose of handling the omapdss/omapdrm driver split. It should eventually be removed. As a first step to ease refactoring move its registration from platform code to driver code. The omapdrm driver name must be changed internally to avoid probing both the device registered in platform code and the device registered in the omapdss driver, as that would otherwise break bisection. Signed-off-by: Laurent Pinchart --- drivers/gpu/drm/omapdrm/dss/core.c | 17 +++++++++++++++++ drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/omapdrm/dss/core.c b/drivers/gpu/drm/omapdrm/dss/core.c index 1bf978b5c5bc..b7c44b85b7c3 100644 --- a/drivers/gpu/drm/omapdrm/dss/core.c +++ b/drivers/gpu/drm/omapdrm/dss/core.c @@ -22,6 +22,7 @@ #define DSS_SUBSYS_NAME "CORE" +#include #include #include #include @@ -285,6 +286,16 @@ static void (*dss_output_drv_unreg_funcs[])(void) = { dss_uninit_platform_driver, }; +#if IS_ENABLED(CONFIG_DRM_OMAP) +static struct platform_device omap_drm_device = { + .dev = { + .coherent_dma_mask = DMA_BIT_MASK(32), + }, + .name = "omapdrm_", + .id = 0, +}; +#endif + static int __init omap_dss_init(void) { int r; @@ -300,6 +311,12 @@ static int __init omap_dss_init(void) goto err_reg; } +#if IS_ENABLED(CONFIG_DRM_OMAP) + r = platform_device_register(&omap_drm_device); + if (r) + goto err_reg; +#endif + return 0; err_reg: diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index 0e54e3c9c291..581bb12bdd30 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c @@ -937,7 +937,7 @@ static SIMPLE_DEV_PM_OPS(omapdrm_pm_ops, omap_drm_suspend, omap_drm_resume); static struct platform_driver pdev = { .driver = { - .name = DRIVER_NAME, + .name = "omapdrm_", .pm = &omapdrm_pm_ops, }, .probe = pdev_probe,