diff options
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index eddabf68e97a..ce7914c4c044 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -262,6 +262,7 @@ enum intel_pch { | |||
262 | }; | 262 | }; |
263 | 263 | ||
264 | #define QUIRK_PIPEA_FORCE (1<<0) | 264 | #define QUIRK_PIPEA_FORCE (1<<0) |
265 | #define QUIRK_LVDS_SSC_DISABLE (1<<1) | ||
265 | 266 | ||
266 | struct intel_fbdev; | 267 | struct intel_fbdev; |
267 | 268 | ||
@@ -997,8 +998,6 @@ extern unsigned int i915_enable_fbc; | |||
997 | 998 | ||
998 | extern int i915_suspend(struct drm_device *dev, pm_message_t state); | 999 | extern int i915_suspend(struct drm_device *dev, pm_message_t state); |
999 | extern int i915_resume(struct drm_device *dev); | 1000 | extern int i915_resume(struct drm_device *dev); |
1000 | extern void i915_save_display(struct drm_device *dev); | ||
1001 | extern void i915_restore_display(struct drm_device *dev); | ||
1002 | extern int i915_master_create(struct drm_device *dev, struct drm_master *master); | 1001 | extern int i915_master_create(struct drm_device *dev, struct drm_master *master); |
1003 | extern void i915_master_destroy(struct drm_device *dev, struct drm_master *master); | 1002 | extern void i915_master_destroy(struct drm_device *dev, struct drm_master *master); |
1004 | 1003 | ||
@@ -1033,33 +1032,12 @@ extern int i915_irq_emit(struct drm_device *dev, void *data, | |||
1033 | extern int i915_irq_wait(struct drm_device *dev, void *data, | 1032 | extern int i915_irq_wait(struct drm_device *dev, void *data, |
1034 | struct drm_file *file_priv); | 1033 | struct drm_file *file_priv); |
1035 | 1034 | ||
1036 | extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS); | 1035 | extern void intel_irq_init(struct drm_device *dev); |
1037 | extern void i915_driver_irq_preinstall(struct drm_device * dev); | ||
1038 | extern int i915_driver_irq_postinstall(struct drm_device *dev); | ||
1039 | extern void i915_driver_irq_uninstall(struct drm_device * dev); | ||
1040 | |||
1041 | extern irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS); | ||
1042 | extern void ironlake_irq_preinstall(struct drm_device *dev); | ||
1043 | extern int ironlake_irq_postinstall(struct drm_device *dev); | ||
1044 | extern void ironlake_irq_uninstall(struct drm_device *dev); | ||
1045 | |||
1046 | extern irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS); | ||
1047 | extern void ivybridge_irq_preinstall(struct drm_device *dev); | ||
1048 | extern int ivybridge_irq_postinstall(struct drm_device *dev); | ||
1049 | extern void ivybridge_irq_uninstall(struct drm_device *dev); | ||
1050 | 1036 | ||
1051 | extern int i915_vblank_pipe_set(struct drm_device *dev, void *data, | 1037 | extern int i915_vblank_pipe_set(struct drm_device *dev, void *data, |
1052 | struct drm_file *file_priv); | 1038 | struct drm_file *file_priv); |
1053 | extern int i915_vblank_pipe_get(struct drm_device *dev, void *data, | 1039 | extern int i915_vblank_pipe_get(struct drm_device *dev, void *data, |
1054 | struct drm_file *file_priv); | 1040 | struct drm_file *file_priv); |
1055 | extern int i915_enable_vblank(struct drm_device *dev, int crtc); | ||
1056 | extern void i915_disable_vblank(struct drm_device *dev, int crtc); | ||
1057 | extern int ironlake_enable_vblank(struct drm_device *dev, int crtc); | ||
1058 | extern void ironlake_disable_vblank(struct drm_device *dev, int crtc); | ||
1059 | extern int ivybridge_enable_vblank(struct drm_device *dev, int crtc); | ||
1060 | extern void ivybridge_disable_vblank(struct drm_device *dev, int crtc); | ||
1061 | extern u32 i915_get_vblank_counter(struct drm_device *dev, int crtc); | ||
1062 | extern u32 gm45_get_vblank_counter(struct drm_device *dev, int crtc); | ||
1063 | extern int i915_vblank_swap(struct drm_device *dev, void *data, | 1041 | extern int i915_vblank_swap(struct drm_device *dev, void *data, |
1064 | struct drm_file *file_priv); | 1042 | struct drm_file *file_priv); |
1065 | 1043 | ||
@@ -1070,13 +1048,6 @@ void | |||
1070 | i915_disable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask); | 1048 | i915_disable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask); |
1071 | 1049 | ||
1072 | void intel_enable_asle (struct drm_device *dev); | 1050 | void intel_enable_asle (struct drm_device *dev); |
1073 | int i915_get_vblank_timestamp(struct drm_device *dev, int crtc, | ||
1074 | int *max_error, | ||
1075 | struct timeval *vblank_time, | ||
1076 | unsigned flags); | ||
1077 | |||
1078 | int i915_get_crtc_scanoutpos(struct drm_device *dev, int pipe, | ||
1079 | int *vpos, int *hpos); | ||
1080 | 1051 | ||
1081 | #ifdef CONFIG_DEBUG_FS | 1052 | #ifdef CONFIG_DEBUG_FS |
1082 | extern void i915_destroy_error_state(struct drm_device *dev); | 1053 | extern void i915_destroy_error_state(struct drm_device *dev); |
@@ -1224,7 +1195,9 @@ void i915_gem_free_all_phys_object(struct drm_device *dev); | |||
1224 | void i915_gem_release(struct drm_device *dev, struct drm_file *file); | 1195 | void i915_gem_release(struct drm_device *dev, struct drm_file *file); |
1225 | 1196 | ||
1226 | uint32_t | 1197 | uint32_t |
1227 | i915_gem_get_unfenced_gtt_alignment(struct drm_i915_gem_object *obj); | 1198 | i915_gem_get_unfenced_gtt_alignment(struct drm_device *dev, |
1199 | uint32_t size, | ||
1200 | int tiling_mode); | ||
1228 | 1201 | ||
1229 | /* i915_gem_gtt.c */ | 1202 | /* i915_gem_gtt.c */ |
1230 | void i915_gem_restore_gtt_mappings(struct drm_device *dev); | 1203 | void i915_gem_restore_gtt_mappings(struct drm_device *dev); |