From: Daniel Vetter <daniel@ffwll.ch>
To: Kenneth Graunke <kenneth@whitecape.org>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 2/3] i915: Rename PIPE_CONTROL bit defines to be less terse.
Date: Tue, 4 Oct 2011 10:30:27 +0200 [thread overview]
Message-ID: <20111004083027.GA2870@phenom.ffwll.local> (raw)
In-Reply-To: <1317708160-1761-2-git-send-email-kenneth@whitecape.org>
On Mon, Oct 03, 2011 at 11:02:39PM -0700, Kenneth Graunke wrote:
> "STALL_AT_SCOREBOARD" is much clearer than "STALL_EN" now that there are
> several different kinds of stalls. Also, "INSTRUCTION_CACHE_FLUSH" is a
> lot easier to understand at a glance than the terse "IS_FLUSH."
>
> Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
> ---
> drivers/gpu/drm/i915/i915_reg.h | 16 ++++++++--------
> drivers/gpu/drm/i915/intel_ringbuffer.c | 6 ++++--
> 2 files changed, 12 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index d691781..bfe8488 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -243,15 +243,15 @@
> #define DISPLAY_PLANE_A (0<<20)
> #define DISPLAY_PLANE_B (1<<20)
> #define GFX_OP_PIPE_CONTROL ((0x3<<29)|(0x3<<27)|(0x2<<24))
> -#define PIPE_CONTROL_QW_WRITE (1<<14)
> -#define PIPE_CONTROL_DEPTH_STALL (1<<13)
> -#define PIPE_CONTROL_WC_FLUSH (1<<12)
> -#define PIPE_CONTROL_IS_FLUSH (1<<11) /* MBZ on Ironlake */
> -#define PIPE_CONTROL_TC_FLUSH (1<<10) /* GM45+ only */
> -#define PIPE_CONTROL_ISP_DIS (1<<9)
> -#define PIPE_CONTROL_NOTIFY (1<<8)
> +#define PIPE_CONTROL_QW_WRITE (1<<14)
> +#define PIPE_CONTROL_DEPTH_STALL (1<<13)
> +#define PIPE_CONTROL_WRITE_FLUSH (1<<12)
> +#define PIPE_CONTROL_INSTRUCTION_CACHE_FLUSH (1<<11) /* MBZ on Ironlake */
> +#define PIPE_CONTROL_TEXTURE_CACHE_FLUSH (1<<10) /* GM45+ only */
Minor bikeshed: You retain the _FLUSH for the read-only
instruction/texture caches, but use _INVALIDATE for the new bits for
read-only caches. I think we want _INVALIDATE for all of them.
Otherwise, these three patches are:
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> +#define PIPE_CONTROL_INDIRECT_STATE_DISABLE (1<<9)
> +#define PIPE_CONTROL_NOTIFY (1<<8)
> +#define PIPE_CONTROL_STALL_AT_SCOREBOARD (1<<1)
> #define PIPE_CONTROL_GLOBAL_GTT (1<<2) /* in addr dword */
> -#define PIPE_CONTROL_STALL_EN (1<<1) /* in addr word, Ironlake+ only */
>
>
> /*
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index 67ce601..2b572fd 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -468,7 +468,8 @@ pc_render_add_request(struct intel_ring_buffer *ring,
> return ret;
>
> intel_ring_emit(ring, GFX_OP_PIPE_CONTROL | 2 | PIPE_CONTROL_QW_WRITE |
> - PIPE_CONTROL_WC_FLUSH | PIPE_CONTROL_TC_FLUSH);
> + PIPE_CONTROL_WRITE_FLUSH |
> + PIPE_CONTROL_TEXTURE_CACHE_FLUSH);
> intel_ring_emit(ring, pc->gtt_offset | PIPE_CONTROL_GLOBAL_GTT);
> intel_ring_emit(ring, seqno);
> intel_ring_emit(ring, 0);
> @@ -484,7 +485,8 @@ pc_render_add_request(struct intel_ring_buffer *ring,
> scratch_addr += 128;
> PIPE_CONTROL_FLUSH(ring, scratch_addr);
> intel_ring_emit(ring, GFX_OP_PIPE_CONTROL | 2 | PIPE_CONTROL_QW_WRITE |
> - PIPE_CONTROL_WC_FLUSH | PIPE_CONTROL_TC_FLUSH |
> + PIPE_CONTROL_WRITE_FLUSH |
> + PIPE_CONTROL_TEXTURE_CACHE_FLUSH |
> PIPE_CONTROL_NOTIFY);
> intel_ring_emit(ring, pc->gtt_offset | PIPE_CONTROL_GLOBAL_GTT);
> intel_ring_emit(ring, seqno);
> --
> 1.7.6.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
next prev parent reply other threads:[~2011-10-04 8:29 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-04 6:02 [PATCH 1/3] i915: Remove implied length of 2 from GFX_OP_PIPE_CONTROL #define Kenneth Graunke
2011-10-04 6:02 ` [PATCH 2/3] i915: Rename PIPE_CONTROL bit defines to be less terse Kenneth Graunke
2011-10-04 8:30 ` Daniel Vetter [this message]
2011-10-05 5:13 ` Kenneth Graunke
2011-10-05 10:05 ` Daniel Vetter
2011-10-05 22:29 ` Ben Widawsky
2011-10-04 6:02 ` [PATCH 3/3] drm/i915: Use PIPE_CONTROL for flushing on gen6+ Kenneth Graunke
2011-10-05 22:57 ` Ben Widawsky
2011-10-05 23:36 ` Chris Wilson
2011-10-05 23:54 ` Daniel Vetter
2011-10-06 0:59 ` Eric Anholt
2011-10-06 5:15 ` Ben Widawsky
2011-10-06 18:00 ` Eric Anholt
2011-10-06 19:01 ` Ben Widawsky
2011-10-05 23:39 ` Ben Widawsky
2011-10-05 20:35 ` [PATCH 1/3] i915: Remove implied length of 2 from GFX_OP_PIPE_CONTROL #define Ben Widawsky
2011-10-11 11:09 ` Daniel Vetter
2011-10-11 17:20 ` Jesse Barnes
2011-10-11 18:39 ` Ben Widawsky
2011-10-11 18:53 ` Jesse Barnes
2011-10-11 22:17 ` Keith Packard
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=20111004083027.GA2870@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=kenneth@whitecape.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.