All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dave Gordon <david.s.gordon@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 1/5] drm/i915: s/init()/init_hw()/ in intel_engine_cs
Date: Thu, 27 Nov 2014 14:36:19 +0000	[thread overview]
Message-ID: <547736E3.20406@intel.com> (raw)
In-Reply-To: <1416439988-10979-1-git-send-email-daniel.vetter@ffwll.ch>

On 19/11/14 23:33, Daniel Vetter wrote:
> This is (mostly, some exceptions that need fixing) the hw setup
> function which starts the ring. And not the function which allocates
> all the resources.
> 
> Make this clear by giving it a better name.
> 
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Reviewed-by: Dave Gordon <david.s.gordon@intel.com>

> ---
>  drivers/gpu/drm/i915/intel_lrc.c        | 14 +++++++-------
>  drivers/gpu/drm/i915/intel_ringbuffer.c | 12 ++++++------
>  drivers/gpu/drm/i915/intel_ringbuffer.h |  2 +-
>  3 files changed, 14 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
> index e588376227ea..5e14316c80d0 100644
> --- a/drivers/gpu/drm/i915/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/intel_lrc.c
> @@ -1389,8 +1389,8 @@ static int logical_ring_init(struct drm_device *dev, struct intel_engine_cs *rin
>  	if (ret)
>  		return ret;
>  
> -	if (ring->init) {
> -		ret = ring->init(ring);
> +	if (ring->init_hw) {
> +		ret = ring->init_hw(ring);
>  		if (ret)
>  			return ret;
>  	}
> @@ -1415,7 +1415,7 @@ static int logical_render_ring_init(struct drm_device *dev)
>  	if (HAS_L3_DPF(dev))
>  		ring->irq_keep_mask |= GT_RENDER_L3_PARITY_ERROR_INTERRUPT;
>  
> -	ring->init = gen8_init_render_ring;
> +	ring->init_hw = gen8_init_render_ring;
>  	ring->init_context = intel_logical_ring_workarounds_emit;
>  	ring->cleanup = intel_fini_pipe_control;
>  	ring->get_seqno = gen8_get_seqno;
> @@ -1442,7 +1442,7 @@ static int logical_bsd_ring_init(struct drm_device *dev)
>  	ring->irq_keep_mask =
>  		GT_CONTEXT_SWITCH_INTERRUPT << GEN8_VCS1_IRQ_SHIFT;
>  
> -	ring->init = gen8_init_common_ring;
> +	ring->init_hw = gen8_init_common_ring;
>  	ring->get_seqno = gen8_get_seqno;
>  	ring->set_seqno = gen8_set_seqno;
>  	ring->emit_request = gen8_emit_request;
> @@ -1467,7 +1467,7 @@ static int logical_bsd2_ring_init(struct drm_device *dev)
>  	ring->irq_keep_mask =
>  		GT_CONTEXT_SWITCH_INTERRUPT << GEN8_VCS2_IRQ_SHIFT;
>  
> -	ring->init = gen8_init_common_ring;
> +	ring->init_hw = gen8_init_common_ring;
>  	ring->get_seqno = gen8_get_seqno;
>  	ring->set_seqno = gen8_set_seqno;
>  	ring->emit_request = gen8_emit_request;
> @@ -1492,7 +1492,7 @@ static int logical_blt_ring_init(struct drm_device *dev)
>  	ring->irq_keep_mask =
>  		GT_CONTEXT_SWITCH_INTERRUPT << GEN8_BCS_IRQ_SHIFT;
>  
> -	ring->init = gen8_init_common_ring;
> +	ring->init_hw = gen8_init_common_ring;
>  	ring->get_seqno = gen8_get_seqno;
>  	ring->set_seqno = gen8_set_seqno;
>  	ring->emit_request = gen8_emit_request;
> @@ -1517,7 +1517,7 @@ static int logical_vebox_ring_init(struct drm_device *dev)
>  	ring->irq_keep_mask =
>  		GT_CONTEXT_SWITCH_INTERRUPT << GEN8_VECS_IRQ_SHIFT;
>  
> -	ring->init = gen8_init_common_ring;
> +	ring->init_hw = gen8_init_common_ring;
>  	ring->get_seqno = gen8_get_seqno;
>  	ring->set_seqno = gen8_set_seqno;
>  	ring->emit_request = gen8_emit_request;
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index 1d01b51ff058..367a715a044c 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -1842,7 +1842,7 @@ static int intel_init_ring_buffer(struct drm_device *dev,
>  	if (ret)
>  		goto error;
>  
> -	ret = ring->init(ring);
> +	ret = ring->init_hw(ring);
>  	if (ret)
>  		goto error;
>  
> @@ -2419,7 +2419,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
>  		ring->dispatch_execbuffer = i830_dispatch_execbuffer;
>  	else
>  		ring->dispatch_execbuffer = i915_dispatch_execbuffer;
> -	ring->init = init_render_ring;
> +	ring->init_hw = init_render_ring;
>  	ring->cleanup = render_ring_cleanup;
>  
>  	/* Workaround batchbuffer to combat CS tlb bug. */
> @@ -2512,7 +2512,7 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)
>  		}
>  		ring->dispatch_execbuffer = i965_dispatch_execbuffer;
>  	}
> -	ring->init = init_ring_common;
> +	ring->init_hw = init_ring_common;
>  
>  	return intel_init_ring_buffer(dev, ring);
>  }
> @@ -2551,7 +2551,7 @@ int intel_init_bsd2_ring_buffer(struct drm_device *dev)
>  		ring->semaphore.signal = gen8_xcs_signal;
>  		GEN8_RING_SEMAPHORE_INIT;
>  	}
> -	ring->init = init_ring_common;
> +	ring->init_hw = init_ring_common;
>  
>  	return intel_init_ring_buffer(dev, ring);
>  }
> @@ -2608,7 +2608,7 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)
>  			ring->semaphore.mbox.signal[VCS2] = GEN6_NOSYNC;
>  		}
>  	}
> -	ring->init = init_ring_common;
> +	ring->init_hw = init_ring_common;
>  
>  	return intel_init_ring_buffer(dev, ring);
>  }
> @@ -2659,7 +2659,7 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev)
>  			ring->semaphore.mbox.signal[VCS2] = GEN6_NOSYNC;
>  		}
>  	}
> -	ring->init = init_ring_common;
> +	ring->init_hw = init_ring_common;
>  
>  	return intel_init_ring_buffer(dev, ring);
>  }
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
> index fe426cff598b..5033cd0d0580 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.h
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
> @@ -146,7 +146,7 @@ struct  intel_engine_cs {
>  	bool __must_check (*irq_get)(struct intel_engine_cs *ring);
>  	void		(*irq_put)(struct intel_engine_cs *ring);
>  
> -	int		(*init)(struct intel_engine_cs *ring);
> +	int		(*init_hw)(struct intel_engine_cs *ring);
>  
>  	int		(*init_context)(struct intel_engine_cs *ring,
>  					struct intel_context *ctx);
> 

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

      parent reply	other threads:[~2014-11-27 14:36 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-19 23:33 [PATCH 1/5] drm/i915: s/init()/init_hw()/ in intel_engine_cs Daniel Vetter
2014-11-19 23:33 ` [PATCH 2/5] drm/i915: s/intel_workarouns_ring/intel_render_workarounds/ Daniel Vetter
2014-11-20  8:05   ` Chris Wilson
2014-11-20  9:14     ` Daniel Vetter
2014-11-27 15:07   ` Dave Gordon
2014-11-28 17:53     ` Daniel Vetter
2014-11-19 23:33 ` [PATCH 3/5] drm/i915: Move intel_init_pipe_control out of engine->init_hw Daniel Vetter
2014-11-27 16:02   ` Dave Gordon
2014-11-19 23:33 ` [PATCH 4/5] drm/i915: Only init engines once Daniel Vetter
2014-11-20  8:06   ` Chris Wilson
2014-11-28 12:02   ` Dave Gordon
2014-11-28 17:56     ` Daniel Vetter
2014-11-28 18:43       ` Chris Wilson
2014-11-19 23:33 ` [PATCH 5/5] drm/i915: Flatten engine init control flow Daniel Vetter
2014-11-20  8:10   ` Chris Wilson
2014-11-20  9:19     ` Daniel Vetter
2014-12-01 16:11       ` Dave Gordon
2014-12-01 16:34         ` Daniel Vetter
2014-11-20  8:03 ` [PATCH 1/5] drm/i915: s/init()/init_hw()/ in intel_engine_cs Chris Wilson
2014-11-20  9:11   ` Daniel Vetter
2014-11-20  9:15     ` Chris Wilson
2014-11-20  8:45 ` [PATCH] drm/i915: Move init_unused_rings to gem_init_hw Daniel Vetter
2014-11-21 19:01   ` Dave Gordon
2014-11-21 20:27     ` Daniel Vetter
2014-12-02 15:39       ` Dave Gordon
2014-11-27 14:36 ` Dave Gordon [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=547736E3.20406@intel.com \
    --to=david.s.gordon@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.