diff options
| author | Ville Syrjälä | 2016-10-25 17:58:02 +0200 |
|---|---|---|
| committer | Ville Syrjälä | 2016-10-31 15:56:32 +0100 |
| commit | b079bd17e301708da044b4ea114f44c4aa47160c (patch) | |
| tree | d2934653aadccbe07ec5e91ff842e43335d433ac /drivers/gpu/drm/i915/i915_drv.c | |
| parent | drm/i915: Initialize planes in a reasonable order (diff) | |
| download | kernel-qcow2-linux-b079bd17e301708da044b4ea114f44c4aa47160c.tar.gz kernel-qcow2-linux-b079bd17e301708da044b4ea114f44c4aa47160c.tar.xz kernel-qcow2-linux-b079bd17e301708da044b4ea114f44c4aa47160c.zip | |
drm/i915: Bail if plane/crtc init fails
Due to the plane->index not getting readjusted in drm_plane_cleanup(),
we can't continue initialization of some plane/crtc init fails.
Well, we sort of could I suppose if we left all initialized planes on
the list, but that would expose those planes to userspace as well.
But for crtcs the situation is even worse since we assume that
pipe==crtc index occasionally, so we can't really deal with a partially
initialize set of crtcs.
So seems safest to just abort the entire thing if anything goes wrong.
All the failure paths here are kmalloc()s anyway, so it seems unlikely
we'd get very far if these start failing.
v2: Add (enum plane) case to silence gcc
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1477411083-19255-4-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 839ce2ae38fa..6a99544c98d3 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -595,7 +595,9 @@ static int i915_load_modeset_init(struct drm_device *dev) /* Important: The output setup functions called by modeset_init need * working irqs for e.g. gmbus and dp aux transfers. */ - intel_modeset_init(dev); + ret = intel_modeset_init(dev); + if (ret) + goto cleanup_irq; intel_guc_init(dev); |