diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2010-09-19 23:48:00 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-09-19 23:48:32 -0400 |
| commit | c88739b373e4930ed082a607cb78bf82616fd076 (patch) | |
| tree | 251d969aa816dab5a62e6b36208b189b37de6534 /drivers/gpu/drm/i915/intel_drv.h | |
| parent | 3211af1119174fbe8b676422b74870cdd51d7314 (diff) | |
| parent | 827e3457022d0bb0b1bb8a0eb88501876fe7dcf0 (diff) | |
Merge remote branch 'trond/bugfixes' into for-2.6.37
Without some client-side fixes, server testing is currently difficult.
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 0e92aa07b38..ad312ca6b3e 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -176,6 +176,16 @@ struct intel_crtc { #define enc_to_intel_encoder(x) container_of(x, struct intel_encoder, enc) #define to_intel_framebuffer(x) container_of(x, struct intel_framebuffer, base) +struct intel_unpin_work { + struct work_struct work; + struct drm_device *dev; + struct drm_gem_object *old_fb_obj; + struct drm_gem_object *pending_flip_obj; + struct drm_pending_vblank_event *event; + int pending; + bool enable_stall_check; +}; + struct i2c_adapter *intel_i2c_create(struct drm_device *dev, const u32 reg, const char *name); void intel_i2c_destroy(struct i2c_adapter *adapter); |