drm/i915: Fix an overlay regression from 7e7d76c
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 13 Sep 2010 13:19:16 +0000 (14:19 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 13 Sep 2010 13:32:18 +0000 (14:32 +0100)
commitf7abfe8b281991c66406c42c1a6c6c9ee0daa0ff
tree22ac64e9f3e5e7ec7044abafefa23e1b0ae14f63
parent6b383a7f6378f193c30200435d8170f95916b5f0
drm/i915: Fix an overlay regression from 7e7d76c

When separating out the prepare/commit into its own separate functions
we overlooked that the intel_crtc->dpms_mode was being used elsewhere to
check on the actual status of the pipe.

Track that bit of logic separately from the actual dpms mode, so there
is no confusion should we be able to handle multiple dpms modes, nor
any semantic conflict between prepare/commit and dpms.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_overlay.c