drm/i915: Avoid drm_atomic_state_put(NULL) in intel_display_resume
authorChris Wilson <chris@chris-wilson.co.uk>
Sun, 15 Jan 2017 12:58:25 +0000 (12:58 +0000)
committerJani Nikula <jani.nikula@intel.com>
Wed, 25 Jan 2017 10:41:00 +0000 (12:41 +0200)
commitb78671591a10218ab18bbea120fd05df7a002e88
tree3dc495544fa4c5080ff973e47c55fd858896024c
parent3bfdfdcbce2796ce75bf2d85fd8471858d702e5d
drm/i915: Avoid drm_atomic_state_put(NULL) in intel_display_resume

intel_display_resume() may be called without an atomic state to restore,
i.e. dev_priv->modeset_reset_restore state is NULL. One such case is
following a lid open/close event and the forced modeset in
intel_lid_notify().

Reported-by: Stefan Seyfried <stefan.seyfried@googlemail.com>
Tested-by: Stefan Seyfried <stefan.seyfried@googlemail.com>
Fixes: 0853695c3ba4 ("drm: Add reference counting to drm_atomic_state")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: <drm-intel-fixes@lists.freedesktop.org> # v4.10-rc1+
Link: http://patchwork.freedesktop.org/patch/msgid/20170115125825.18597-1-chris@chris-wilson.co.uk
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
(cherry picked from commit 3c5e37f169cb67cbd03c6116fbc93e0805815d29)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c