diff options
| author |   Jani Nikula <jani.nikula@intel.com> | 2020-02-24 14:08:28 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2020-02-26 10:37:13 +0200 |
| commit | 80f286a552c6cc554199a7d14b76836cffabd451 (patch) | |
| tree | 22b257ef39a3790b5ea0f0feb97e36569a7d4eb2 /drivers/gpu/drm/i915/i915_drv.c | |
| parent | drm/i915: stop assigning drm->dev_private pointer (diff) | |
| download | linux-dev-80f286a552c6cc554199a7d14b76836cffabd451.tar.xz linux-dev-80f286a552c6cc554199a7d14b76836cffabd451.zip | |
drm/i915: split intel_modeset_init() to pre/post irq install
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.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200224120828.22105-1-jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 0c6902884db0..a87b28ee2d90 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -238,8 +238,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; } |