[4/9] drm/i915: Remove unused head member in request struct

Submitted by Rodrigo Vivi on April 15, 2015, 11:52 p.m.

Details

Message ID 1429141956-2338-5-git-send-email-rodrigo.vivi@intel.com
State New
Headers show

Not browsing as part of any series.

Commit Message

Rodrigo Vivi April 15, 2015, 11:52 p.m.
From: Mika Kuoppala <mika.kuoppala@linux.intel.com>

commit 939fd762083f988be271da8c96398178daf9baf0
Author: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Date:   Thu Jan 30 19:04:44 2014 +0200

    drm/i915: Get rid of acthd based guilty batch search

Failed to cleanup properly as it made the head obsolete.

Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h | 3 ---
 drivers/gpu/drm/i915/i915_gem.c | 3 ---
 2 files changed, 6 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 822f259..1a5e976 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2050,9 +2050,6 @@  struct drm_i915_gem_request {
 	/** GEM sequence number associated with this request. */
 	uint32_t seqno;
 
-	/** Position in the ringbuffer of the start of the request */
-	u32 head;
-
 	/**
 	 * Position in the ringbuffer of the start of the postfix.
 	 * This is required to calculate the maximum available ringbuffer
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index de6717e..11dfd49 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2323,7 +2323,6 @@  int __i915_add_request(struct intel_engine_cs *ring,
 	struct drm_i915_private *dev_priv = ring->dev->dev_private;
 	struct drm_i915_gem_request *request;
 	struct intel_ringbuffer *ringbuf;
-	u32 request_start;
 	int ret;
 
 	request = ring->outstanding_lazy_request;
@@ -2335,7 +2334,6 @@  int __i915_add_request(struct intel_engine_cs *ring,
 	} else
 		ringbuf = ring->buffer;
 
-	request_start = intel_ring_get_tail(ringbuf);
 	/*
 	 * Emit any outstanding flushes - execbuf can fail to emit the flush
 	 * after having emitted the batchbuffer command. Hence we need to fix
@@ -2370,7 +2368,6 @@  int __i915_add_request(struct intel_engine_cs *ring,
 			return ret;
 	}
 
-	request->head = request_start;
 	request->tail = intel_ring_get_tail(ringbuf);
 
 	/* Whilst this request exists, batch_obj will be on the

Comments

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>


On Wed, 2015-04-15 at 16:52 -0700, Rodrigo Vivi wrote:
> From: Mika Kuoppala <mika.kuoppala@linux.intel.com>

> 

> commit 939fd762083f988be271da8c96398178daf9baf0

> Author: Mika Kuoppala <mika.kuoppala@linux.intel.com>

> Date:   Thu Jan 30 19:04:44 2014 +0200

> 

>     drm/i915: Get rid of acthd based guilty batch search

> 

> Failed to cleanup properly as it made the head obsolete.

> 

> Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>

> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

> ---

>  drivers/gpu/drm/i915/i915_drv.h | 3 ---

>  drivers/gpu/drm/i915/i915_gem.c | 3 ---

>  2 files changed, 6 deletions(-)

> 

> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h

> index 822f259..1a5e976 100644

> --- a/drivers/gpu/drm/i915/i915_drv.h

> +++ b/drivers/gpu/drm/i915/i915_drv.h

> @@ -2050,9 +2050,6 @@ struct drm_i915_gem_request {

>  	/** GEM sequence number associated with this request. */

>  	uint32_t seqno;

>  

> -	/** Position in the ringbuffer of the start of the request */

> -	u32 head;

> -

>  	/**

>  	 * Position in the ringbuffer of the start of the postfix.

>  	 * This is required to calculate the maximum available ringbuffer

> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c

> index de6717e..11dfd49 100644

> --- a/drivers/gpu/drm/i915/i915_gem.c

> +++ b/drivers/gpu/drm/i915/i915_gem.c

> @@ -2323,7 +2323,6 @@ int __i915_add_request(struct intel_engine_cs *ring,

>  	struct drm_i915_private *dev_priv = ring->dev->dev_private;

>  	struct drm_i915_gem_request *request;

>  	struct intel_ringbuffer *ringbuf;

> -	u32 request_start;

>  	int ret;

>  

>  	request = ring->outstanding_lazy_request;

> @@ -2335,7 +2334,6 @@ int __i915_add_request(struct intel_engine_cs *ring,

>  	} else

>  		ringbuf = ring->buffer;

>  

> -	request_start = intel_ring_get_tail(ringbuf);

>  	/*

>  	 * Emit any outstanding flushes - execbuf can fail to emit the flush

>  	 * after having emitted the batchbuffer command. Hence we need to fix

> @@ -2370,7 +2368,6 @@ int __i915_add_request(struct intel_engine_cs *ring,

>  			return ret;

>  	}

>  

> -	request->head = request_start;

>  	request->tail = intel_ring_get_tail(ringbuf);

>  

>  	/* Whilst this request exists, batch_obj will be on the
On Wed, Apr 15, 2015 at 11:59:13PM +0000, Vivi, Rodrigo wrote:
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Nak. Head isn't unused now.
-Chris