drm/i915: re-add locking around hw state readout
authorJesse Barnes <jbarnes@virtuousgeek.org>
Fri, 21 Feb 2014 21:13:39 +0000 (13:13 -0800)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 5 Mar 2014 20:30:03 +0000 (21:30 +0100)
commit8b687df4c305d3fd6b619dade83f95c4b860c74b
tree5aa8dc544d52a7d620bfdaddc4c3fa0892bd75a1
parentef34ab894e54c97850296b5f8268004bf6788c74
drm/i915: re-add locking around hw state readout

To silence locking complaints.  This was a rebase failure on my part in

commit fa9fa083d0606cb323f6105c17702460ea0a6780
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Tue Feb 11 15:28:56 2014 -0800

    drm/i915: read out hw state earlier v2

Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c