diff options
author | José Roberto de Souza <jose.souza@intel.com> | 2018-11-07 16:16:46 -0800 |
---|---|---|
committer | José Roberto de Souza <jose.souza@intel.com> | 2018-11-08 17:09:18 -0800 |
commit | a8147d0cd49f959faf2dd01b8cc52f93ef0e71ce (patch) | |
tree | c252463a2f39b9c7d41f6bf30aef0b0369271f48 /drivers/gpu/drm/i915 | |
parent | acde44b5008671b06a8a1c7c6443b9f54ef4be03 (diff) | |
download | linux-a8147d0cd49f959faf2dd01b8cc52f93ef0e71ce.tar.bz2 |
drm/i915: Move intel_init_ipc() call to i915_load_modeset_init()
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
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 09208c73ca04..44903ce1b82d 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -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); |