Dead code cleanups
Subsystems (2)
Procrastinating... at least a small consolation prize:
5 files changed, 11 insertions(+), 104 deletions(-)
Signature · 1 line
Damien
PATCH 1/7 drm/i915: Remove stale prototypes
--- drivers/gpu/drm/i915/i915_drv.h | 8 -------- drivers/gpu/drm/i915/intel_drv.h | 2 -- 2 files changed, 10 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -8
@@ -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);
drivers/gpu/drm/i915/intel_drv.h +0 -2
@@ -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,
Signature · 1 line
1.8.3.1
PATCH 2/7 drm/i915: Remove i915_gem_object_check_coherency()
In reply to Damien LespiauThis code was dead since:
commit 432e58edc9de1d9c3d6a7b444b3c455b8f209a7d
Author: Chris Wilson <[email protected]>
Date: Thu Nov 25 19:32:06 2010 +0000
drm/i915: Avoid allocation for execbuffer object list
so just put it to rest for good.
--- drivers/gpu/drm/i915/i915_drv.h | 3 -- drivers/gpu/drm/i915/i915_gem_debug.c | 69 ----------------------------------- 2 files changed, 72 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -3
@@ -201,7 +201,6 @@ struct intel_ddi_plls {#define DRIVER_MINOR 6#define DRIVER_PATCHLEVEL 0 -#define WATCH_COHERENCY 0#define WATCH_LISTS 0#define WATCH_GTT 0
@@ -2035,8 +2034,6 @@ int i915_verify_lists(struct drm_device *dev);#else #define i915_verify_lists (dev) 0#endif -void i915_gem_object_check_coherency (struct drm_i915_gem_object *obj, -int handle);/* i915_debugfs.c */ int i915_debugfs_init (struct drm_minor *minor);
drivers/gpu/drm/i915/i915_gem_debug.c +0 -69
72 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH 3/7 drm/i915: Fix #endif comment
In reply to Damien LespiauDid you say OCD?
--- drivers/gpu/drm/i915/i915_gem_debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem_debug.c +1 -1
@@ -115,4 +115,4 @@ i915_verify_lists(struct drm_device *dev) return warned = err; } -#endif /* WATCH_INACTIVE */ +#endif /* WATCH_LIST */
Signature · 1 line
1.8.3.1
PATCH 4/7 drm/i915: Make i915_hangcheck_elapsed() static
In reply to Damien Lespiau--- drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/i915_irq.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -1
@@ -1665,7 +1665,6 @@ extern void intel_console_resume(struct work_struct *work);/* i915_irq.c */ void i915_queue_hangcheck (struct drm_device *dev); -void i915_hangcheck_elapsed (unsigned long data);void i915_handle_error (struct drm_device *dev,bool wedged);extern void intel_irq_init (struct drm_device *dev);
drivers/gpu/drm/i915/i915_irq.c +1 -1
@@ -1869,7 +1869,7 @@ ring_stuck(struct intel_ring_buffer *ring, u32 acthd)* we kick the ring. If we see no progress on three subsequent calls * we assume chip is wedged and try to fix it by resetting the chip. */ -void i915_hangcheck_elapsed (unsigned long data) +static void i915_hangcheck_elapsed (unsigned long data) {struct drm_device *dev = (struct drm_device *)data;drm_i915_private_t *dev_priv = dev->dev_private;
Signature · 1 line
1.8.3.1
PATCH 5/7 drm/i915: Make intel_encoder_dpms() static
In reply to Damien LespiauAnd also fix a small typo in the intel_encoder_dpms() comment.
--- drivers/gpu/drm/i915/intel_display.c | 4 ++-- drivers/gpu/drm/i915/intel_drv.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -3889,10 +3889,10 @@ void intel_encoder_destroy(struct drm_encoder *encoder)kfree (intel_encoder); } -/* Simple dpms helper for encodres with just one connector, no cloning and only +/* Simple dpms helper for encoders with just one connector, no cloning and only * one kind of off state. It clamps all !ON modes to fully OFF and changes the * state of the entire output pipe. */ -void intel_encoder_dpms (struct intel_encoder *encoder,int mode) +static void intel_encoder_dpms (struct intel_encoder *encoder,int mode) {if (mode ==DRM_MODE_DPMS_ON ) { encoder->connectors_active = true;
drivers/gpu/drm/i915/intel_drv.h +0 -1
@@ -583,7 +583,6 @@ extern void intel_crtc_restore_mode(struct drm_crtc *crtc);extern void intel_crtc_load_lut (struct drm_crtc *crtc);extern void intel_crtc_update_dpms (struct drm_crtc *crtc);extern void intel_encoder_destroy (struct drm_encoder *encoder); -extern void intel_encoder_dpms (struct intel_encoder *encoder,int mode);extern void intel_connector_dpms (struct drm_connector *,int mode);extern bool intel_connector_get_hw_state (struct intel_connector *connector);extern void intel_modeset_check_state (struct drm_device *dev);
Signature · 1 line
1.8.3.1
PATCH 6/7 drm/i915: Remove intel_modeset_disable()
In reply to Damien LespiauCaught by the dead code police!
--- drivers/gpu/drm/i915/intel_display.c | 10 ---------- drivers/gpu/drm/i915/intel_drv.h | 1 - 2 files changed, 11 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -10
@@ -3871,16 +3871,6 @@ static void intel_crtc_disable(struct drm_crtc *crtc) } } -void intel_modeset_disable (struct drm_device *dev) -{ -struct drm_crtc *crtc; - -list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) { -if (crtc->enabled) -intel_crtc_disable (crtc); - } -} -void intel_encoder_destroy (struct drm_encoder *encoder) {struct intel_encoder *intel_encoder =to_intel_encoder (encoder);
drivers/gpu/drm/i915/intel_drv.h +0 -1
@@ -578,7 +578,6 @@ struct intel_set_config {extern int intel_set_mode (struct drm_crtc *crtc,struct drm_display_mode *mode,int x,int y,struct drm_framebuffer *old_fb); -extern void intel_modeset_disable (struct drm_device *dev);extern void intel_crtc_restore_mode (struct drm_crtc *crtc);extern void intel_crtc_load_lut (struct drm_crtc *crtc);extern void intel_crtc_update_dpms (struct drm_crtc *crtc);
Signature · 1 line
1.8.3.1
PATCH 7/7 drm/i915: Make intel_set_mode() static
In reply to Damien Lespiau--- drivers/gpu/drm/i915/intel_display.c | 10 +++++++--- drivers/gpu/drm/i915/intel_drv.h | 2 -- 2 files changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_display.c +7 -3
@@ -50,6 +50,10 @@ static void i9xx_crtc_clock_get(struct intel_crtc *crtc,static void ironlake_crtc_clock_get (struct intel_crtc *crtc,struct intel_crtc_config *pipe_config); +static int intel_set_mode (struct drm_crtc *crtc,struct drm_display_mode *mode, +int x,int y,struct drm_framebuffer *old_fb); + +typedef struct {int min, max; }intel_range_t ;
@@ -8734,9 +8738,9 @@ out:return ret; } -int intel_set_mode (struct drm_crtc *crtc, -struct drm_display_mode *mode, -int x,int y,struct drm_framebuffer *fb) +static int intel_set_mode (struct drm_crtc *crtc, +struct drm_display_mode *mode, +int x,int y,struct drm_framebuffer *fb) {int ret;
drivers/gpu/drm/i915/intel_drv.h +0 -2
@@ -576,8 +576,6 @@ struct intel_set_config {bool mode_changed; }; -extern int intel_set_mode (struct drm_crtc *crtc,struct drm_display_mode *mode, -int x,int y,struct drm_framebuffer *old_fb);extern void intel_crtc_restore_mode (struct drm_crtc *crtc);extern void intel_crtc_load_lut (struct drm_crtc *crtc);extern void intel_crtc_update_dpms (struct drm_crtc *crtc);
Signature · 1 line
1.8.3.1
Daniel Vetter
AppliedQuoted 3 lines · Damien Lespiau
Procrastinating... at least a small consolation prize:
5 files changed, 11 insertions(+), 104 deletions(-)
Queued for -next, thanks for the patches.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch