[Intel-gfx] [PATCH 1/2] drm/i915: compile-time consistency check on __EXEC_OBJECT flags

2016-06-30 Thread Dave Gordon
d in i915_drm.h, and they start from the LSB and work up. Other flags are defined in i915_gem_execbuffer, for internal use within that file only; they start from the MSB and work down. So here we add a compile-time check that the two sets of flags do not overlap, which would cause all sorts of confus

[Intel-gfx] [PATCH 2/2] drm/i915: refactor eb_get_batch()

2016-06-30 Thread Dave Gordon
"list_entry(eb->vmas.prev, ...)" in the old version of eb_get_batch() with the equivalent but more explicit "list_last_entry(&eb->vmas,...)" in the new eb_get_batch_vma() and of course add an explanatory comment. Signed-off-by: Dave Gor

[Intel-gfx] [PATCH] drm/i915: unify first-stage engine struct setup

2016-06-30 Thread Dave Gordon
transfers information from the static table of (all) known engines to the dev_priv->engine array of engines available on this device (adjusting the names along the way) and then embed calls to it in both the LRC and the legacy-mode setup. Signed-off-by: Dave Gordon --- drivers/gpu/drm/i91

Re: [Intel-gfx] [PATCH] drm/i915: tidy up request alloc

2016-07-01 Thread Dave Gordon
On 30/06/16 13:49, Tvrtko Ursulin wrote: On 30/06/16 11:22, Chris Wilson wrote: On Thu, Jun 30, 2016 at 09:50:20AM +0100, Tvrtko Ursulin wrote: On 30/06/16 02:35, Hong Liu wrote: Return the allocated request pointer directly to remove the double pointer parameter. Signed-off-by: Hong Liu -

Re: [Intel-gfx] [PATCH] drm/i915/guc: Consolidate firmware major-minor to one place

2016-07-01 Thread Dave Gordon
platform. Signed-off-by: Tvrtko Ursulin Cc: Dave Gordon --- drivers/gpu/drm/i915/intel_guc_loader.c | 21 +++-- 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c index 4f6311a91a7e

Re: [Intel-gfx] [PATCH] drm/i915: Mass convert dev->dev_private to to_i915(dev)

2016-07-04 Thread Dave Gordon
drm/i915/intel_tv.c| 12 +- drivers/gpu/drm/i915/intel_uncore.c| 2 +- 47 files changed, 708 insertions(+), 709 deletions(-) Looks fine :) Reviewed-by: Dave Gordon I found three more to convert, plus one place where we can delete some entirely redundant locals, b

[Intel-gfx] [PATCH] drm/i915: convert a few more E->dev_private to to_i915(E)

2016-07-04 Thread Dave Gordon
Also remove some redundant dev and dev_priv locals Signed-off-by: Dave Gordon Cc: Chris Wilson --- drivers/gpu/drm/i915/i915_gem.c | 4 ++-- drivers/gpu/drm/i915/intel_display.c| 4 drivers/gpu/drm/i915/intel_guc_loader.c | 2 +- 3 files changed, 3 insertions(+), 7 deletions

Re: [Intel-gfx] [PATCH] drm/i915: tidy up request alloc

2016-07-04 Thread Dave Gordon
On 04/07/16 05:08, Liu, Hong wrote: On Fri, 2016-07-01 at 19:34 +0100, Chris Wilson wrote: On Fri, Jul 01, 2016 at 05:58:18PM +0100, Dave Gordon wrote: On 30/06/16 13:49, Tvrtko Ursulin wrote: On 30/06/16 11:22, Chris Wilson wrote: On Thu, Jun 30, 2016 at 09:50:20AM +0100, Tvrtko Ursulin

Re: [Intel-gfx] [PATCH] drm/i915/guc: Protect against HAS_GUC_* returning true values other than one

2016-07-05 Thread Dave Gordon
ick and easy fix for the GuC loading code and the whole area can be evaluated afterwards. Signed-off-by: Tvrtko Ursulin Reported-by: Chris Wilson Cc: Dave Gordon --- drivers/gpu/drm/i915/intel_guc_loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/d

Re: [Intel-gfx] [PATCH] drm/i915/guc: Protect against HAS_GUC_* returning true values other than one

2016-07-05 Thread Dave Gordon
On 05/07/16 12:56, Tvrtko Ursulin wrote: On 05/07/16 12:50, Dave Gordon wrote: On 04/07/16 15:30, Tvrtko Ursulin wrote: From: Tvrtko Ursulin At the moment HAS_GUC_UCODE == HAS_GUC == IS_GEN9 == (INTEL_INFO(dev)->gen_mask & BIT(8)), which is true but not one. And module paramet

Re: [Intel-gfx] [PATCH] drm/i915: Convert dev_priv->dev backpointers to dev_priv->drm

2016-07-05 Thread Dave Gordon
On 05/07/16 09:51, Chris Wilson wrote: Since drm_i915_private is now a subclass of drm_device we do not need to chase the drm_i915_private->dev backpointer and can instead simply access drm_i915_private->drm directly. text data bss dec hex filename 10687574565 4

Re: [Intel-gfx] [PATCH 3/6] drm/i915/huc: Add HuC fw loading support

2016-07-05 Thread Dave Gordon
On 29/06/16 18:59, Rodrigo Vivi wrote: On Wed, Jun 29, 2016 at 7:31 AM, Dave Gordon wrote: On 29/06/16 00:03, Rodrigo Vivi wrote: I don't believe we need to be that extreme here. Daniel asked a cleaner version, but we don't need to block the huc on a full rework of an unified

Re: [Intel-gfx] [PATCH v2 1/6] drm/i915/guc: Make the GuC fw loading helper functions general

2016-07-05 Thread Dave Gordon
ill need rebasing (again), but it's only a simple conflict with recent patches. Apart from that, its OK now, so: Reviewed-by: Dave Gordon (which you can carry over to the rebased version). --- drivers/gpu/drm/i915/i915_debugfs.c| 12 +-- drivers/gpu/drm/i915/i915_guc_subm

[Intel-gfx] [PATCH 2/2] drm/i915: refactor eb_get_batch()

2016-07-06 Thread Dave Gordon
"list_entry(eb->vmas.prev, ...)" in the old version of eb_get_batch() with the equivalent but more explicit "list_last_entry(&eb->vmas,...)" in the new eb_get_batch_vma() and of course add an explanatory comment. Signed-off-by: Dave Gor

[Intel-gfx] [PATCH 1/2] drm/i915: compile-time consistency check on __EXEC_OBJECT flags

2016-07-06 Thread Dave Gordon
d in i915_drm.h, and they start from the LSB and work up. Other flags are defined in i915_gem_execbuffer, for internal use within that file only; they start from the MSB and work down. So here we add a compile-time check that the two sets of flags do not overlap, which would cause all sorts of confus

[Intel-gfx] [PATCH] drm/i915: avoid wait_for_atomic() in non-atomic host2guc_action()

2016-07-06 Thread Dave Gordon
that as-is, because that interface doesn't quite match what we need here). Signed-off-by: Dave Gordon Cc: Tvrtko Ursulin Cc: Chris Wilson --- drivers/gpu/drm/i915/i915_guc_submission.c | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_guc_s

[Intel-gfx] [PATCH] drm/i915/guc: symbolic names for user load/submission preferences

2016-07-11 Thread Dave Gordon
So this patch just provides and uses names for the values representing the DEFAULT, DISABLED, PREFERRED, and MANDATORY options that the user can select (-1, 0, 1, 2 respectively). This should produce identical code to the previous version! Signed-off-by: Dave Gordon Cc: Tvrtko Ursulin ---

[Intel-gfx] [PATCH 2/3] drm/i915/guc: downgrade some DRM_ERROR() messages to DRM_WARN()

2016-07-11 Thread Dave Gordon
Where we're going to continue regardless of the problem, rather than fail, then the message should be a WARNing rather than an ERROR. Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/i915_guc_submission.c | 18 +++--- 1 file changed, 7 insertions(+), 11 deletions(-) diff --

[Intel-gfx] [PATCH 1/3] drm: extra printk() wrapper macros

2016-07-11 Thread Dave Gordon
underlying macro that does all the token-pasting. DRM_ERROR is unchanged, as it's not just a printk wrapper. Signed-off-by: Dave Gordon --- include/drm/drmP.h | 26 -- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/include/drm/drmP.h b/include/drm/drmP.h

[Intel-gfx] [PATCH 3/3] drm/i915/guc: revisit GuC loader message levels

2016-07-11 Thread Dave Gordon
Some downgraded from DRM_ERROR() to DRM_WARN(), some eliminated, and a few upgraded from DRM_INFO() to DRM_NOTE() or DRM_WARN(). Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/intel_guc_loader.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a

Re: [Intel-gfx] [PATCH] drm/i915/guc: symbolic names for user load/submission preferences

2016-07-12 Thread Dave Gordon
On 11/07/16 20:58, Chris Wilson wrote: On Mon, Jul 11, 2016 at 06:12:40PM +0100, Dave Gordon wrote: The existing code that accesses the "enable_guc_loading" and "enable_guc_submission" parameters uses explicit numerical values for the various possibilities, including in s

Re: [Intel-gfx] [PATCH 2/3] drm/i915/guc: downgrade some DRM_ERROR() messages to DRM_WARN()

2016-07-12 Thread Dave Gordon
On 12/07/16 10:20, Tvrtko Ursulin wrote: On 11/07/16 19:01, Dave Gordon wrote: Where we're going to continue regardless of the problem, rather than fail, then the message should be a WARNing rather than an ERROR. Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/i915_guc_submiss

Re: [Intel-gfx] [PATCH 1/3] drm: extra printk() wrapper macros

2016-07-12 Thread Dave Gordon
On 12/07/16 10:06, Tvrtko Ursulin wrote: On 11/07/16 19:01, Dave Gordon wrote: We had only DRM_INFO() and DRM_ERROR(), whereas the underlying printk() provides several other useful intermediate levels such as NOTICE and WARNING. So this patch fills out the set by providing both regular and

Re: [Intel-gfx] [PATCH 1/3] drm: extra printk() wrapper macros

2016-07-12 Thread Dave Gordon
On 12/07/16 15:25, Daniel Vetter wrote: On Mon, Jul 11, 2016 at 07:01:27PM +0100, Dave Gordon wrote: We had only DRM_INFO() and DRM_ERROR(), whereas the underlying printk() provides several other useful intermediate levels such as NOTICE and WARNING. So this patch fills out the set by providing

Re: [Intel-gfx] [PATCH 3/3] drm/i915/guc: revisit GuC loader message levels

2016-07-12 Thread Dave Gordon
On 12/07/16 10:26, Tvrtko Ursulin wrote: On 11/07/16 19:01, Dave Gordon wrote: Some downgraded from DRM_ERROR() to DRM_WARN(), some eliminated, and a few upgraded from DRM_INFO() to DRM_NOTE() or DRM_WARN(). Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/intel_guc_loader.c | 20

[Intel-gfx] [PATCH v2 1/3] drm: extra printk() wrapper macros

2016-07-12 Thread Dave Gordon
underlying macro that does all the token-pasting. DRM_ERROR is unchanged, as it's not just a printk wrapper. v2: Fix whitespace, missing ## (Eric Engestrom) Signed-off-by: Dave Gordon Reviewed-by: Eric Engestrom --- include/drm/drmP.h | 26 -- 1 file change

[Intel-gfx] [PATCH v2 2/3] drm/i915/guc: downgrade some DRM_ERROR() messages to DRM_WARN()

2016-07-12 Thread Dave Gordon
Where we're going to continue regardless of the problem, rather than fail, then the message should be a WARNing rather than an ERROR. Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/i915_guc_submission.c | 18 +++--- 1 file changed, 7 insertions(+), 11 deletions(-) diff --

[Intel-gfx] [PATCH v2 3/3] drm/i915/guc: revisit GuC loader message levels

2016-07-12 Thread Dave Gordon
the log with developer-only details. v2: different permutation of levels :) Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/intel_guc_loader.c | 34 - 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b

[Intel-gfx] [PATCH] drm/i915/guc: symbolic names for user load/submission preferences

2016-07-13 Thread Dave Gordon
So this patch just provides and uses names for the values representing the DEFAULT, DISABLED, PREFERRED, and MANDATORY options that the user can select (-1, 0, 1, 2 respectively). This should produce identical code to the previous version! Signed-off-by: Dave Gordon Cc: Tvrtko Ursulin ---

Re: [Intel-gfx] [PATCH 1/5] drm/i915: unify first-stage engine struct setup

2016-07-14 Thread Dave Gordon
On 13/07/16 14:16, Tvrtko Ursulin wrote: On 13/07/16 13:23, Daniel Vetter wrote: On Fri, Jul 01, 2016 at 05:47:11PM +0100, Tvrtko Ursulin wrote: From: Dave Gordon [snip] { -const struct logical_ring_info *info = &logical_rings[id]; +const struct engine_info *

Re: [Intel-gfx] [PATCH 2/2] drm/i915: refactor eb_get_batch()

2016-07-14 Thread Dave Gordon
On 13/07/16 13:44, Chris Wilson wrote: On Wed, Jul 13, 2016 at 02:38:16PM +0200, Daniel Vetter wrote: On Thu, Jun 30, 2016 at 04:12:49PM +0100, Dave Gordon wrote: Precursor for fix to secure batch execution. We will need to be able to retrieve the batch VMA (as well as the batch itself) from

Re: [Intel-gfx] ✗ Ro.CI.BAT: warning for drm/i915/guc: Protect against HAS_GUC_* returning true values other than one (rev4)

2016-07-14 Thread Dave Gordon
On 13/07/16 14:38, Patchwork wrote: == Series Details == Series: drm/i915/guc: Protect against HAS_GUC_* returning true values other than one (rev4) URL : https://patchwork.freedesktop.org/series/9473/ State : warning == Summary == Series 9473v4 drm/i915/guc: Protect against HAS_GUC_* retur

[Intel-gfx] [CI resend 2/2] drm/i915: refactor eb_get_batch()

2016-07-14 Thread Dave Gordon
"list_entry(eb->vmas.prev, ...)" in the old version of eb_get_batch() with the equivalent but more explicit "list_last_entry(&eb->vmas,...)" in the new eb_get_batch_vma() and of course add an explanatory comment. Signed-off-by: Dave Gordon Reviewed-by: D

[Intel-gfx] [CI resend 1/2] drm/i915: compile-time consistency check on __EXEC_OBJECT flags

2016-07-14 Thread Dave Gordon
d in i915_drm.h, and they start from the LSB and work up. Other flags are defined in i915_gem_execbuffer, for internal use within that file only; they start from the MSB and work down. So here we add a compile-time check that the two sets of flags do not overlap, which would cause all sorts of confus

Re: [Intel-gfx] [PATCH 3/6] drm/i915/huc: Add HuC fw loading support

2016-07-14 Thread Dave Gordon
On 13/07/16 13:48, Daniel Vetter wrote: On Thu, Jun 23, 2016 at 02:52:41PM +0100, Peter Antoine wrote: On Thu, 23 Jun 2016, Dave Gordon wrote: On 22/06/16 09:31, Daniel Vetter wrote: No, the *correct* fix is to unify all the firmware loaders we have. There should just be ONE piece of code that

Re: [Intel-gfx] [PATCH 3/6] drm/i915/huc: Add HuC fw loading support

2016-07-14 Thread Dave Gordon
On 14/07/16 15:16, Daniel Vetter wrote: On Wed, Jul 13, 2016 at 03:52:39PM +0100, Peter Antoine wrote: On Wed, 13 Jul 2016, Daniel Vetter wrote: On Thu, Jun 23, 2016 at 02:52:41PM +0100, Peter Antoine wrote: On Thu, 23 Jun 2016, Dave Gordon wrote: On 22/06/16 09:31, Daniel Vetter wrote: No

Re: [Intel-gfx] [PATCH 3/6] drm/i915/huc: Add HuC fw loading support

2016-07-15 Thread Dave Gordon
On 14/07/16 15:26, Daniel Vetter wrote: On Thu, Jul 14, 2016 at 03:08:41PM +0100, Dave Gordon wrote: On 13/07/16 13:48, Daniel Vetter wrote: On Thu, Jun 23, 2016 at 02:52:41PM +0100, Peter Antoine wrote: On Thu, 23 Jun 2016, Dave Gordon wrote: On 22/06/16 09:31, Daniel Vetter wrote: No, the

Re: [Intel-gfx] [PATCH 2/2] drm/i915: refactor eb_get_batch()

2016-07-15 Thread Dave Gordon
On 14/07/16 15:03, Chris Wilson wrote: On Thu, Jul 14, 2016 at 02:12:55PM +0100, Dave Gordon wrote: On 13/07/16 13:44, Chris Wilson wrote: On Wed, Jul 13, 2016 at 02:38:16PM +0200, Daniel Vetter wrote: On Thu, Jun 30, 2016 at 04:12:49PM +0100, Dave Gordon wrote: Precursor for fix to secure

Re: [Intel-gfx] ✗ Ro.CI.BAT: failure for series starting with [CI,resend,1/2] drm/i915: compile-time consistency check on __EXEC_OBJECT flags

2016-07-15 Thread Dave Gordon
On 15/07/16 09:15, Patchwork wrote: == Series Details == Series: series starting with [CI,resend,1/2] drm/i915: compile-time consistency check on __EXEC_OBJECT flags URL : https://patchwork.freedesktop.org/series/9876/ State : failure == Summary == Series 9876v1 Series without cover letter

Re: [Intel-gfx] [PATCH] drm/i915: Use SSE4.1 movntdqa to accelerate reads from WC memory

2016-07-18 Thread Dave Gordon
On 18/07/16 12:35, Chris Wilson wrote: On Mon, Jul 18, 2016 at 12:15:32PM +0100, Tvrtko Ursulin wrote: I am not sure about this, but looking at the raid6 for example, it has a lot more annotations in cases like this. It seems to be telling the compiler which memory ranges does each instruction

Re: [Intel-gfx] ✗ Ro.CI.BAT: failure for drm/i915: Treat eDP as always connected, again

2016-07-18 Thread Dave Gordon
On 18/07/16 13:29, Daniel Vetter wrote: On Mon, Jul 18, 2016 at 11:43:08AM -, Patchwork wrote: == Series Details == Series: drm/i915: Treat eDP as always connected, again URL : https://patchwork.freedesktop.org/series/9977/ State : failure == Summary == Series 9977v1 drm/i915: Treat eDP

Re: [Intel-gfx] ✗ Ro.CI.BAT: failure for drm/i915: Treat eDP as always connected, again

2016-07-18 Thread Dave Gordon
On 18/07/16 13:50, Dave Gordon wrote: On 18/07/16 13:29, Daniel Vetter wrote: On Mon, Jul 18, 2016 at 11:43:08AM -, Patchwork wrote: == Series Details == Series: drm/i915: Treat eDP as always connected, again URL : https://patchwork.freedesktop.org/series/9977/ State : failure

Re: [Intel-gfx] [PATCH] drm/i915: Use SSE4.1 movntdqa to accelerate reads from WC memory

2016-07-18 Thread Dave Gordon
On 18/07/16 13:56, Tvrtko Ursulin wrote: On 18/07/16 12:57, Dave Gordon wrote: On 18/07/16 12:35, Chris Wilson wrote: On Mon, Jul 18, 2016 at 12:15:32PM +0100, Tvrtko Ursulin wrote: I am not sure about this, but looking at the raid6 for example, it has a lot more annotations in cases like

Re: [Intel-gfx] [PATCH] drm/i915: Use SSE4.1 movntdqa to accelerate reads from WC memory

2016-07-18 Thread Dave Gordon
On 18/07/16 16:06, Tvrtko Ursulin wrote: On 18/07/16 14:46, Tvrtko Ursulin wrote: [snip] This version generates the smallest code: static void __memcpy_ntdqa(struct qw2 *dst, const struct qw2 *src, unsigned long len) { unsigned long l4; kernel_fpu_begin(); l4 = len

[Intel-gfx] [CI-RESEND 1/3] drm: extra printk() wrapper macros

2016-07-19 Thread Dave Gordon
underlying macro that does all the token-pasting. DRM_ERROR is unchanged, as it's not just a printk wrapper. v2: Fix whitespace, missing ## (Eric Engestrom) Signed-off-by: Dave Gordon Reviewed-by: Eric Engestrom --- include/drm/drmP.h | 26 -- 1 file change

[Intel-gfx] [CI-RESEND 3/3] drm/i915/guc: revisit GuC loader message levels

2016-07-19 Thread Dave Gordon
Some downgraded from DRM_ERROR() to DRM_WARN() or DRM_NOTE(), a few upgraded from DRM_INFO() to DRM_NOTE() or DRM_WARN(), and one eliminated completely. v2: different permutation of levels :) Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/intel_guc_loader.c | 34

[Intel-gfx] [CI-RESEND 2/3] drm/i915/guc: downgrade some DRM_ERROR() messages to DRM_WARN()

2016-07-19 Thread Dave Gordon
Where we're going to continue regardless of the problem, rather than fail, then the message should be a WARNing rather than an ERROR. Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/i915_guc_submission.c | 18 +++--- 1 file changed, 7 insertions(+), 11 deletions(-) diff --

[Intel-gfx] [PATCH 1/5] drm/i915/guc: doorbell reset should avoid used doorbells

2016-07-19 Thread Dave Gordon
abled, avoiding those that are marked as in use by any client. Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/i915_guc_submission.c | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c

[Intel-gfx] [PATCH 3/5] drm/i915/guc: use a separate GuC client for each engine

2016-07-19 Thread Dave Gordon
workqueue slots. Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/i915_debugfs.c| 25 - drivers/gpu/drm/i915/i915_guc_submission.c | 35 +++--- drivers/gpu/drm/i915/intel_guc.h | 2 +- 3 files changed, 42 insertions(+), 20

[Intel-gfx] [PATCH 4/5] drm/i915/guc: add engine mask to GuC client & pass to GuC

2016-07-19 Thread Dave Gordon
e that the client is associated with. Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/i915_guc_submission.c | 15 ++- drivers/gpu/drm/i915/intel_guc.h | 3 ++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drive

[Intel-gfx] [PATCH 2/5] drm/i915/guc: refactor guc_init_doorbell_hw()

2016-07-19 Thread Dave Gordon
Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/i915_guc_submission.c | 54 +- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c index d8402e4..dc5f485 100644

[Intel-gfx] [PATCH 5/5] drm/i915/guc: use for_each_engine_id() where appropriate

2016-07-19 Thread Dave Gordon
ore than once or twice, hopefully eliminating memory references. Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/i915_debugfs.c| 17 + drivers/gpu/drm/i915/i915_guc_submission.c | 22 +- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a

Re: [Intel-gfx] [PATCH v2] i915: fix build error with -Werror

2016-07-19 Thread Dave Gordon
On 19/07/16 08:05, Daniel Vetter wrote: On Mon, Jul 04, 2016 at 11:30:06AM -0400, Jeff Mahoney wrote: This fixes the following build error with -Werror and gcc 6.1: drivers/gpu/drm/i915/i915_debugfs.c:2103:6: error: suggest explicit braces to avoid ambiguous 'else' [-Werror=parentheses] Signe

Re: [Intel-gfx] ✓ Ro.CI.BAT: success for series starting with [CI-RESEND,1/3] drm: extra printk() wrapper macros

2016-07-19 Thread Dave Gordon
On 19/07/16 14:53, Patchwork wrote: == Series Details == Series: series starting with [CI-RESEND,1/3] drm: extra printk() wrapper macros URL : https://patchwork.freedesktop.org/series/10036/ State : success == Summary == Series 10036v1 Series without cover letter http://patchwork.freedesktop

Re: [Intel-gfx] ✗ Ro.CI.BAT: failure for series starting with [1/5] drm/i915/guc: doorbell reset should avoid used doorbells

2016-07-19 Thread Dave Gordon
On 19/07/16 15:16, Patchwork wrote: == Series Details == Series: series starting with [1/5] drm/i915/guc: doorbell reset should avoid used doorbells URL : https://patchwork.freedesktop.org/series/10040/ State : failure == Summary == Series 10040v1 Series without cover letter http://patchwor

Re: [Intel-gfx] [PATCH 3/5] drm/i915/guc: use a separate GuC client for each engine

2016-07-19 Thread Dave Gordon
On 19/07/16 16:02, Tvrtko Ursulin wrote: On 19/07/16 13:59, Dave Gordon wrote: When using a single GuC client for multiple engines, the i915 driver has to merge all work items into a single work queue, which the GuC firmware then demultiplexes into separate submission queues per engine. In

Re: [Intel-gfx] [CI-RESEND 3/3] drm/i915/guc: revisit GuC loader message levels

2016-07-19 Thread Dave Gordon
On 19/07/16 15:26, Tvrtko Ursulin wrote: On 19/07/16 13:20, Dave Gordon wrote: Some downgraded from DRM_ERROR() to DRM_WARN() or DRM_NOTE(), a few upgraded from DRM_INFO() to DRM_NOTE() or DRM_WARN(), and one eliminated completely. v2: different permutation of levels :) Signed-off-by: Dave

[Intel-gfx] [PATCH v3 3/3] drm/i915/guc: revisit GuC loader message levels

2016-07-19 Thread Dave Gordon
sulin]. Signed-off-by: Dave Gordon Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/intel_guc_loader.c | 34 - 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.

[Intel-gfx] [PATCH v3 1/3] drm: extra printk() wrapper macros

2016-07-19 Thread Dave Gordon
underlying macro that does all the token-pasting. DRM_ERROR is unchanged, as it's not just a printk wrapper. v2: Fix whitespace, missing ## (Eric Engestrom) Signed-off-by: Dave Gordon Reviewed-by: Eric Engestrom Cc: dri-de...@lists.freedesktop.org --- include/drm/drmP.h

[Intel-gfx] [PATCH v3 2/3] drm/i915/guc: downgrade some DRM_ERROR() messages to DRM_WARN()

2016-07-19 Thread Dave Gordon
Where we're going to continue regardless of the problem, rather than fail, then the message should be a WARNing rather than an ERROR. Signed-off-by: Dave Gordon Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_guc_submission.c | 18 +++--- 1 file changed, 7 inser

Re: [Intel-gfx] [PATCH 12/13] drm/i915: Consolidate legacy semaphore initialization

2016-07-19 Thread Dave Gordon
On 15/07/16 14:13, Tvrtko Ursulin wrote: On 29/06/16 17:00, Chris Wilson wrote: On Wed, Jun 29, 2016 at 04:41:58PM +0100, Tvrtko Ursulin wrote: On 29/06/16 16:34, Chris Wilson wrote: On Wed, Jun 29, 2016 at 04:09:31PM +0100, Tvrtko Ursulin wrote: From: Tvrtko Ursulin Replace per-engine in

Re: [Intel-gfx] [PATCH] drm/i915: Remove misleading CSR firmware loading docs

2016-07-19 Thread Dave Gordon
On 14/07/16 15:15, Daniel Vetter wrote: I forgot to remove these when reworking the firmware loading sequence last year. The new sequence is that we load firmware, and if it's not there we entirely (and permanently) fail dmc setup. Reported-by: Dave Gordon Signed-off-by: Daniel V

Re: [Intel-gfx] [PATCH 3/9] drm/i915: Wrap drm_gem_object_lookup in i915_gem_object_lookup

2016-07-20 Thread Dave Gordon
drm_gem_object_lookup(file_priv, - put_image_rec->bo_handle)); - if (&new_bo->base == NULL) { + new_bo = i915_gem_object_lookup(file_priv, put_image_rec->bo_handle); + if (!new_bo) { ret = -ENOENT; goto out_free; } LGTM. Reviewed-by: Dave Gordon ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH 4/9] drm/i915: Wrap drm_gem_object_reference in i915_gem_object_get

2016-07-20 Thread Dave Gordon
ary->state)); - work->pending_flip_obj = obj; + work->pending_flip_obj = i915_gem_object_get(obj); ret = i915_mutex_lock_interruptible(dev); if (ret) This last one moves the point at which the reference is taken past several function calls; is that intentional, or at least harmless? With that answered, then Reviewed-by: Dave Gordon ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH 5/9] drm/i915: Rename drm_gem_object_unreference in preparation for lockless free

2016-07-20 Thread Dave Gordon
On 20/07/16 12:43, Joonas Lahtinen wrote: On ke, 2016-07-20 at 09:59 +0100, Chris Wilson wrote: diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c index 605c69658d2c..75a1496ceb6f 100644 --- a/drivers/gpu/drm/i915/intel_guc_loader.c +++ b/drivers/gpu

Re: [Intel-gfx] [PATCH 8/9] drm/i915: Rename ring->virtual_start as ring->vaddr

2016-07-20 Thread Dave Gordon
| 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) Just mechanical transformations with no issues that I can see, so Reviewed-by: Dave Gordon diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 38d9ae90b613..0fef5cda4aca 100644 --- a/drivers/gpu/drm/i915

Re: [Intel-gfx] [PATCH 12/13] drm/i915: Consolidate legacy semaphore initialization

2016-07-20 Thread Dave Gordon
On 20/07/16 10:54, Tvrtko Ursulin wrote: On 19/07/16 19:38, Dave Gordon wrote: On 15/07/16 14:13, Tvrtko Ursulin wrote: On 29/06/16 17:00, Chris Wilson wrote: On Wed, Jun 29, 2016 at 04:41:58PM +0100, Tvrtko Ursulin wrote: On 29/06/16 16:34, Chris Wilson wrote: On Wed, Jun 29, 2016 at 04

Re: [Intel-gfx] ✗ Ro.CI.BAT: failure for series starting with [1/2] drm/i915/gen9: Add WaInPlaceDecompressionHang

2016-07-20 Thread Dave Gordon
On 20/07/16 13:50, Chris Wilson wrote: On Wed, Jul 20, 2016 at 03:49:00PM +0300, Joonas Lahtinen wrote: On ke, 2016-07-20 at 12:05 +, Patchwork wrote: == Series Details == Series: series starting with [1/2] drm/i915/gen9: Add WaInPlaceDecompressionHang URL : https://patchwork.freedesktop

Re: [Intel-gfx] [PATCH 03/18] drm/i915: Rename backpointer from intel_ringbuffer to intel_engine_cs

2016-07-20 Thread Dave Gordon
On 20/07/16 14:11, Chris Wilson wrote: Having ringbuf->ring point to an engine is confusing, so rename it once again to ring->engine. Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/intel_ringbuffer.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) Doesn't do what i

Re: [Intel-gfx] [PATCH 02/18] drm/i915: Rename request->ringbuf to request->ring

2016-07-20 Thread Dave Gordon
On 20/07/16 14:11, Chris Wilson wrote: Now that we have disambuigated ring and engine, we can use the clearer and more consistent name for the intel_ringbuffer pointer in the request. Signed-off-by: Chris Wilson You missed a few instances of 'ring' meaning engine: i915_gem_execbuffer.c:

Re: [Intel-gfx] [PATCH 02/18] drm/i915: Rename request->ringbuf to request->ring

2016-07-20 Thread Dave Gordon
On 20/07/16 15:12, Dave Gordon wrote: On 20/07/16 14:11, Chris Wilson wrote: Now that we have disambuigated ring and engine, we can use the clearer and more consistent name for the intel_ringbuffer pointer in the request. Signed-off-by: Chris Wilson You missed a few instances of '

Re: [Intel-gfx] ✗ Ro.CI.BAT: failure for series starting with [CI,1/9] drm/i915: Rename request reference/unreference to get/put

2016-07-20 Thread Dave Gordon
On 20/07/16 14:02, Patchwork wrote: == Series Details == Series: series starting with [CI,1/9] drm/i915: Rename request reference/unreference to get/put URL : https://patchwork.freedesktop.org/series/10089/ State : failure == Summary == Series 10089v1 Series without cover letter http://patc

Re: [Intel-gfx] [PATCH 12/13] drm/i915: Consolidate legacy semaphore initialization

2016-07-20 Thread Dave Gordon
On 20/07/16 17:07, Tvrtko Ursulin wrote: On 20/07/16 13:50, Dave Gordon wrote: On 20/07/16 10:54, Tvrtko Ursulin wrote: On 19/07/16 19:38, Dave Gordon wrote: On 15/07/16 14:13, Tvrtko Ursulin wrote: On 29/06/16 17:00, Chris Wilson wrote: On Wed, Jun 29, 2016 at 04:41:58PM +0100, Tvrtko

[Intel-gfx] Reduce usage of the name 'ring' for engines et al

2016-07-20 Thread Dave Gordon
Chris Wilson is trying to convert 'ringbuffer' to 'ring', but at present there's rather too much legacy code using 'ring' for various other things, usually engines or engine-ids. This patchset converts some of them (but not as yet the gpu_error or trace code). Chris: what is your prefered name for

[Intel-gfx] [PATCH 1/3] drm/i915: rename macro parameter(ring) to (engine)

2016-07-20 Thread Dave Gordon
'ring' is an old deprecated term for a GPU engine. Here we make the terminology more consistent by renaming the 'ring' parameter of lots of macros that calculate addresses within the MMIO space of an engine. Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/i91

[Intel-gfx] [PATCH 3/3] drm/i915: rename & update eb_select_ring()

2016-07-20 Thread Dave Gordon
&engine); - if (ret) - return ret; with + engine = eb_select_engine(dev_priv, file, args); + if (!engine) + return -EINVAL; for increased clarity and maybe save a few cycles too. Signed-off-by: Dave Gordon --- drivers/gpu/drm/i9

[Intel-gfx] [PATCH 2/3] drm/i915: rename 'ring' where it refers to an engine or engine_id

2016-07-20 Thread Dave Gordon
parameters called 'ring' to either 'engine' or 'engine_id' according to what they actually are. Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/intel_mocs.c | 6 +++--- drivers/gpu/drm/i915/intel_mocs.h | 2 +- drivers/gpu/drm/i915/intel_ri

Re: [Intel-gfx] [PATCH] drm/i915: Replace gen6 semaphore signal table with code

2016-07-21 Thread Dave Gordon
On 21/07/16 10:31, Tvrtko Ursulin wrote: From: Tvrtko Ursulin Static table wastes space for invalid combinations and engines which are not supported by Gen6 (legacy semaphores). Replace it with a function devised by Dave Gordon. I have verified that it generates the same mappings between

[Intel-gfx] [PATCH] drm/i915: use i915_gem_object_put_unlocked() after releasing mutex

2016-07-21 Thread Dave Gordon
splatted in the recent s/drm_gem_object_unreference/i915_gem_object_put/ where the _unlocked suffix was lost in this one case. Also fixes a whitespace glitch introduced in the same commit. Fixes: f8c417cd drm/i915: Rename drm_gem_object_unreference in preparation ... Signed-off-by: Dave Gordon C

Re: [Intel-gfx] [PATCH 07/23] drm/i915: Move HAS_GUC_UCODE definition to platform definition

2016-07-21 Thread Dave Gordon
On 21/07/16 11:38, Tvrtko Ursulin wrote: On 20/07/16 22:07, Rodrigo Vivi wrote: please kill this _ucode variation that is just a alias to guc instead Not sure, it was added with a particular goal. Cc Dave in case he wants to comment. Regards, Tvrtko The comment is already in the source

[Intel-gfx] [PATCH v2] drm/i915: use i915_gem_object_put_unlocked() after releasing mutex

2016-07-21 Thread Dave Gordon
rence in preparation ... Signed-off-by: Dave Gordon Reviewed-by: Chris Wilson --- drivers/gpu/drm/i915/intel_overlay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index 8654a32..c10ce36 100644 -

[Intel-gfx] [PATCH v2 0/6] drm/i915/guc: use one GuC client per GPU engine

2016-07-21 Thread Dave Gordon
workqueue slots. Dave Gordon (6): drm/i915/guc: doorbell reset should avoid used doorbells drm/i915/guc: refactor guc_init_doorbell_hw() drm/i915/guc: use a separate GuC client for each engine drm/i915/guc: add engine mask to GuC client & pass to GuC drm/i915/guc: use for_each_engin

[Intel-gfx] [PATCH v2 1/6] drm/i915/guc: doorbell reset should avoid used doorbells

2016-07-21 Thread Dave Gordon
abled, avoiding those that are marked as in use by any client. Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/i915_guc_submission.c | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c

[Intel-gfx] [PATCH v2 3/6] drm/i915/guc: use a separate GuC client for each engine

2016-07-21 Thread Dave Gordon
workqueue slots. Signed-off-by: Dave Gordon Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_debugfs.c| 25 - drivers/gpu/drm/i915/i915_guc_submission.c | 35 +++--- drivers/gpu/drm/i915/intel_guc.h | 2 +- 3 files changed

[Intel-gfx] [PATCH v2 2/6] drm/i915/guc: refactor guc_init_doorbell_hw()

2016-07-21 Thread Dave Gordon
We have essentially the same code in each of two different loops, so we can refactor it into a little helper function. Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/i915_guc_submission.c | 54 +- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a

[Intel-gfx] [PATCH v2 4/6] drm/i915/guc: add engine mask to GuC client & pass to GuC

2016-07-21 Thread Dave Gordon
e that the client is associated with. Signed-off-by: Dave Gordon Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_guc_submission.c | 15 ++- drivers/gpu/drm/i915/intel_guc.h | 3 ++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/gp

[Intel-gfx] [PATCH v2 5/6] drm/i915/guc: use for_each_engine_id() where appropriate

2016-07-21 Thread Dave Gordon
ore than once or twice, hopefully eliminating memory references. Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/i915_debugfs.c| 17 + drivers/gpu/drm/i915/i915_guc_submission.c | 22 +- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a

[Intel-gfx] [PATCH v2 6/6] drm/i915/guc: re-optimise i915_guc_client layout

2016-07-21 Thread Dave Gordon
As we're tweaking the GuC-related code in debugfs, we can drop the now-used 'q_fail' and repack the structure. Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/i915_debugfs.c | 1 - drivers/gpu/drm/i915/intel_guc.h| 6 ++ 2 files changed, 2 insertions(+), 5 deletions(-

[Intel-gfx] [PATCH v4 0/3] drm/i915/guc: emit (drm) messages at the most appropriate level

2016-07-21 Thread Dave Gordon
A few adjustments to the messages emitted from the driver, promoting or demoting them to the level most suited to the target audience as well as the impact of the thing being reported. Dave Gordon (3): drm: extra printk() wrapper macros drm/i915/guc: downgrade some DRM_ERROR() messages to

[Intel-gfx] [PATCH v4 2/3] drm/i915/guc: downgrade some DRM_ERROR() messages to DRM_WARN()

2016-07-21 Thread Dave Gordon
Where we're going to continue regardless of the problem, rather than fail, then the message should be a WARNing rather than an ERROR. Signed-off-by: Dave Gordon Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_guc_submission.c | 18 +++--- 1 file changed, 7 inser

[Intel-gfx] [PATCH v4 1/3] drm: extra printk() wrapper macros

2016-07-21 Thread Dave Gordon
underlying macro that does all the token-pasting. DRM_ERROR is unchanged, as it's not just a printk wrapper. v2: Fix whitespace, missing ## (Eric Engestrom) Signed-off-by: Dave Gordon Reviewed-by: Eric Engestrom Cc: dri-de...@lists.freedesktop.org --- include/drm/drmP.h

[Intel-gfx] [PATCH v4 3/3] drm/i915/guc: revisit GuC loader message levels

2016-07-21 Thread Dave Gordon
Some downgraded from DRM_ERROR() to DRM_WARN() or DRM_NOTE(), a few upgraded from DRM_INFO() to DRM_NOTE() or DRM_WARN(), and one eliminated completely. v2: different permutation of levels :) v3: convert a couple of "this shouldn't happen" messages to WARN() Signed-off-by: Dave G

Re: [Intel-gfx] [PATCH v2 3/6] drm/i915/guc: use a separate GuC client for each engine

2016-07-22 Thread Dave Gordon
On 21/07/16 19:30, Chris Wilson wrote: On Thu, Jul 21, 2016 at 07:15:39PM +0100, Dave Gordon wrote: When using a single GuC client for multiple engines, the i915 driver has to merge all work items into a single work queue, which the GuC firmware then demultiplexes into separate submission

Re: [Intel-gfx] [PATCH v2 5/6] drm/i915/guc: use for_each_engine_id() where appropriate

2016-07-22 Thread Dave Gordon
On 22/07/16 11:04, Tvrtko Ursulin wrote: On 21/07/16 19:15, Dave Gordon wrote: Now that host structures are indexed by host engine-id rather than guc_id, we can usefully convert some for_each_engine() loops to use for_each_engine_id() and avoid multiple dereferences of engine->id. Also a

Re: [Intel-gfx] [I-G-T] igt/gem_mocs_settings: improve RC6 testings

2016-07-22 Thread Dave Gordon
On 22/07/16 10:40, Antoine, Peter wrote: -Original Message- From: Chris Wilson [mailto:ch...@chris-wilson.co.uk] Sent: Friday, July 22, 2016 10:38 AM To: Antoine, Peter Cc: intel-gfx@lists.freedesktop.org Subject: Re: [I-G-T] igt/gem_mocs_settings: improve RC6 testings On Thu, Jul 21,

Re: [Intel-gfx] ✗ Ro.CI.BAT: failure for drm/i915/guc: emit (drm) messages at the most appropriate level

2016-07-22 Thread Dave Gordon
On 22/07/16 07:25, Patchwork wrote: == Series Details == Series: drm/i915/guc: emit (drm) messages at the most appropriate level URL : https://patchwork.freedesktop.org/series/10150/ State : failure == Summary == Series 10150v1 drm/i915/guc: emit (drm) messages at the most appropriate level

Re: [Intel-gfx] [PATCH v3] drm/i915: Replace gen6 semaphore signal table with code

2016-07-22 Thread Dave Gordon
space for invalid combinations and engines which are not supported by Gen6 (legacy semaphores). Replace it with a function devised by Dave Gordon. I have verified that it generates the same mappings between mbox selectors and signalling registers. So just how big was that table? How big are the

[Intel-gfx] [PATCH v3 4/4] drm/i915/guc: use symbolic names in setting defaults for module parameters

2016-07-22 Thread Dave Gordon
Of course, this also re-enables GuC loading and submission by default on suitable platforms, since it's Intel's Plan of Record that GuC submission shall be used where available. Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/i915_params.c | 6 +++--- 1 file changed, 3 insert

[Intel-gfx] [PATCH v3 1/4] drm/i915/guc: symbolic names for GuC submission preferences

2016-07-22 Thread Dave Gordon
names for the values representing the DEFAULT, DISABLED, PREFERRED, and MANDATORY submission options that the user can select (-1, 0, 1, 2 respectively). This should produce identical code to the previous version! Signed-off-by: Dave Gordon Cc: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_guc_su

[Intel-gfx] [PATCH v3 0/4] drm/i915/guc: use symbolic names for module parameter values

2016-07-22 Thread Dave Gordon
added (3/4 Re-enable GuC loading & submission (4/4) Added cover letter :) Dave Gordon (4): drm/i915/guc: symbolic names for GuC submission preferences drm/i915/guc: symbolic names for GuC firmare loading preferences drm/i915/guc: symbolic name for GuC log-level none drm/i915/guc:

  1   2   3   4   5   6   7   8   9   10   >