From patchwork Fri Jun 3 14:37:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9153283 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 C9A0160221 for ; Fri, 3 Jun 2016 14:38:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA3C52804C for ; Fri, 3 Jun 2016 14:38:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AEE0F282E8; Fri, 3 Jun 2016 14:38:19 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 13EC926C9B for ; Fri, 3 Jun 2016 14:38:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9239F6EDDD; Fri, 3 Jun 2016 14:37:59 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id B74A06EDBD for ; Fri, 3 Jun 2016 14:37:41 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id e3so24022249wme.2 for ; Fri, 03 Jun 2016 07:37:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/zw/SOt6c6o6QDFewwZAG6JcfGoJVMdprQ1nvPCC6fM=; b=gj7OZhfAGuliGFuPy1/CQ2Y7OxhDpWRU+xnhc/16I36eo3bGdLEnyQ/m/DvnEGUlNe u+MQGQW+e1Q4VrYOk2tWHuDEoAhH/YzyqLky/EcToJ4jmoPLdvoa5vliMCN1ox1/GxDZ LoVslOMX5SXS5SVMU+31RIAynwH+SCcZvriqRRVXgLEePv5K5hG9/H41DCYslEnnwX7M 64KDqoUiim32cGezeRnaR21V5EWI4Lb/c1eSeRpJZYpP/Rdar0YoaZrdyJxikah0tBLU KeLNWTx3tOeSSErFlSJJu4Sb49ozC/46QD7A/UJvhreaRkd1YX6cO9mwTTuKKyGZXoDx A68w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/zw/SOt6c6o6QDFewwZAG6JcfGoJVMdprQ1nvPCC6fM=; b=V8zcsU81S7tSLH1598hkzjkdeqPg50P7XIObykZe+Q/VLRsjuW/MdOS9R5yv0oeKUV nVvwlNixV0X3jfNWmOztDDfY530+r0G2vqx3sqGiIG3ikAny4/x+GXi83zjQPj5N83xF 8Mfr8+oCsI52UJ1YFp4Dtdj8i2UlSiO/pDkCIqP4FupJrt6ngYNGAF6OHfwfUU3/aNQX y9nMJ4X7z/x+Fd2nCMYfccMdRRlaAv00jO3rZmcAHniaysp78xl/x8TQRz2DAwMtH0Zl lAhW1ZSuD9Ei+9CavSWHgchLFHEftuEbjptmNg+DQAQUCamLapZScUTuzz2Yn5wjl43O 8peQ== X-Gm-Message-State: ALyK8tJqINKmBfm0SDbyHiWU2Hi4t0OV7uqU0dHeJrdMweHR9r/CUJ3JC5OAdOxNWhr8DQ== X-Received: by 10.28.168.86 with SMTP id r83mr4544375wme.9.1464964659864; Fri, 03 Jun 2016 07:37:39 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id e1sm6060275wjv.9.2016.06.03.07.37.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Jun 2016 07:37:38 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 3 Jun 2016 15:37:01 +0100 Message-Id: <1464964636-3877-19-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1464964636-3877-1-git-send-email-chris@chris-wilson.co.uk> References: <1464964636-3877-1-git-send-email-chris@chris-wilson.co.uk> MIME-Version: 1.0 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH v3 18/33] drm/i915: Demidlayer driver loading X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Take control over allocating, loading and registering the driver from the DRM midlayer by performing it manually from i915_pci_probe. This allows us to carefully control the order of when we setup the hardware vs when it becomes visible to third parties (including userspace). The current ordering makes the driver visible to userspace first (in order to coordinate with removed DRI1 userspace), but that ordering incurs risk. The risk increases as we strive for more asynchronous loading. One side effect of controlling the allocation is that we can allocate both the drm_device + drm_i915_private in one block, the next step towards subclassing. Unload is still left as before, a mix of midlayer and driver. v2: After drm_dev_init(), we should call drm_dev_unref() so that we call drm_dev_release() and free everything from drm_dev_init(). Suggested-by: Daniel Vetter Signed-off-by: Chris Wilson Cc: Daniel Vetter Cc: Ville Syrjälä --- drivers/gpu/drm/i915/i915_dma.c | 74 ++++++++++++++++++++++++++--------------- drivers/gpu/drm/i915/i915_drv.c | 3 +- drivers/gpu/drm/i915/i915_drv.h | 6 +++- 3 files changed, 53 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 6b36bca585c5..7c007e87f5d5 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1046,9 +1046,10 @@ static void i915_workqueues_cleanup(struct drm_i915_private *dev_priv) * function hooks not requiring accessing the device. */ static int i915_driver_init_early(struct drm_i915_private *dev_priv, - struct drm_device *dev, - struct intel_device_info *info) + const struct pci_device_id *ent) { + const struct intel_device_info *match_info = + (struct intel_device_info *)ent->driver_data; struct intel_device_info *device_info; int ret = 0; @@ -1057,8 +1058,8 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv, /* Setup the write-once "constant" device info */ device_info = (struct intel_device_info *)&dev_priv->info; - memcpy(device_info, info, sizeof(dev_priv->info)); - device_info->device_id = dev->pdev->device; + memcpy(device_info, match_info, sizeof(*device_info)); + device_info->device_id = dev_priv->drm.pdev->device; BUG_ON(device_info->gen > sizeof(device_info->gen_mask) * BITS_PER_BYTE); device_info->gen_mask = BIT(device_info->gen - 1); @@ -1080,18 +1081,18 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv, return ret; /* This must be called before any calls to HAS_PCH_* */ - intel_detect_pch(dev); + intel_detect_pch(&dev_priv->drm); - intel_pm_setup(dev); + intel_pm_setup(&dev_priv->drm); intel_init_dpio(dev_priv); intel_power_domains_init(dev_priv); intel_irq_init(dev_priv); intel_init_display_hooks(dev_priv); intel_init_clock_gating_hooks(dev_priv); intel_init_audio_hooks(dev_priv); - i915_gem_load_init(dev); + i915_gem_load_init(&dev_priv->drm); - intel_display_crc_init(dev); + intel_display_crc_init(&dev_priv->drm); i915_dump_device_info(dev_priv); @@ -1099,7 +1100,7 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv, * very first ones. Almost everything should work, except for maybe * suspend/resume. And we don't implement workarounds that affect only * pre-production machines. */ - if (IS_HSW_EARLY_SDV(dev)) + if (IS_HSW_EARLY_SDV(dev_priv)) DRM_INFO("This is an early pre-production Haswell machine. " "It may not be fully functional.\n"); @@ -1353,6 +1354,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv) struct drm_device *dev = dev_priv->dev; i915_gem_shrinker_init(dev_priv); + /* * Notify a valid surface after modesetting, * when running inside a VM. @@ -1360,9 +1362,13 @@ static void i915_driver_register(struct drm_i915_private *dev_priv) if (intel_vgpu_active(dev_priv)) I915_WRITE(vgtif_reg(display_ready), VGT_DRV_DISPLAY_READY); - i915_debugfs_register(dev_priv); - i915_setup_sysfs(dev); - intel_modeset_register(dev_priv); + /* Reveal our presence to userspace */ + if (drm_dev_register(dev, 0) == 0) { + i915_debugfs_register(dev_priv); + i915_setup_sysfs(dev); + intel_modeset_register(dev_priv); + } else + DRM_ERROR("Failed to register driver for userspace access!\n"); if (INTEL_INFO(dev_priv)->num_pipes) { /* Must be done after probing outputs */ @@ -1415,24 +1421,37 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv) * - allocate initial config memory * - setup the DRM framebuffer with the allocated memory */ -int i915_driver_load(struct drm_device *dev, unsigned long flags) +int i915_driver_load(struct pci_dev *pdev, + const struct pci_device_id *ent, + struct drm_driver *driver) { struct drm_i915_private *dev_priv; - int ret = 0; + int ret; dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL); if (dev_priv == NULL) return -ENOMEM; - dev->dev_private = dev_priv; + ret = drm_dev_init(&dev_priv->drm, driver, &pdev->dev); + if (ret) { + kfree(dev_priv); + goto out; + } + /* Must be set before calling __i915_printk */ - dev_priv->dev = dev; + dev_priv->drm.pdev = pdev; + dev_priv->drm.dev_private = dev_priv; + dev_priv->dev = &dev_priv->drm; + + ret = pci_enable_device(pdev); + if (ret) + goto out_free_priv; - ret = i915_driver_init_early(dev_priv, dev, - (struct intel_device_info *)flags); + pci_set_drvdata(pdev, &dev_priv->drm); + ret = i915_driver_init_early(dev_priv, ent); if (ret < 0) - goto out_free_priv; + goto out_pci_disable; intel_runtime_pm_get(dev_priv); @@ -1449,13 +1468,14 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) * of the i915_driver_init_/i915_driver_register functions according * to the role/effect of the given init step. */ - if (INTEL_INFO(dev)->num_pipes) { - ret = drm_vblank_init(dev, INTEL_INFO(dev)->num_pipes); + if (INTEL_INFO(dev_priv)->num_pipes) { + ret = drm_vblank_init(dev_priv->dev, + INTEL_INFO(dev_priv)->num_pipes); if (ret) goto out_cleanup_hw; } - ret = i915_load_modeset_init(dev); + ret = i915_load_modeset_init(dev_priv->dev); if (ret < 0) goto out_cleanup_vblank; @@ -1468,7 +1488,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) return 0; out_cleanup_vblank: - drm_vblank_cleanup(dev); + drm_vblank_cleanup(dev_priv->dev); out_cleanup_hw: i915_driver_cleanup_hw(dev_priv); out_cleanup_mmio: @@ -1476,11 +1496,12 @@ out_cleanup_mmio: out_runtime_pm_put: intel_runtime_pm_put(dev_priv); i915_driver_cleanup_early(dev_priv); +out_pci_disable: + pci_disable_device(pdev); out_free_priv: + drm_dev_unref(&dev_priv->drm); +out: i915_load_error(dev_priv, "Device initialization failed (%d)\n", ret); - - kfree(dev_priv); - return ret; } @@ -1543,7 +1564,6 @@ int i915_driver_unload(struct drm_device *dev) intel_display_power_put(dev_priv, POWER_DOMAIN_INIT); i915_driver_cleanup_early(dev_priv); - kfree(dev_priv); return 0; } diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index bbced9022e66..d5b5f6092a10 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1031,7 +1031,7 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (vga_switcheroo_client_probe_defer(pdev)) return -EPROBE_DEFER; - return drm_get_pci_dev(pdev, ent, &driver); + return i915_driver_load(pdev, ent, &driver); } static void @@ -1745,7 +1745,6 @@ static struct drm_driver driver = { .driver_features = DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | DRIVER_PRIME | DRIVER_RENDER | DRIVER_MODESET, - .load = i915_driver_load, .unload = i915_driver_unload, .open = i915_driver_open, .lastclose = i915_driver_lastclose, diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 273c8e80ee60..0791b8453c65 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1724,6 +1724,8 @@ struct intel_wm_config { }; struct drm_i915_private { + struct drm_device drm; + struct drm_device *dev; struct kmem_cache *objects; struct kmem_cache *vmas; @@ -2874,7 +2876,9 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level, #define i915_report_error(dev_priv, fmt, ...) \ __i915_printk(dev_priv, KERN_ERR, fmt, ##__VA_ARGS__) -extern int i915_driver_load(struct drm_device *, unsigned long flags); +extern int i915_driver_load(struct pci_dev *pdev, + const struct pci_device_id *ent, + struct drm_driver *driver); extern int i915_driver_unload(struct drm_device *); extern int i915_driver_open(struct drm_device *dev, struct drm_file *file); extern void i915_driver_lastclose(struct drm_device * dev);