* [PATCH 0/3] A few cleanup patches
@ 2014-03-03 17:42 Damien Lespiau
2014-03-03 17:42 ` [PATCH 1/3] drm/i915: Make i915_gem_retire_requests_ring() static Damien Lespiau
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Damien Lespiau @ 2014-03-03 17:42 UTC (permalink / raw
To: intel-gfx
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,
--
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/3] drm/i915: Make i915_gem_retire_requests_ring() static
2014-03-03 17:42 [PATCH 0/3] A few cleanup patches Damien Lespiau
@ 2014-03-03 17:42 ` Damien Lespiau
2014-03-03 17:42 ` [PATCH 2/3] drm/i915: Remove unused to_gem_object() macro Damien Lespiau
2014-03-03 17:42 ` [PATCH 3/3] drm/i915: Remove stray intel_set_power_well() prototype Damien Lespiau
2 siblings, 0 replies; 5+ messages in thread
From: Damien Lespiau @ 2014-03-03 17:42 UTC (permalink / raw
To: intel-gfx
Its last usage outside of i915_gem.c was removed in:
commit 1f70999f9052f5a1b0ce1a55aff3808f2ec9fe42
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Jan 27 22:43:07 2014 +0000
drm/i915: Prevent recursion by retiring requests when the ring is full
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 1 -
drivers/gpu/drm/i915/i915_gem.c | 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 05cfcc1..f89c308 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -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)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 3618bb0..a3336ed 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -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;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] drm/i915: Remove unused to_gem_object() macro
2014-03-03 17:42 [PATCH 0/3] A few cleanup patches Damien Lespiau
2014-03-03 17:42 ` [PATCH 1/3] drm/i915: Make i915_gem_retire_requests_ring() static Damien Lespiau
@ 2014-03-03 17:42 ` Damien Lespiau
2014-03-03 17:42 ` [PATCH 3/3] drm/i915: Remove stray intel_set_power_well() prototype Damien Lespiau
2 siblings, 0 replies; 5+ messages in thread
From: Damien Lespiau @ 2014-03-03 17:42 UTC (permalink / raw
To: intel-gfx
That 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 <chris@chris-wilson.co.uk>
Date: Mon Aug 26 20:58:11 2013 +0100
drm/i915: Embed the ring->private within the struct intel_ring_buffer
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index f89c308..d6a07ec 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -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)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] drm/i915: Remove stray intel_set_power_well() prototype
2014-03-03 17:42 [PATCH 0/3] A few cleanup patches Damien Lespiau
2014-03-03 17:42 ` [PATCH 1/3] drm/i915: Make i915_gem_retire_requests_ring() static Damien Lespiau
2014-03-03 17:42 ` [PATCH 2/3] drm/i915: Remove unused to_gem_object() macro Damien Lespiau
@ 2014-03-03 17:42 ` Damien Lespiau
2014-03-05 18:07 ` Daniel Vetter
2 siblings, 1 reply; 5+ messages in thread
From: Damien Lespiau @ 2014-03-03 17:42 UTC (permalink / raw
To: intel-gfx
This function was removed by Imre's power well work.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
drivers/gpu/drm/i915/intel_drv.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index a4ffc02..a0cfc62 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -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);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 3/3] drm/i915: Remove stray intel_set_power_well() prototype
2014-03-03 17:42 ` [PATCH 3/3] drm/i915: Remove stray intel_set_power_well() prototype Damien Lespiau
@ 2014-03-05 18:07 ` Daniel Vetter
0 siblings, 0 replies; 5+ messages in thread
From: Daniel Vetter @ 2014-03-05 18:07 UTC (permalink / raw
To: Damien Lespiau; +Cc: intel-gfx
On Mon, Mar 03, 2014 at 05:42:38PM +0000, Damien Lespiau wrote:
> This function was removed by Imre's power well work.
>
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
First two merged, this one here seems to no longer be required.
-Daniel
> ---
> drivers/gpu/drm/i915/intel_drv.h | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index a4ffc02..a0cfc62 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -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);
> --
> 1.8.3.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-03-05 18:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-03 17:42 [PATCH 0/3] A few cleanup patches Damien Lespiau
2014-03-03 17:42 ` [PATCH 1/3] drm/i915: Make i915_gem_retire_requests_ring() static Damien Lespiau
2014-03-03 17:42 ` [PATCH 2/3] drm/i915: Remove unused to_gem_object() macro Damien Lespiau
2014-03-03 17:42 ` [PATCH 3/3] drm/i915: Remove stray intel_set_power_well() prototype Damien Lespiau
2014-03-05 18:07 ` Daniel Vetter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.