drm/i915: Release temporary load-detect state upon switching
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 19 Jan 2017 11:37:49 +0000 (11:37 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 19 Jan 2017 13:41:00 +0000 (13:41 +0000)
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: 0853695c3ba4 ("drm: Add reference counting to drm_atomic_state")
Signed-off-by: Chris 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.uk
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
drivers/gpu/drm/i915/intel_display.c

index bddadd97db8d3f027037e10f9cd80af5113781ce..ca3e7116438c650b93889ad44f1ab7b452b71481 100644 (file)
@@ -11276,6 +11276,7 @@ found:
        }
 
        old->restore_state = restore_state;
+       drm_atomic_state_put(state);
 
        /* let the connector get through one full cycle before testing */
        intel_wait_for_vblank(dev_priv, intel_crtc->pipe);