diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-04-20 13:16:04 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-04-20 13:16:04 +1000 |
| commit | 7fff400be6fbf64f10abca9939718aaf1d61c255 (patch) | |
| tree | 384118628f5c5aa2d74303cddd120de75308beea /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 0bcb1d844ac638a4c4280f697d5bfac9791e9a70 (diff) | |
| parent | b1f201980eb4a7a59277a13cf18acdbb46167ad5 (diff) | |
Merge branch 'drm-fbdev-cleanup' into drm-core-next
* drm-fbdev-cleanup:
drm/fb: remove drm_fb_helper_setcolreg
drm/kms/fb: use slow work mechanism for normal hotplug also.
drm/kms/fb: add polling support for when nothing is connected.
drm/kms/fb: provide a 1024x768 fbcon if no outputs found.
drm/kms/fb: separate fbdev connector list from core drm connectors
drm/kms/fb: move to using fb helper crtc grouping instead of core crtc list
drm/fb: fix fbdev object model + cleanup properly.
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/nouveau/nouveau_drv.h
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 790fef32afe..1258b1119d9 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -226,6 +226,8 @@ enum intel_pch { PCH_CPT, /* Cougarpoint PCH */ }; +struct intel_fbdev; + typedef struct drm_i915_private { struct drm_device *dev; @@ -638,6 +640,9 @@ typedef struct drm_i915_private { u8 max_delay; enum no_fbc_reason no_fbc_reason; + + /* list of fbdev register on this device */ + struct intel_fbdev *fbdev; } drm_i915_private_t; /** driver private structure attached to each drm_gem_object */ |