]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
drm/i915: Move intel_init_ipc() call to i915_load_modeset_init()
authorJosé Roberto de Souza <jose.souza@intel.com>
Thu, 8 Nov 2018 00:16:46 +0000 (16:16 -0800)
committerJosé Roberto de Souza <jose.souza@intel.com>
Fri, 9 Nov 2018 01:09:18 +0000 (17:09 -0800)
IPC is a display feature, so i915_load_modeset_init() is the right
place to initialize it.

Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181108001647.11276-3-jose.souza@intel.com
drivers/gpu/drm/i915/i915_drv.c

index 09208c73ca04145d28a1cf62254f36e6a29407a6..44903ce1b82df02620748bc1f93f64be074b3cd3 100644 (file)
@@ -706,6 +706,8 @@ static int i915_load_modeset_init(struct drm_device *dev)
        /* Only enable hotplug handling once the fbdev is fully set up. */
        intel_hpd_init(dev_priv);
 
+       intel_init_ipc(dev_priv);
+
        return 0;
 
 cleanup_gem:
@@ -1725,8 +1727,6 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        i915_driver_register(dev_priv);
 
-       intel_init_ipc(dev_priv);
-
        enable_rpm_wakeref_asserts(dev_priv);
 
        i915_welcome_messages(dev_priv);