[Intel-gfx] [PATCH 6/9] drm/i915: split intel_modeset_init() to pre/post irq install

[Jani Nikula]

Split inte_modeset_init() to parts before and after irq install, to
facilitate further cleanup. The error paths are a mess, otherwise no
functional changes.

Cc: Ville Syrjälä <ville.syrj...@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 17 +++++++++++++----
 drivers/gpu/drm/i915/display/intel_display.h |  1 +
 drivers/gpu/drm/i915/i915_drv.c              |  6 ++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index 69d6fe626a19..2cac6d61dba2 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -17854,11 +17854,9 @@ static void intel_mode_config_cleanup(struct 
drm_i915_private *i915)
        drm_mode_config_cleanup(&i915->drm);
 }
 
-int intel_modeset_init(struct drm_i915_private *i915)
+/* part #1: call before irq install */
+int intel_modeset_init_noirq(struct drm_i915_private *i915)
 {
-       struct drm_device *dev = &i915->drm;
-       enum pipe pipe;
-       struct intel_crtc *crtc;
        int ret;
 
        i915->modeset_wq = alloc_ordered_workqueue("i915_modeset", 0);
@@ -17883,6 +17881,17 @@ int intel_modeset_init(struct drm_i915_private *i915)
 
        intel_fbc_init(i915);
 
+       return 0;
+}
+
+/* part #2: call after irq install */
+int intel_modeset_init(struct drm_i915_private *i915)
+{
+       struct drm_device *dev = &i915->drm;
+       enum pipe pipe;
+       struct intel_crtc *crtc;
+       int ret;
+
        intel_init_pm(i915);
 
        intel_panel_sanitize_ssc(i915);
diff --git a/drivers/gpu/drm/i915/display/intel_display.h 
b/drivers/gpu/drm/i915/display/intel_display.h
index f92efbbec838..8f994244ccc7 100644
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -614,6 +614,7 @@ intel_format_info_is_yuv_semiplanar(const struct 
drm_format_info *info,
 
 /* modesetting */
 void intel_modeset_init_hw(struct drm_i915_private *i915);
+int intel_modeset_init_noirq(struct drm_i915_private *i915);
 int intel_modeset_init(struct drm_i915_private *i915);
 void intel_modeset_driver_remove(struct drm_i915_private *i915);
 void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915);
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 1243638506bc..905277490024 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -297,8 +297,14 @@ static int i915_driver_modeset_probe_noirq(struct 
drm_i915_private *i915)
 
        intel_csr_ucode_init(i915);
 
+       ret = intel_modeset_init_noirq(i915);
+       if (ret)
+               goto cleanup_vga_client;
+
        return 0;
 
+cleanup_vga_client:
+       intel_vga_unregister(i915);
 out:
        return ret;
 }
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx