From: Dave Gordon <david.s.gordon@intel.com>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH 2/5] drm/i915: s/intel_workarouns_ring/intel_render_workarounds/
Date: Thu, 27 Nov 2014 15:07:28 +0000 [thread overview]
Message-ID: <54773E30.9000802@intel.com> (raw)
In-Reply-To: <1416439988-10979-2-git-send-email-daniel.vetter@ffwll.ch>
On 19/11/14 23:33, Daniel Vetter wrote:
> Since it's not for the rings but engine, and its specifically for
> render state and workarounds.
>
> Note that there's a massive s/ring/engine/ required all over the
> driver, but that's really not part of this patch here. So I've leaft
> the paramter names as-is.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
Code is fine, but the commit message contains several typos.
s/leaft/left/ and s/paramter/parameter/ don't really matter,
but the one in the subject line is a bit more important.
It should be "s/init_workarounds_ring/init_render_workarounds/",
with no mention of "intel_" !
Once that's corrected, then
Reviewed-by: Dave Gordon <david.s.gordon@intel.com>
.Dave.
> drivers/gpu/drm/i915/intel_lrc.c | 2 +-
> drivers/gpu/drm/i915/intel_ringbuffer.c | 4 ++--
> drivers/gpu/drm/i915/intel_ringbuffer.h | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
> index 5e14316c80d0..25a2c2b45c6e 100644
> --- a/drivers/gpu/drm/i915/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/intel_lrc.c
> @@ -1165,7 +1165,7 @@ static int gen8_init_render_ring(struct intel_engine_cs *ring)
>
> I915_WRITE(INSTPM, _MASKED_BIT_ENABLE(INSTPM_FORCE_ORDERING));
>
> - return init_workarounds_ring(ring);
> + return init_render_workarounds(ring);
> }
>
> static int gen8_emit_bb_start(struct intel_ringbuffer *ringbuf,
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index 367a715a044c..24af1e33a314 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -803,7 +803,7 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)
> return 0;
> }
>
> -int init_workarounds_ring(struct intel_engine_cs *ring)
> +int init_render_workarounds(struct intel_engine_cs *ring)
> {
> struct drm_device *dev = ring->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> @@ -876,7 +876,7 @@ static int init_render_ring(struct intel_engine_cs *ring)
> if (HAS_L3_DPF(dev))
> I915_WRITE_IMR(ring, ~GT_PARITY_ERROR(dev));
>
> - return init_workarounds_ring(ring);
> + return init_render_workarounds(ring);
> }
>
> static void render_ring_cleanup(struct intel_engine_cs *ring)
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
> index 5033cd0d0580..f5cfab0d162b 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.h
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
> @@ -429,7 +429,7 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev);
> u64 intel_ring_get_active_head(struct intel_engine_cs *ring);
> void intel_ring_setup_status_page(struct intel_engine_cs *ring);
>
> -int init_workarounds_ring(struct intel_engine_cs *ring);
> +int init_render_workarounds(struct intel_engine_cs *ring);
>
> static inline u32 intel_ring_get_tail(struct intel_ringbuffer *ringbuf)
> {
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2014-11-27 15:07 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 [this message]
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 ` [PATCH 1/5] drm/i915: s/init()/init_hw()/ in intel_engine_cs Dave Gordon
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=54773E30.9000802@intel.com \
--to=david.s.gordon@intel.com \
--cc=daniel.vetter@ffwll.ch \
--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.