On Tue, Nov 25, 2014 at 5:04 AM, Daniel Vetter <daniel@xxxxxxxx> wrote:
> On Mon, Nov 24, 2014 at 08:29:40AM -0800, Rodrigo Vivi wrote:
>> From: Zhipeng Gong <zhipeng.gong@xxxxxxxxx>
>>
>> On Broadwell GT3 we have 2 Video Command Streamers (VCS), but userspace
>> has no control when using VCS1 or VCS2. This patch introduces a mechanism
>> to avoid the default ping-pong mode and use one specific ring through
>> execution flag.
>>
>> v2: fix whitespace (Rodrigo)
>> v3: remove incorrect chunk that came on -collector rebase. (Rodrigo)
>>
>> Signed-off-by: Zhipeng Gong <zhipeng.gong@xxxxxxxxx>
>> Reviewed-by-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
>> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
>
> There's review from me pending on testcases and stuff, but I get the
> impression that's lost now. Is it?
tests are ready as well, I've tested and reviewed them.
imho this is ready for merge. Anyway I'm going to submit again on next
-collector round
> -Daniel
>
>> ---
>> drivers/gpu/drm/i915/i915_gem_execbuffer.c | 19 +++++++++++++++++--
>> include/uapi/drm/i915_drm.h | 8 +++++++-
>> 2 files changed, 24 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
>> index f06027b..2ef60c3 100644
>> --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
>> +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
>> @@ -1317,8 +1317,23 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
>> else if ((args->flags & I915_EXEC_RING_MASK) == I915_EXEC_BSD) {
>> if (HAS_BSD2(dev)) {
>> int ring_id;
>> - ring_id = gen8_dispatch_bsd_ring(dev, file);
>> - ring = &dev_priv->ring[ring_id];
>> +
>> + switch (args->flags & I915_EXEC_BSD_MASK) {
>> + case I915_EXEC_BSD_DEFAULT:
>> + ring_id = gen8_dispatch_bsd_ring(dev, file);
>> + ring = &dev_priv->ring[ring_id];
>> + break;
>> + case I915_EXEC_BSD_RING1:
>> + ring = &dev_priv->ring[VCS];
>> + break;
>> + case I915_EXEC_BSD_RING2:
>> + ring = &dev_priv->ring[VCS2];
>> + break;
>> + default:
>> + DRM_DEBUG("execbuf with unknown bsd ring: %d\n",
>> + (int)(args->flags & I915_EXEC_BSD_MASK));
>> + return -EINVAL;
>> + }
>> } else
>> ring = &dev_priv->ring[VCS];
>> } else
>> diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
>> index 2502622..fcb16bf 100644
>> --- a/include/uapi/drm/i915_drm.h
>> +++ b/include/uapi/drm/i915_drm.h
>> @@ -737,7 +737,13 @@ struct drm_i915_gem_execbuffer2 {
>> */
>> #define I915_EXEC_HANDLE_LUT (1<<12)
>>
>> -#define __I915_EXEC_UNKNOWN_FLAGS -(I915_EXEC_HANDLE_LUT<<1)
>> +/** Used for switching BSD rings on the platforms with two BSD rings */
>> +#define I915_EXEC_BSD_MASK (3<<13)
>> +#define I915_EXEC_BSD_DEFAULT (0<<13) /* default ping-pong mode */
>> +#define I915_EXEC_BSD_RING1 (1<<13)
>> +#define I915_EXEC_BSD_RING2 (2<<13)
>> +
>> +#define __I915_EXEC_UNKNOWN_FLAGS -(1<<15)
>>
>> #define I915_EXEC_CONTEXT_ID_MASK (0xffffffff)
>> #define i915_execbuffer2_set_context_id(eb2, context) \
>> --
>> 1.9.3
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
