aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2013-08-08 17:28:53 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-08-09 04:45:40 -0400
commita2367166fb200528d6fd43859e917e80ee034e16 (patch)
tree2fa5e9b4cf05ed87438fbe1b90d93b1d197db949
parent6d2b888569d366beb4be72cacfde41adee2c25e1 (diff)
drm/i915: Remove stale prototypes
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h8
-rw-r--r--drivers/gpu/drm/i915/intel_drv.h2
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 550ad171628c..036b01636f78 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1676,7 +1676,6 @@ extern void intel_pm_init(struct drm_device *dev);
1676extern void intel_uncore_sanitize(struct drm_device *dev); 1676extern void intel_uncore_sanitize(struct drm_device *dev);
1677extern void intel_uncore_early_sanitize(struct drm_device *dev); 1677extern void intel_uncore_early_sanitize(struct drm_device *dev);
1678extern void intel_uncore_init(struct drm_device *dev); 1678extern void intel_uncore_init(struct drm_device *dev);
1679extern void intel_uncore_reset(struct drm_device *dev);
1680extern void intel_uncore_clear_errors(struct drm_device *dev); 1679extern void intel_uncore_clear_errors(struct drm_device *dev);
1681extern void intel_uncore_check_errors(struct drm_device *dev); 1680extern void intel_uncore_check_errors(struct drm_device *dev);
1682 1681
@@ -1844,9 +1843,6 @@ static inline bool i915_terminally_wedged(struct i915_gpu_error *error)
1844 1843
1845void i915_gem_reset(struct drm_device *dev); 1844void i915_gem_reset(struct drm_device *dev);
1846void i915_gem_clflush_object(struct drm_i915_gem_object *obj); 1845void i915_gem_clflush_object(struct drm_i915_gem_object *obj);
1847int __must_check i915_gem_object_set_domain(struct drm_i915_gem_object *obj,
1848 uint32_t read_domains,
1849 uint32_t write_domain);
1850int __must_check i915_gem_object_finish_gpu(struct drm_i915_gem_object *obj); 1846int __must_check i915_gem_object_finish_gpu(struct drm_i915_gem_object *obj);
1851int __must_check i915_gem_init(struct drm_device *dev); 1847int __must_check i915_gem_init(struct drm_device *dev);
1852int __must_check i915_gem_init_hw(struct drm_device *dev); 1848int __must_check i915_gem_init_hw(struct drm_device *dev);
@@ -2035,8 +2031,6 @@ void i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj);
2035void i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj); 2031void i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj);
2036 2032
2037/* i915_gem_debug.c */ 2033/* i915_gem_debug.c */
2038void i915_gem_dump_object(struct drm_i915_gem_object *obj, int len,
2039 const char *where, uint32_t mark);
2040#if WATCH_LISTS 2034#if WATCH_LISTS
2041int i915_verify_lists(struct drm_device *dev); 2035int i915_verify_lists(struct drm_device *dev);
2042#else 2036#else
@@ -2044,8 +2038,6 @@ int i915_verify_lists(struct drm_device *dev);
2044#endif 2038#endif
2045void i915_gem_object_check_coherency(struct drm_i915_gem_object *obj, 2039void i915_gem_object_check_coherency(struct drm_i915_gem_object *obj,
2046 int handle); 2040 int handle);
2047void i915_gem_dump_object(struct drm_i915_gem_object *obj, int len,
2048 const char *where, uint32_t mark);
2049 2041
2050/* i915_debugfs.c */ 2042/* i915_debugfs.c */
2051int i915_debugfs_init(struct drm_minor *minor); 2043int i915_debugfs_init(struct drm_minor *minor);
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index caf8b8dfe17a..d516c63fc94d 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -649,12 +649,10 @@ extern bool intel_get_load_detect_pipe(struct drm_connector *connector,
649extern void intel_release_load_detect_pipe(struct drm_connector *connector, 649extern void intel_release_load_detect_pipe(struct drm_connector *connector,
650 struct intel_load_detect_pipe *old); 650 struct intel_load_detect_pipe *old);
651 651
652extern void intelfb_restore(void);
653extern void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green, 652extern void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
654 u16 blue, int regno); 653 u16 blue, int regno);
655extern void intel_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green, 654extern void intel_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,
656 u16 *blue, int regno); 655 u16 *blue, int regno);
657extern void intel_enable_clock_gating(struct drm_device *dev);
658 656
659extern int intel_pin_and_fence_fb_obj(struct drm_device *dev, 657extern int intel_pin_and_fence_fb_obj(struct drm_device *dev,
660 struct drm_i915_gem_object *obj, 658 struct drm_i915_gem_object *obj,