diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-12-07 17:00:25 -0500 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2017-12-14 03:58:23 -0500 |
commit | 2b3a2e9f400acff4a4a9a2316e3e13b36b76b0e9 (patch) | |
tree | f82acc1131043fd358d625b738186c2bf47831d5 | |
parent | 2797c4a11f373b2545c2398ccb02e362ee66a142 (diff) |
drm/i915: Drop fb reference on load_detect_pipe failure path
When intel_modeset_setup_plane_state() fails drop the local framebuffer
reference before jumping to the error, otherwise we leak the framebuffer.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Fixes: edde361711ef ("drm/i915: Use atomic state to obtain load detection crtc, v3.")
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171207220025.22698-1-chris@chris-wilson.co.uk
(cherry picked from commit 3e72be177cf19ab3d62b3084d424dce7e71d847f)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index e8ccf89cb17b..ff9397030092 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -9944,11 +9944,10 @@ found: | |||
9944 | } | 9944 | } |
9945 | 9945 | ||
9946 | ret = intel_modeset_setup_plane_state(state, crtc, mode, fb, 0, 0); | 9946 | ret = intel_modeset_setup_plane_state(state, crtc, mode, fb, 0, 0); |
9947 | drm_framebuffer_put(fb); | ||
9947 | if (ret) | 9948 | if (ret) |
9948 | goto fail; | 9949 | goto fail; |
9949 | 9950 | ||
9950 | drm_framebuffer_put(fb); | ||
9951 | |||
9952 | ret = drm_atomic_set_mode_for_crtc(&crtc_state->base, mode); | 9951 | ret = drm_atomic_set_mode_for_crtc(&crtc_state->base, mode); |
9953 | if (ret) | 9952 | if (ret) |
9954 | goto fail; | 9953 | goto fail; |