From: José Roberto de Souza Date: Thu, 8 Nov 2018 00:16:46 +0000 (-0800) Subject: drm/i915: Move intel_init_ipc() call to i915_load_modeset_init() X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a8147d0cd49f959faf2dd01b8cc52f93ef0e71ce;p=openwrt%2Fstaging%2Fblogic.git 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 Cc: Ville Syrjälä Signed-off-by: José Roberto de Souza Reviewed-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20181108001647.11276-3-jose.souza@intel.com --- 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);