diff options
| author | Keith Packard <keithp@keithp.com> | 2011-06-26 19:12:00 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-26 19:12:00 -0700 |
| commit | 8bc47de33569a111092a48465eb26cd855117e27 (patch) | |
| tree | 458987145929e8bedc09c17a1122b6db7f14dcb2 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 93dbb29b471c80e09df8bfde9c661df074ec82cc (diff) | |
| parent | 7c9017e5b77118439952fe8dc22809bae4fae4b6 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 8a9fd917786..01affb63be2 100644 --- 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 */ |