From: Daniel Vetter <daniel@ffwll.ch>
To: Michel Thierry <michel.thierry@intel.com>
Cc: Deepak S <deepak.s@intel.com>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH v4] drm/i915: Initialize workarounds in logical ring mode too
Date: Wed, 12 Nov 2014 09:32:41 +0100 [thread overview]
Message-ID: <20141112083241.GG25711@phenom.ffwll.local> (raw)
In-Reply-To: <1415724453-21648-1-git-send-email-michel.thierry@intel.com>
On Tue, Nov 11, 2014 at 04:47:33PM +0000, Michel Thierry wrote:
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index 98f2787..9e17432 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -677,7 +677,8 @@ err:
> return ret;
> }
>
> -static int intel_ring_workarounds_emit(struct intel_engine_cs *ring)
> +static int intel_ring_workarounds_emit(struct intel_engine_cs *ring,
> + struct intel_context *ctx)
One nitpick for the future: We align continuation lines for paramter lists
to the opening (. checkpatch.pl --strict will catch this for you. I've
fixed this while applying since it disturbed my ocd too much ;-)
-Daniel
> {
> int ret, i;
> struct drm_device *dev = ring->dev;
> @@ -818,7 +819,7 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)
> return 0;
> }
>
> -static int init_workarounds_ring(struct intel_engine_cs *ring)
> +int init_workarounds_ring(struct intel_engine_cs *ring)
> {
> struct drm_device *dev = ring->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
> index f0e7761..86c4447 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.h
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
> @@ -148,7 +148,8 @@ struct intel_engine_cs {
>
> int (*init)(struct intel_engine_cs *ring);
>
> - int (*init_context)(struct intel_engine_cs *ring);
> + int (*init_context)(struct intel_engine_cs *ring,
> + struct intel_context *ctx);
>
> void (*write_tail)(struct intel_engine_cs *ring,
> u32 value);
> @@ -429,6 +430,8 @@ 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);
> +
> static inline u32 intel_ring_get_tail(struct intel_ringbuffer *ringbuf)
> {
> return ringbuf->tail;
> --
> 2.1.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
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-12 8:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-28 17:19 [PATCH] drm/i915: Initialize workarounds in logical ring mode too Arun Siluvery
2014-11-10 16:38 ` Mika Kuoppala
2014-11-11 11:34 ` Michel Thierry
2014-11-11 14:44 ` Daniel Vetter
2014-11-11 15:49 ` [PATCH v3] " Michel Thierry
2014-11-11 16:10 ` Mika Kuoppala
2014-11-12 8:29 ` Daniel Vetter
2014-11-12 11:15 ` [PATCH v3] drm/i915: Initialize workarounds in logical shuang.he
2014-11-11 16:47 ` [PATCH v4] drm/i915: Initialize workarounds in logical ring mode too Michel Thierry
2014-11-11 16:59 ` Mika Kuoppala
2014-11-12 8:30 ` Daniel Vetter
2014-11-12 8:32 ` Daniel Vetter [this message]
2014-11-12 13:08 ` [PATCH v4] drm/i915: Initialize workarounds in logical shuang.he
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=20141112083241.GG25711@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=deepak.s@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=michel.thierry@intel.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox