Merge branch 'drm-intel-fixes' into drm-intel-next

8bc47de3 · Keith Packard · 93dbb29b · 7c9017e5 · 8bc47de3 · 8bc47de3
Commit 8bc47de3 authored Jun 26, 2011 by Keith Packard
Expand all Show whitespace changes
Inline Side-by-side

Showing with 225 additions and 83 deletions

drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_drv.h +3 -0

drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_display.c +222 -83

No files found.
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -211,6 +211,9 @@ struct drm_i915_display_funcs {
 	void (*fdi_link_train)(struct drm_crtc *crtc);
 	void (*init_clock_gating)(struct drm_device *dev);
 	void (*init_pch_clock_gating)(struct drm_device *dev);
+	int (*queue_flip)(struct drm_device *dev, struct drm_crtc *crtc,
+			  struct drm_framebuffer *fb,
+			  struct drm_i915_gem_object *obj);
 	/* clock updates for mode set */
 	/* cursor updates */
 	/* render clock increase/decrease */

--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c