]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Fix an overlay regression from 3f24835
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)
commit8abc83547d257c6baf5b3a00dd7ad674fa56c7ec
tree22ac64e9f3e5e7ec7044abafefa23e1b0ae14f63
parent46dffe3c32074909d568adadafb2942e1852d5bf
drm/i915: Fix an overlay regression from 3f24835

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