From patchwork Sat Jul 14 03:14:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramalingam C X-Patchwork-Id: 10524349 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 3BA74602B3 for ; Sat, 14 Jul 2018 03:16:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A8292983E for ; Sat, 14 Jul 2018 03:16:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1EC7329852; Sat, 14 Jul 2018 03:16:06 +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=-5.2 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9E9E22983E for ; Sat, 14 Jul 2018 03:16:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 85C4E6F401; Sat, 14 Jul 2018 03:15:33 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id D0A3B6F3FF; Sat, 14 Jul 2018 03:15:32 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jul 2018 20:15:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,350,1526367600"; d="scan'208";a="245169036" Received: from mint-dev.iind.intel.com ([10.223.25.164]) by fmsmga005.fm.intel.com with ESMTP; 13 Jul 2018 20:15:30 -0700 From: Ramalingam C To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, daniel@ffwll.ch, seanpaul@chromium.org, tomas.winkler@intel.com, alexander.usyskin@intel.com, uma.shankar@intel.com Subject: [PATCH v6 08/35] drm/i915: component master at i915 driver load Date: Sat, 14 Jul 2018 08:44:50 +0530 Message-Id: <1531538117-1606-9-git-send-email-ramalingam.c@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531538117-1606-1-git-send-email-ramalingam.c@intel.com> References: <1531538117-1606-1-git-send-email-ramalingam.c@intel.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: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP A generic component master is added to hold the i915 registration until all required kernel modules are up and active. This is achieved through following steps: - moving the i915 driver registration to the component master's bind call - all required kernel modules will add one component each to component_match of I915 component master. If no component is added to the I915 component master, due to CONFIG selection or HW limitation, component master's bind call will be triggered with no wait. Signed-off-by: Ramalingam C Suggested-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_drv.c | 87 +++++++++++++++++++++++++++++++++++------ drivers/gpu/drm/i915/i915_drv.h | 3 ++ include/drm/i915_component.h | 16 ++++++++ 3 files changed, 94 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 0db3c83cce29..598ab3afc131 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -39,12 +39,14 @@ #include #include #include +#include #include #include #include #include #include +#include #include "i915_drv.h" #include "i915_trace.h" @@ -1247,8 +1249,6 @@ static void i915_driver_register(struct drm_i915_private *dev_priv) if (IS_GEN5(dev_priv)) intel_gpu_ips_init(dev_priv); - intel_audio_init(dev_priv); - /* * Some ports require correctly set-up hpd registers for detection to * work properly (leading to ghost connected connector status), e.g. VGA @@ -1310,6 +1310,47 @@ static void i915_welcome_messages(struct drm_i915_private *dev_priv) DRM_INFO("DRM_I915_DEBUG_GEM enabled\n"); } +static void i915_driver_load_tail(struct drm_i915_private *dev_priv) +{ + i915_driver_register(dev_priv); + + intel_runtime_pm_enable(dev_priv); + + intel_init_ipc(dev_priv); + + intel_runtime_pm_put(dev_priv); + + i915_welcome_messages(dev_priv); +} + +static int i915_component_master_bind(struct device *dev) +{ + struct drm_i915_private *dev_priv = kdev_to_i915(dev); + int ret; + + ret = component_bind_all(dev, dev_priv->comp_master); + if (ret < 0) + return ret; + + i915_driver_load_tail(dev_priv); + + return 0; +} + +static void i915_component_master_unbind(struct device *dev) +{ + struct drm_i915_private *dev_priv = kdev_to_i915(dev); + + component_unbind_all(dev, dev_priv->comp_master); + + /* TO-DO: Whether I915 should be unloaded on any component unbind!? */ +} + +static const struct component_master_ops i915_component_master_ops = { + .bind = i915_component_master_bind, + .unbind = i915_component_master_unbind, +}; + /** * i915_driver_load - setup chip and create an initial config * @pdev: PCI device @@ -1341,12 +1382,25 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent) goto out_free; } + dev_priv->comp_master = kzalloc(sizeof(*dev_priv->comp_master), + GFP_KERNEL); + if (!dev_priv->comp_master) { + ret = -ENOMEM; + goto out_fini; + } + + component_match_alloc(dev_priv->drm.dev, &dev_priv->master_match); + if (!dev_priv->master_match) { + ret = -ENOMEM; + goto out_comp_master_clean; + } + dev_priv->drm.pdev = pdev; dev_priv->drm.dev_private = dev_priv; ret = pci_enable_device(pdev); if (ret) - goto out_fini; + goto out_comp_master_clean; pci_set_drvdata(pdev, &dev_priv->drm); /* @@ -1389,18 +1443,21 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent) if (ret < 0) goto out_cleanup_hw; - i915_driver_register(dev_priv); - - intel_runtime_pm_enable(dev_priv); - - intel_init_ipc(dev_priv); - - intel_runtime_pm_put(dev_priv); - - i915_welcome_messages(dev_priv); + ret = component_master_add_with_match(dev_priv->drm.dev, + &i915_component_master_ops, + dev_priv->master_match); + if (ret < 0) { + DRM_DEV_ERROR(&pdev->dev, "Master comp add failed %d\n", + ret); + goto out_cleanup_modeset; + } + intel_audio_init(dev_priv); + DRM_DEV_INFO(&pdev->dev, "I915 waits for Components (If any).\n"); return 0; +out_cleanup_modeset: + intel_modeset_cleanup(&dev_priv->drm); out_cleanup_hw: i915_driver_cleanup_hw(dev_priv); out_cleanup_mmio: @@ -1410,6 +1467,8 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent) i915_driver_cleanup_early(dev_priv); out_pci_disable: pci_disable_device(pdev); +out_comp_master_clean: + kfree(dev_priv->comp_master); out_fini: i915_load_error(dev_priv, "Device initialization failed (%d)\n", ret); drm_dev_fini(&dev_priv->drm); @@ -1428,6 +1487,10 @@ void i915_driver_unload(struct drm_device *dev) if (i915_gem_suspend(dev_priv)) DRM_ERROR("failed to idle hardware; continuing to unload!\n"); + component_master_del(dev_priv->drm.dev, + &i915_component_master_ops); + kfree(dev_priv->comp_master); + intel_display_power_get(dev_priv, POWER_DOMAIN_INIT); drm_atomic_helper_shutdown(dev); diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 09ab12458244..620f41e13dbe 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2119,6 +2119,9 @@ struct drm_i915_private { struct i915_pmu pmu; + struct i915_component_master *comp_master; + struct component_match *master_match; + /* * NOTE: This is the dri1/ums dungeon, don't add stuff here. Your patch * will be rejected. Instead look for a better place. diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h index 346b1f5cb180..52313bc227b2 100644 --- a/include/drm/i915_component.h +++ b/include/drm/i915_component.h @@ -121,4 +121,20 @@ struct i915_audio_component { const struct i915_audio_component_audio_ops *audio_ops; }; +/** + * struct i915_component_master - Used for communication between i915 + * and any other drivers for the services of different feature. + */ +struct i915_component_master { + /** + * @i915_kdev: Kdev of I915. Used from the client component for + * removing the reference to mei_cldev. + */ + struct device *i915_kdev; + + /* + * Add here the interface details between I915 and interested modules. + */ +}; + #endif /* _I915_COMPONENT_H_ */