A few cleanup patches
Subsystems (2)
cover A few cleanup patches
I have a script around that catches a few things otherwise hard to find (because you'd need analysis beyond a single compilation unit). The last run returned 3 hits.
HTH,
Signature · 14 lines
Damien Damien Lespiau (3): drm/i915: Make i915_gem_retire_requests_ring() static drm/i915: Remove unused to_gem_object() macro drm/i915: Remove stray intel_set_power_well() prototype drivers/gpu/drm/i915/i915_drv.h | 2 -- drivers/gpu/drm/i915/i915_gem.c | 3 ++- drivers/gpu/drm/i915/intel_drv.h | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) -- 1.8.3.1
PATCH 1/3 drm/i915: Make i915_gem_retire_requests_ring() static
Its last usage outside of i915_gem.c was removed in:
commit 1f70999f9052f5a1b0ce1a55aff3808f2ec9fe42
Author: Chris Wilson <[email protected]>
Date: Mon Jan 27 22:43:07 2014 +0000
drm/i915: Prevent recursion by retiring requests when the ring is full
--- drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/i915_gem.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -1
@@ -2164,7 +2164,6 @@ i915_gem_object_unpin_fence(struct drm_i915_gem_object *obj) }bool i915_gem_retire_requests (struct drm_device *dev); -void i915_gem_retire_requests_ring (struct intel_ring_buffer *ring);int __must_check i915_gem_check_wedge (struct i915_gpu_error *error,bool interruptible);static inline bool i915_reset_in_progress (struct i915_gpu_error *error)
drivers/gpu/drm/i915/i915_gem.c +2 -1
@@ -61,6 +61,7 @@ static unsigned long i915_gem_inactive_scan(struct shrinker *shrinker,static unsigned long i915_gem_purge (struct drm_i915_private *dev_priv,long target);static unsigned long i915_gem_shrink_all (struct drm_i915_private *dev_priv);static void i915_gem_object_truncate (struct drm_i915_gem_object *obj); +static void i915_gem_retire_requests_ring (struct intel_ring_buffer *ring);static bool cpu_cache_is_coherent (struct drm_device *dev,enum i915_cache_level level)
@@ -2417,7 +2418,7 @@ void i915_gem_reset(struct drm_device *dev)/** * This function clears the request list as sequence numbers are passed. */ -void +static void i915_gem_retire_requests_ring (struct intel_ring_buffer *ring) {uint32_t seqno;
Signature · 1 line
1.8.3.1
PATCH 2/3 drm/i915: Remove unused to_gem_object() macro
In reply to Damien LespiauThat macro was only ever used to convert ring->private into a gem object (hence the forceful cast). ring->private doesn't even exist anymore as it was transmogrified by Chris in:
commit 0d1aacac36530fce058d7a0db3da7befd5765417
Author: Chris Wilson <[email protected]>
Date: Mon Aug 26 20:58:11 2013 +0100
drm/i915: Embed the ring->private within the struct intel_ring_buffer
--- drivers/gpu/drm/i915/i915_drv.h | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +0 -1
@@ -1745,7 +1745,6 @@ struct drm_i915_gem_object {/** for phy allocated objects */ struct drm_i915_gem_phys_object *phys_obj; }; -#define to_gem_object (obj) (&((struct drm_i915_gem_object *)(obj))->base)#define to_intel_bo (x) container_of(x, struct drm_i915_gem_object, base)
Signature · 1 line
1.8.3.1
PATCH 3/3 drm/i915: Remove stray intel_set_power_well() prototype
In reply to Damien LespiauThis function was removed by Imre's power well work.
--- drivers/gpu/drm/i915/intel_drv.h | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/i915/intel_drv.h +0 -1
@@ -882,7 +882,6 @@ void intel_display_power_get(struct drm_device *dev,void intel_display_power_put (struct drm_device *dev,enum intel_display_power_domain domain);void intel_power_domains_init_hw (struct drm_device *dev); -void intel_set_power_well (struct drm_device *dev,bool enable);void intel_enable_gt_powersave (struct drm_device *dev);void intel_disable_gt_powersave (struct drm_device *dev);void ironlake_teardown_rc6 (struct drm_device *dev);
Signature · 1 line
1.8.3.1
Re: [PATCH 3/3] drm/i915: Remove stray intel_set_power_well() prototype
Quoted 3 lines · Damien Lespiau
This function was removed by Imre's power well work.
Signed-off-by Damien Lespiau <[email protected]>
First two merged, this one here seems to no longer be required. -Daniel
Quoted 23 lines
--- drivers/gpu/drm/i915/intel_drv.h | 1 - 1 file changed, 1 deletion(-)drivers/gpu/drm/i915/intel_drv.h +0
-1@@ -882,7 +882,6 @@ void intel_display_power_get(struct drm_device *dev,void intel_display_power_put (struct drm_device *dev,enum intel_display_power_domain domain);void intel_power_domains_init_hw (struct drm_device *dev); -void intel_set_power_well (struct drm_device *dev,bool enable);void intel_enable_gt_powersave (struct drm_device *dev);void intel_disable_gt_powersave (struct drm_device *dev);void ironlake_teardown_rc6 (struct drm_device *dev);Signature · 6 lines
1.8.3.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch