diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-08-12 08:50:28 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-08 05:23:52 -0400 |
commit | 5dcdbcb06badbdf2faa698bf3198e421a1e12840 (patch) | |
tree | 9233236a9593dfb8cf1d76485897caf953a29883 /drivers/gpu/drm/i915/intel_drv.h | |
parent | 106dadacbeeea92f61a2c32f3651ee31c1b34e31 (diff) |
drm/i915/overlay: Pass interruptible to switch_off()
During DPMS we currently do not want the overlay code to be
interruptible, so pass that information down and only take the
uninterrruptible paths.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 01ca494c6d87..44744537a0cf 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -287,9 +287,8 @@ extern void intel_finish_page_flip_plane(struct drm_device *dev, int plane); | |||
287 | 287 | ||
288 | extern void intel_setup_overlay(struct drm_device *dev); | 288 | extern void intel_setup_overlay(struct drm_device *dev); |
289 | extern void intel_cleanup_overlay(struct drm_device *dev); | 289 | extern void intel_cleanup_overlay(struct drm_device *dev); |
290 | extern int intel_overlay_switch_off(struct intel_overlay *overlay); | 290 | extern int intel_overlay_switch_off(struct intel_overlay *overlay, |
291 | extern int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay, | 291 | bool interruptible); |
292 | bool interruptible); | ||
293 | extern int intel_overlay_put_image(struct drm_device *dev, void *data, | 292 | extern int intel_overlay_put_image(struct drm_device *dev, void *data, |
294 | struct drm_file *file_priv); | 293 | struct drm_file *file_priv); |
295 | extern int intel_overlay_attrs(struct drm_device *dev, void *data, | 294 | extern int intel_overlay_attrs(struct drm_device *dev, void *data, |