Commit a38a7bd1 authored by Chris Wilson's avatar Chris Wilson Committed by Jani Nikula

drm/i915: Release temporary load-detect state upon switching

After we call drm_atomic_commit() on the load-detect state, we can free
our local reference. Upon restore, we only apply and free the previous state.

Fixes: 0853695c ("drm: Add reference counting to drm_atomic_state")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: <drm-intel-fixes@lists.freedesktop.org> # v4.10-rc1+
Link: http://patchwork.freedesktop.org/patch/msgid/20170119113749.2517-1-chris@chris-wilson.co.ukReviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
(cherry picked from commit 7abbd11f)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 27892bbd
...@@ -11246,6 +11246,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector, ...@@ -11246,6 +11246,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,
} }
old->restore_state = restore_state; old->restore_state = restore_state;
drm_atomic_state_put(state);
/* let the connector get through one full cycle before testing */ /* let the connector get through one full cycle before testing */
intel_wait_for_vblank(dev_priv, intel_crtc->pipe); intel_wait_for_vblank(dev_priv, intel_crtc->pipe);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment