diff options
author | Dave Airlie <airlied@redhat.com> | 2010-04-19 23:16:04 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-04-19 23:16:04 -0400 |
commit | 7fff400be6fbf64f10abca9939718aaf1d61c255 (patch) | |
tree | 384118628f5c5aa2d74303cddd120de75308beea /drivers/gpu/drm/i915/intel_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/intel_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 1ee4717f431f..3230e8d2ea43 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -206,9 +206,6 @@ extern void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder, | |||
206 | extern struct drm_connector* intel_sdvo_find(struct drm_device *dev, int sdvoB); | 206 | extern struct drm_connector* intel_sdvo_find(struct drm_device *dev, int sdvoB); |
207 | extern int intel_sdvo_supports_hotplug(struct drm_connector *connector); | 207 | extern int intel_sdvo_supports_hotplug(struct drm_connector *connector); |
208 | extern void intel_sdvo_set_hotplug(struct drm_connector *connector, int enable); | 208 | extern void intel_sdvo_set_hotplug(struct drm_connector *connector, int enable); |
209 | extern int intelfb_probe(struct drm_device *dev); | ||
210 | extern int intelfb_remove(struct drm_device *dev, struct drm_framebuffer *fb); | ||
211 | extern int intelfb_resize(struct drm_device *dev, struct drm_crtc *crtc); | ||
212 | extern void intelfb_restore(void); | 209 | extern void intelfb_restore(void); |
213 | extern void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green, | 210 | extern void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green, |
214 | u16 blue, int regno); | 211 | u16 blue, int regno); |
@@ -218,10 +215,12 @@ extern void intel_init_clock_gating(struct drm_device *dev); | |||
218 | extern void ironlake_enable_drps(struct drm_device *dev); | 215 | extern void ironlake_enable_drps(struct drm_device *dev); |
219 | extern void ironlake_disable_drps(struct drm_device *dev); | 216 | extern void ironlake_disable_drps(struct drm_device *dev); |
220 | 217 | ||
221 | extern int intel_framebuffer_create(struct drm_device *dev, | 218 | extern int intel_framebuffer_init(struct drm_device *dev, |
222 | struct drm_mode_fb_cmd *mode_cmd, | 219 | struct intel_framebuffer *ifb, |
223 | struct drm_framebuffer **fb, | 220 | struct drm_mode_fb_cmd *mode_cmd, |
224 | struct drm_gem_object *obj); | 221 | struct drm_gem_object *obj); |
222 | extern int intel_fbdev_init(struct drm_device *dev); | ||
223 | extern void intel_fbdev_fini(struct drm_device *dev); | ||
225 | 224 | ||
226 | extern void intel_prepare_page_flip(struct drm_device *dev, int plane); | 225 | extern void intel_prepare_page_flip(struct drm_device *dev, int plane); |
227 | extern void intel_finish_page_flip(struct drm_device *dev, int pipe); | 226 | extern void intel_finish_page_flip(struct drm_device *dev, int pipe); |
@@ -235,4 +234,6 @@ extern int intel_overlay_put_image(struct drm_device *dev, void *data, | |||
235 | struct drm_file *file_priv); | 234 | struct drm_file *file_priv); |
236 | extern int intel_overlay_attrs(struct drm_device *dev, void *data, | 235 | extern int intel_overlay_attrs(struct drm_device *dev, void *data, |
237 | struct drm_file *file_priv); | 236 | struct drm_file *file_priv); |
237 | |||
238 | void intelfb_hotplug(struct drm_device *dev, bool polled); | ||
238 | #endif /* __INTEL_DRV_H__ */ | 239 | #endif /* __INTEL_DRV_H__ */ |