From: Imre Deak <imre.deak@intel.com>
To: Zhao Yakui <yakui.zhao@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH V3 5/6] drm/i915: Update the restrict check to filter out wrong Ring ID passed by user-space
Date: Wed, 16 Apr 2014 19:50:48 +0300 [thread overview]
Message-ID: <1397667048.4215.50.camel@intelbox> (raw)
In-Reply-To: <1397616077-1125-6-git-send-email-yakui.zhao@intel.com>
[-- Attachment #1.1: Type: text/plain, Size: 1879 bytes --]
On Wed, 2014-04-16 at 10:41 +0800, Zhao Yakui wrote:
> One extra ring is added in the kernel driver but it is transparent to the
> user-space application/middleware. In such case the number of the rings
> in kernel driver is bigger than that exported to the user-space. So
> it needs to filter out the wrong Ring ID passed by user-space.
>
> Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
> ---
> drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +-
> drivers/gpu/drm/i915/intel_ringbuffer.h | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> index 3491402..341ec68 100644
> --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> @@ -1035,7 +1035,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
> if (args->flags & I915_EXEC_IS_PINNED)
> flags |= I915_DISPATCH_PINNED;
>
> - if ((args->flags & I915_EXEC_RING_MASK) > I915_NUM_RINGS) {
> + if ((args->flags & I915_EXEC_RING_MASK) > LAST_USER_RING) {
> DRM_DEBUG("execbuf with unknown ring: %d\n",
> (int)(args->flags & I915_EXEC_RING_MASK));
> return -EINVAL;
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
> index 8ca4285..59f4cdd 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.h
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
> @@ -64,6 +64,7 @@ struct intel_ring_buffer {
> VCS2,
> } id;
> #define I915_NUM_RINGS 5
> +#define LAST_USER_RING (VECS + 1)
Defining this in the enum is cleaner IMO. Also this patch should ideally
be applied before 2/6 for bisectability. In any case:
Reviewed-by: Imre Deak <imre.deak@intel.com>
> u32 mmio_base;
> void __iomem *virtual_start;
> struct drm_device *dev;
[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2014-04-16 16:50 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-16 2:41 [PATCH V3 0/6] drm/i915: Add the support of dual BSD rings on BDW GT3 Zhao Yakui
2014-04-16 2:41 ` [PATCH V3 1/6] drm/i915: Split the BDW device definition to prepare for " Zhao Yakui
2014-04-16 14:14 ` Imre Deak
2014-04-16 2:41 ` [PATCH V3 2/6] drm/i915:Initialize the second BSD ring on BDW GT3 machine Zhao Yakui
2014-04-16 16:23 ` Imre Deak
2014-04-17 1:12 ` Zhao Yakui
2014-04-16 2:41 ` [PATCH V3 3/6] drm/i915:Handle the irq interrupt for the second BSD ring Zhao Yakui
2014-04-16 16:38 ` Imre Deak
2014-04-16 2:41 ` [PATCH V3 4/6] drm/i915:Add the VCS2 switch in Intel_ring_setup_status_page for Gen7 to remove the switch check warning Zhao Yakui
2014-04-16 16:43 ` Imre Deak
2014-04-16 2:41 ` [PATCH V3 5/6] drm/i915: Update the restrict check to filter out wrong Ring ID passed by user-space Zhao Yakui
2014-04-16 16:50 ` Imre Deak [this message]
2014-04-16 2:41 ` [PATCH V3 6/6] drm/i915: Use the coarse ping-pong mechanism based on drm fd to dispatch the BSD command on BDW GT3 Zhao Yakui
2014-04-16 16:52 ` Imre Deak
-- strict thread matches above, loose matches on Subject: below --
2001-01-14 18:37 [PATCH V3 0/6] drm/i915: Add the support of dual BSD rings " Zhao Yakui
2001-01-14 18:37 ` [PATCH V3 5/6] drm/i915: Update the restrict check to filter out wrong Ring ID passed by user-space Zhao Yakui
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=1397667048.4215.50.camel@intelbox \
--to=imre.deak@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=yakui.zhao@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