Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7abbd11f authored by Chris Wilson's avatar Chris Wilson
Browse files

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.uk


Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
parent 481a6f7d

drivers/gpu/drm/i915/intel_display.c

+1 −0
Original line number Diff line number Diff line
@@ -11276,6 +11276,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector, 
	}



	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);