From patchwork Fri Dec 15 15:15:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 10115351 X-Patchwork-Delegate: geert@linux-m68k.org 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 29B7760231 for ; Fri, 15 Dec 2017 15:16:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17BFA29EB9 for ; Fri, 15 Dec 2017 15:16:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0CE0E29F62; Fri, 15 Dec 2017 15:16:33 +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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 A2F3829EB9 for ; Fri, 15 Dec 2017 15:16:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756818AbdLOPQc (ORCPT ); Fri, 15 Dec 2017 10:16:32 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:41627 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756747AbdLOPQb (ORCPT ); Fri, 15 Dec 2017 10:16:31 -0500 Received: by mail-wr0-f193.google.com with SMTP id z18so8334850wrb.8 for ; Fri, 15 Dec 2017 07:16:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Q32vWogAcqYkuusPyFVXXjs1VnNZsdA5jpi5ZYB6sSQ=; b=XW28J8wxSfrKsG3gEghyyZYnb/uk/SzApBn2gn7US4ORMYu4VsuCW8u2QH9LqJNSMn LuJu2pORAnzcPv0SswX+xb/j6kaVn5+uw+VYvU0D+X90zlZOotjK40BWLOwcwYqmGcIn 3pS/e6sbXKQ8QP984+R/d9x7bEBWZcTcS1oEYYvLZb5eQxMkVdr02x/2Xq6yOSR5h16e /HalZe+ehWg3wtmGiLuzXIsIjtqM/EY9AXc2Lfo2Sh9Ko06jci6RTG7o2H7/WDJ2jqu1 uGaEYW4DEQ7c4vJQJSnYBTB0GJa/LuM45/FRex7ett+K/7cH4wf9z4UxDsEEmOniYOSQ C/vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Q32vWogAcqYkuusPyFVXXjs1VnNZsdA5jpi5ZYB6sSQ=; b=E4egSo5zHx+BCdzpcUmO1AqGJHxOjm7JspCT/0Xa9YvR2Xap9xf3iVBZZ9NFySokUN zDklpJuRgA6jVxQTp6amQkCkEV21GJpg2SbM/zYLiDRlGju+9qdfch2nX+bl0SyVjg1+ 7BerP2EuBCrnhbr/BVpouPZF/xgFJiruegwqTD8bGW9JobMwBglAInB56CoyRW5Cl/+D ezr/Nuu5Ihq1o7oez776HuiQW+9p7urAQmjnrnL8NqEKdl2ygeROwD7UzBSc9tIXN5bp Rh0HDhuchQCQclp6yqMIjLzvfbAfAU0zGhNhGBn4AeapKPpFKZy2X7Sf2hUD2mUK5CMu R+ew== X-Gm-Message-State: AKGB3mKlsUEuNHghWnmMMyPGondfIEZn2+CsNpfHhKAfCIPCZPOCq1vf WwYbssj838bctFqsZ++iiMIEblA= X-Google-Smtp-Source: ACJfBou9tAtJoeAeM5pxbcbwUWDBTjdQN6Xn1rHPaPyiE8I3Coxu/xboJFUO8boMoFCtowBL9JqmMg== X-Received: by 10.223.176.233 with SMTP id j38mr10079855wra.178.1513350990245; Fri, 15 Dec 2017 07:16:30 -0800 (PST) Received: from groucho.site (ipbcc3b865.dynamic.kabel-deutschland.de. [188.195.184.101]) by smtp.gmail.com with ESMTPSA id j132sm28537735wmd.2.2017.12.15.07.16.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Dec 2017 07:16:29 -0800 (PST) From: Ulrich Hecht To: linux-renesas-soc@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, magnus.damm@gmail.com, Ulrich Hecht Subject: [PATCH 7/7] drm/img-rogue: replace call to obsolete drm_platform_init() Date: Fri, 15 Dec 2017 16:15:45 +0100 Message-Id: <1513350945-2642-8-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513350945-2642-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1513350945-2642-1-git-send-email-ulrich.hecht+renesas@gmail.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use drm_dev_alloc(), drm_dev_register() and remove the .load and .unload methods from drm_driver. Signed-off-by: Ulrich Hecht --- include/drm/pvr_drm.h | 2 ++ kernel/drivers/staging/imgtec/pvr_drm.c | 23 +---------------------- kernel/drivers/staging/imgtec/pvr_platform_drv.c | 19 ++++++++++++++++++- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/include/drm/pvr_drm.h b/include/drm/pvr_drm.h index 5cd13cc..3308791 100644 --- a/include/drm/pvr_drm.h +++ b/include/drm/pvr_drm.h @@ -99,4 +99,6 @@ struct drm_pvr_dbgdrv_cmd { #define DRM_IOCTL_PVR_SRVKM_CMD DRM_IOWR(DRM_COMMAND_BASE + DRM_PVR_SRVKM_CMD, struct drm_pvr_srvkm_cmd) #define DRM_IOCTL_PVR_DBGDRV_CMD DRM_IOWR(DRM_COMMAND_BASE + DRM_PVR_DBGDRV_CMD, struct drm_pvr_dbgdrv_cmd) +int pvr_drm_load(struct drm_device *ddev, unsigned long flags); + #endif /* defined(__PVR_DRM_H__) */ diff --git a/kernel/drivers/staging/imgtec/pvr_drm.c b/kernel/drivers/staging/imgtec/pvr_drm.c index 388943b..c69fec1 100644 --- a/kernel/drivers/staging/imgtec/pvr_drm.c +++ b/kernel/drivers/staging/imgtec/pvr_drm.c @@ -93,7 +93,7 @@ const struct dev_pm_ops pvr_pm_ops = { }; -static int pvr_drm_load(struct drm_device *ddev, unsigned long flags) +int pvr_drm_load(struct drm_device *ddev, unsigned long flags) { struct _PVRSRV_DEVICE_NODE_ *dev_node; enum PVRSRV_ERROR srv_err; @@ -101,13 +101,6 @@ static int pvr_drm_load(struct drm_device *ddev, unsigned long flags) DRM_DEBUG_DRIVER("device %p\n", ddev->dev); - /* - * The equivalent is done for PCI modesetting drivers by - * drm_get_pci_dev() - */ - if (ddev->platformdev) - platform_set_drvdata(ddev->platformdev, ddev); - srv_err = PVRSRVDeviceCreate(ddev->dev, &dev_node); if (srv_err != PVRSRV_OK) { DRM_ERROR("failed to create device node for device %p (%s)\n", @@ -134,18 +127,6 @@ err_exit: return err; } -static int pvr_drm_unload(struct drm_device *ddev) -{ - DRM_DEBUG_DRIVER("device %p\n", ddev->dev); - - PVRSRVCommonDeviceDeinit(ddev->dev_private); - - PVRSRVDeviceDestroy(ddev->dev_private); - ddev->dev_private = NULL; - - return 0; -} - static int pvr_drm_open(struct drm_device *ddev, struct drm_file *dfile) { int err; @@ -237,8 +218,6 @@ const struct drm_driver pvr_drm_generic_driver = { .driver_features = DRIVER_MODESET | DRIVER_RENDER, .dev_priv_size = 0, - .load = pvr_drm_load, - .unload = pvr_drm_unload, .open = pvr_drm_open, .postclose = pvr_drm_release, diff --git a/kernel/drivers/staging/imgtec/pvr_platform_drv.c b/kernel/drivers/staging/imgtec/pvr_platform_drv.c index 54a7d02..63b142d 100644 --- a/kernel/drivers/staging/imgtec/pvr_platform_drv.c +++ b/kernel/drivers/staging/imgtec/pvr_platform_drv.c @@ -50,6 +50,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "module_common.h" #include "pvr_drv.h" +#include "pvr_drm.h" #include "pvrmodule.h" #include "sysinfo.h" @@ -149,9 +150,25 @@ static void pvr_devices_unregister(void) static int pvr_probe(struct platform_device *pdev) { + struct drm_device *drm; + int result; + DRM_DEBUG_DRIVER("device %p\n", &pdev->dev); - return drm_platform_init(&pvr_drm_platform_driver, pdev); + drm = drm_dev_alloc(&pvr_drm_platform_driver, &pdev->dev); + if (IS_ERR(drm)) + return PTR_ERR(drm); + + platform_set_drvdata(pdev, drm); + + result = pvr_drm_load(drm, 0); + + if (result) + return result; + + result = drm_dev_register(drm, 0); + + return result; } static int pvr_remove(struct platform_device *pdev)