| From 4e26423e203774a1791ee523143d516fdfab7d5f Mon Sep 17 00:00:00 2001 |
| From: Damien Lespiau <damien.lespiau@intel.com> |
| Date: Thu, 8 Aug 2013 22:28:53 +0100 |
| Subject: drm/i915: Remove stale prototypes |
| |
| Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit a2367166fb200528d6fd43859e917e80ee034e16) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/i915_drv.h | 8 -------- |
| drivers/gpu/drm/i915/intel_drv.h | 2 -- |
| 2 files changed, 10 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h |
| index 7863c8ac867c..db5492382d7c 100644 |
| --- a/drivers/gpu/drm/i915/i915_drv.h |
| +++ b/drivers/gpu/drm/i915/i915_drv.h |
| @@ -1677,7 +1677,6 @@ extern void intel_pm_init(struct drm_device *dev); |
| extern void intel_uncore_sanitize(struct drm_device *dev); |
| extern void intel_uncore_early_sanitize(struct drm_device *dev); |
| extern void intel_uncore_init(struct drm_device *dev); |
| -extern void intel_uncore_reset(struct drm_device *dev); |
| extern void intel_uncore_clear_errors(struct drm_device *dev); |
| extern void intel_uncore_check_errors(struct drm_device *dev); |
| |
| @@ -1843,9 +1842,6 @@ static inline bool i915_terminally_wedged(struct i915_gpu_error *error) |
| |
| void i915_gem_reset(struct drm_device *dev); |
| void i915_gem_clflush_object(struct drm_i915_gem_object *obj); |
| -int __must_check i915_gem_object_set_domain(struct drm_i915_gem_object *obj, |
| - uint32_t read_domains, |
| - uint32_t write_domain); |
| int __must_check i915_gem_object_finish_gpu(struct drm_i915_gem_object *obj); |
| int __must_check i915_gem_init(struct drm_device *dev); |
| int __must_check i915_gem_init_hw(struct drm_device *dev); |
| @@ -2034,8 +2030,6 @@ void i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj); |
| void i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj); |
| |
| /* i915_gem_debug.c */ |
| -void i915_gem_dump_object(struct drm_i915_gem_object *obj, int len, |
| - const char *where, uint32_t mark); |
| #if WATCH_LISTS |
| int i915_verify_lists(struct drm_device *dev); |
| #else |
| @@ -2043,8 +2037,6 @@ int i915_verify_lists(struct drm_device *dev); |
| #endif |
| void i915_gem_object_check_coherency(struct drm_i915_gem_object *obj, |
| int handle); |
| -void i915_gem_dump_object(struct drm_i915_gem_object *obj, int len, |
| - const char *where, uint32_t mark); |
| |
| /* i915_debugfs.c */ |
| int 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, |
| extern void intel_release_load_detect_pipe(struct drm_connector *connector, |
| struct intel_load_detect_pipe *old); |
| |
| -extern void intelfb_restore(void); |
| extern void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green, |
| u16 blue, int regno); |
| extern void intel_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green, |
| u16 *blue, int regno); |
| -extern void intel_enable_clock_gating(struct drm_device *dev); |
| |
| extern int intel_pin_and_fence_fb_obj(struct drm_device *dev, |
| struct drm_i915_gem_object *obj, |
| -- |
| 1.8.5.rc3 |
| |
