Re: [Intel-gfx] drm/i915/watchdog: move emit_stop_watchdog until the very end of the ring commands

2019-01-10 Thread Carlos Santa
On Mon, 2019-01-07 at 12:50 +, Tvrtko Ursulin wrote: > On 05/01/2019 02:40, Carlos Santa wrote: > > From: Michel Thierry > > > > On command streams that could potentially hang the GPU after a last > > flush command, it's best not to cancel the watchdog &

Re: [Intel-gfx] drm/i915: Watchdog timeout: IRQ handler for gen8+

2019-01-10 Thread Carlos Santa
On Mon, 2019-01-07 at 16:58 +, Tvrtko Ursulin wrote: > On 07/01/2019 13:57, Chris Wilson wrote: > > Quoting Tvrtko Ursulin (2019-01-07 13:43:29) > > > > > > On 07/01/2019 11:58, Tvrtko Ursulin wrote: > > > > > > [snip] > > > > > > > > Note about future interaction with preemption: Preemption

Re: [Intel-gfx] drm/i915: Watchdog timeout: IRQ handler for gen8+

2019-01-23 Thread Carlos Santa
On Mon, 2019-01-07 at 11:58 +, Tvrtko Ursulin wrote: [snip] > > > > > > static void gen8_gt_irq_ack(struct drm_i915_private *i915, > > @@ -3329,7 +3332,7 @@ void i915_handle_error(struct > > drm_i915_private *dev_priv, > > if (intel_has_reset_engine(dev_priv) && > > !i915_te

Re: [Intel-gfx] drm/i915: Only process VCS2 only when supported

2019-01-23 Thread Carlos Santa
On Mon, 2019-01-07 at 12:40 +, Tvrtko Ursulin wrote: > On 05/01/2019 02:39, Carlos Santa wrote: > > Not checking for BSD2 causes a segfault on GPU revs > > with no h/w support for the extra media engines. > > > > Segfault on ULX GT2 (0x591e) follows: > > >

Re: [Intel-gfx] [PATCH v5 3/5] drm/i915: Watchdog timeout: Ringbuffer command emission for gen8+

2019-04-01 Thread Carlos Santa
On Sat, 2019-03-30 at 09:01 +, Chris Wilson wrote: > Quoting Carlos Santa (2019-03-22 23:41:16) > > From: Michel Thierry > > > > Emit the required commands into the ring buffer for starting and > > stopping the watchdog timer before/after batch buffer start during

[Intel-gfx] [PATCH 11/23] drm/i915: Move HAS_RC6p definition to platform definition

2016-07-20 Thread Carlos Santa
Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH 17/23] drm/i915: Introduce GEN3_FEATURES for device info

2016-07-20 Thread Carlos Santa
Based on the GEN7_FEATURES changes from Ben W. Use it for i915g, i915gm, i945g, i945gm, g33 and pineview. Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_pci.c | 58 - 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/drivers/gpu

[Intel-gfx] [PATCH 13/23] drm/i915: Introduce GEN5_FEATURES for device info

2016-07-20 Thread Carlos Santa
Based on the GEN7_FEATURES changes from Ben W. Use it for ilk. Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_pci.c | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index

[Intel-gfx] [PATCH 08/23] drm/i915: Move HAS_GUC_SCHED definition to platform definition

2016-07-20 Thread Carlos Santa
Moving all GPU features to the platform definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH 16/23] drm/i915: Introduce GEN4_FEATURES for device info

2016-07-20 Thread Carlos Santa
Based on the GEN7_FEATURES changes from Ben W. Use it for i965g, i965gm, g45,and gm45. Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_pci.c | 51 ++--- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_pci.c

[Intel-gfx] [PATCH 20/23] drm/i915: Move HAS_HW_CONTEXTS definition to platform

2016-07-20 Thread Carlos Santa
Moving all GPU features to the platform definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumpig struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH 22/23] drm/i915: Move HAS_L3_DPF definition to platform definition

2016-07-20 Thread Carlos Santa
Moving all GPU features to the platform definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH 23/23] drm/i915: Move HAS_GMCH_DISPLAY definition to platform

2016-07-20 Thread Carlos Santa
Moving all GPU features to the platform definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 4

[Intel-gfx] [PATCH 03/23] drm/i915: Move HAS_RUNTIME_PM definition to platform

2016-07-20 Thread Carlos Santa
Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 6

[Intel-gfx] [PATCH 05/23] drm/i915: Move HAS_CSR definition to platform definition

2016-07-20 Thread Carlos Santa
Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH 12/23] drm/i915: Move HAS_DP_MST definition to platform definition

2016-07-20 Thread Carlos Santa
Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 5

[Intel-gfx] [PATCH 18/23] drm/i915: Introduce GEN2 FEATURES for device info

2016-07-20 Thread Carlos Santa
Based on the GEN7_FEATURES changes from Ben W. Use it for 830, 845g, i85x, i865g. Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_pci.c | 33 + 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers

[Intel-gfx] [PATCH 04/23] drm/i915: Move HAS_CORE_RING_FREQ definition to platform definition

2016-07-20 Thread Carlos Santa
Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 5

[Intel-gfx] [PATCH 01/23] drm/i915: Move HAS_PSR definition to platform struct definition

2016-07-20 Thread Carlos Santa
[patch series] Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definition Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h

[Intel-gfx] [PATCH 14/23] drm/i915: Move HAS_AUX_IRQ definition to platform definition

2016-07-20 Thread Carlos Santa
Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH 00/23] drm/i915: Organize most GPU features by platform

2016-07-20 Thread Carlos Santa
definitions. The list of the features that were converted to a device_info flag include: PSR, RUNTIME_PM, CORE_RING_FREQ, CSR, GUC, GUC_UCODE, GUC_SCHED, RESOURCE_STREAMER, RC6, RC6p, DP_MST, GMBUS_IRQ, FW_BLC, HW_CONTEXTS, LOGICAL_RING_CONTEXTS, L3_DPF, and GMCH_DISPLAY. Carlos

[Intel-gfx] [PATCH 21/23] drm/i915: Move HAS_LOGICAL_RING_CONTEXTS definition to platform definition

2016-07-20 Thread Carlos Santa
Moving all GPU features to the platform definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH 15/23] drm/i915: Move HAS_GMBUS_IRQ definition to platform definition

2016-07-20 Thread Carlos Santa
Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH 19/23] drm/915: Move HAS_FW_BLC definition to platform

2016-07-20 Thread Carlos Santa
Moving all GPU features to the platform definition allows for - standard placae when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH 02/23] drm/i915: Introduce GEN6_FEATURES for device info

2016-07-20 Thread Carlos Santa
Based on the GEN7_FEATURES changes from Ben W. Use it for snb. Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_pci.c | 26 -- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c

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

2016-07-20 Thread Carlos Santa
Moving all GPU features to the platform definition allows for - standard place when adding new features from new platforms - possible to see supported featurs when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH 09/23] drm/i915: Move HAS_RESOURCE_STREAMER definition to platform definition

2016-07-20 Thread Carlos Santa
Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 4

[Intel-gfx] [PATCH 10/23] drm/i915: Move HAS_RC6 definition to platform definition

2016-07-20 Thread Carlos Santa
Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH 06/23] drm/i915: Move HAS_GUC definition to platform definition

2016-07-20 Thread Carlos Santa
Moving all GPU features to the platform definition allows for - standard place when adding new features from new platform - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH v2 00/21] drm/i915: Organize most GPU features by platform

2016-07-28 Thread Carlos Santa
device info" - Introduce GEN2 features, fix a minor bug with num_pipes - Patch 10: "drm/i915: Move HAS_L3_DPF definition to platform definition" - Fix which platforms actually support this feature Carlos Santa (21): drm/i915: Move HAS_PSR definition to platform struct definit

[Intel-gfx] [PATCH v2 03/21] drm/i915: Move HAS_RUNTIME_PM definition to platform

2016-07-28 Thread Carlos Santa
Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa Reviewed-by: Rodrigo Vivi --- drivers/gpu

[Intel-gfx] [PATCH v2 07/21] drm/i915: Move HAS_RESOURCE_STREAMER definition to platform definition

2016-07-28 Thread Carlos Santa
Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa Reviewed-by: Rodrigo Vivi --- drivers/gpu

[Intel-gfx] [PATCH v2 06/21] drm/i915: Move HAS_CSR definition to platform definition

2016-07-28 Thread Carlos Santa
Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH v2 12/21] drm/i915: Move HAS_AUX_IRQ definition to platform definition

2016-07-28 Thread Carlos Santa
Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH v2 13/21] drm/i915: Move HAS_GMBUS_IRQ definition to platform definition

2016-07-28 Thread Carlos Santa
Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH v2 02/21] drm/i915: Introduce GEN6_FEATURES for device info

2016-07-28 Thread Carlos Santa
Based on the GEN7_FEATURES changes from Ben W. Use it for snb. Signed-off-by: Carlos Santa Reviewed-by: Rodrigo Vivi --- drivers/gpu/drm/i915/i915_pci.c | 26 -- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers

[Intel-gfx] [PATCH v2 09/21] drm/i915: Move HAS_RC6p definition to platform definition

2016-07-28 Thread Carlos Santa
Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH v2 10/21] drm/i915: Move HAS_DP_MST definition to platform definition

2016-07-28 Thread Carlos Santa
Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 4

[Intel-gfx] [PATCH v2 15/21] drm/i965: Make GEN4_FEATURES inherit from GEN3

2016-07-28 Thread Carlos Santa
Introduce GEN3_FEATURES and make GEN4 inherit from it so that we can reduce code duplication. Use GEN3 for i915g, i915gm, i945g, i945gm, g33 and pnv. Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_pci.c | 49 ++--- 1 file changed, 21 insertions

[Intel-gfx] [PATCH v2 01/21] drm/i915: Move HAS_PSR definition to platform struct definition

2016-07-28 Thread Carlos Santa
[patch series] Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definition Signed-off-by: Carlos Santa Reviewed-by: Rodrigo Vivi --- drivers

[Intel-gfx] [PATCH v2 04/21] drm/i915: Move HAS_CORE_RING_FREQ definition to platform definition

2016-07-28 Thread Carlos Santa
Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 5

[Intel-gfx] [PATCH v2 08/21] drm/i915: Move HAS_RC6 definition to platform definition

2016-07-28 Thread Carlos Santa
Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH v2 05/21] drm/i915: Make GEN7_FEATURES inherit from GEN6

2016-07-28 Thread Carlos Santa
By making GEN7_FEATURES inherit from GEN6_FEATURES we can reduce code duplication. Also, disable Runtime PM for IVB and add a FIXME comment. Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_pci.c | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu

[Intel-gfx] [PATCH v2 14/21] drm/i915: Introduce GEN4_FEATURES for device info

2016-07-28 Thread Carlos Santa
Based on the GEN7_FEATURES changes from Ben W. Use it for i965g, i965gm, g45 and gm45. Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_pci.c | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_pci.c b

[Intel-gfx] [PATCH v2 21/21] drm/i915: Move HAS_GMCH_DISPLAY definition to platform

2016-07-28 Thread Carlos Santa
Moving all GPU features to the platform definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 4

[Intel-gfx] [PATCH v2 16/21] drm/i915: Introduce GEN2_FEATURES for device info

2016-07-28 Thread Carlos Santa
Based on the GEN7_FEATURES changes from Ben W. Use it for 830, 845g, i85x, i865g. Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_pci.c | 33 ++--- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers

[Intel-gfx] [PATCH v2 18/21] drm/i915: Move HAS_HW_CONTEXTS definition to platform

2016-07-28 Thread Carlos Santa
Moving all GPU features to the platform definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH v2 19/21] drm/i915: Move HAS_LOGICAL_RING_CONTEXTS definition to platform

2016-07-28 Thread Carlos Santa
Moving all GPU features to the platform definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa Reviewed-by: Rodrigo Vivi --- drivers/gpu/drm

[Intel-gfx] [PATCH v2 11/21] drm/i915: Make GEN6_FEATURES inherit from GEN5

2016-07-28 Thread Carlos Santa
Introduce GEN5_FEATURES and make GEN6 inherit from it so that we can reduce code duplication. Use GEN5_FEATURES for ilk. Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_pci.c | 28 +--- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/drivers

[Intel-gfx] [PATCH v2 17/21] drm/i915: Move HAS_FW_BLC definition to platform

2016-07-28 Thread Carlos Santa
Moving all GPU features to the platform definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH v2 20/21] drm/i915: Move HAS_L3_DPF definition to platform definition

2016-07-28 Thread Carlos Santa
Moving all GPU features to the platform definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH v2 1/6] drm/i915: Add engine reset count in get-reset-stats ioctl

2019-02-12 Thread Carlos Santa
y. v3: Keep rejecting attempts to use pad as input (Antonio) v4: Rebased. v5: Rebased. Cc: Chris Wilson Cc: Mika Kuoppala Cc: Antonio Argenziano Cc: Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_gem_context.c | 12 ++-- in

[Intel-gfx] [PATCH v2 2/6] drm/i915: Watchdog timeout: IRQ handler for gen8+

2019-02-12 Thread Carlos Santa
c: Antonio Argenziano Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 8 +++ drivers/gpu/drm/i915/i915_gpu_error.h | 4 ++ drivers/gpu/drm/i915/i915_irq.c | 12 +++- drivers/gpu/drm/i915/i915_reg.h | 6

[Intel-gfx] [PATCH v2 6/6] drm/i915: Watchdog timeout: Blindly trust watchdog timeout for reset?

2019-02-12 Thread Carlos Santa
the hang by itself later on (I'm inclined to this). But the other option is to blindly trust the HW, which is what this patch does... v1: Rebase. CC: Antonio Argenziano Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/intel_hangcheck.

[Intel-gfx] [PATCH v2 0/6] Gen8+ GPU Watchdog Reset Support

2019-02-12 Thread Carlos Santa
This is a rebased on the original patch series from Michel Thierry that can be found here: https://patchwork.freedesktop.org/series/21868 Note that this series is only limited to the GPU Watchdog timeout for execlists as it leaves out support for GuC based submission for a later time. PATCH v2 o

[Intel-gfx] [PATCH v2 4/6] drm/i915: Watchdog timeout: DRM kernel interface to set the timeout

2019-02-12 Thread Carlos Santa
o Spurio Signed-off-by: Michel Thierry Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 50 +- drivers/gpu/drm/i915/i915_gem_context.c | 91 + include/uapi/drm/i915_drm.h | 1 + 3 files changed, 141 insertions(+), 1 deletion(-

[Intel-gfx] [PATCH v2 5/6] drm/i915: Watchdog timeout: Include threshold value in error state

2019-02-12 Thread Carlos Santa
From: Michel Thierry Save the watchdog threshold (in us) as part of the engine state. v2: Only do it for gen8+ (and prevent a missing-case warn). v3: use ctx->__engine. v4: Rebase. v5: Rebase. Cc: Antonio Argenziano Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Car

[Intel-gfx] [PATCH v2 3/6] drm/i915: Watchdog timeout: Ringbuffer command emission for gen8+

2019-02-12 Thread Carlos Santa
Tvrtko) Replace flag watchdog_running with enable_watchdog (Tvrtko) Cc: Chris Wilson Cc: Antonio Argenziano Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_gem_context.h | 4 ++ drivers/gpu/drm/i915/intel_engine_cs.c | 2 + d

[Intel-gfx] [PATCH v3 1/6] drm/i915: Add engine reset count in get-reset-stats ioctl

2019-02-13 Thread Carlos Santa
y. v3: Keep rejecting attempts to use pad as input (Antonio) v4: Rebased. v5: Rebased. Cc: Chris Wilson Cc: Mika Kuoppala Cc: Antonio Argenziano Cc: Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_gem_context.c | 12 ++-- in

[Intel-gfx] [PATCH v3 5/6] drm/i915: Watchdog timeout: Include threshold value in error state

2019-02-13 Thread Carlos Santa
From: Michel Thierry Save the watchdog threshold (in us) as part of the engine state. v2: Only do it for gen8+ (and prevent a missing-case warn). v3: use ctx->__engine. v4: Rebase. v5: Rebase. Cc: Antonio Argenziano Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Car

[Intel-gfx] [PATCH v3 0/6] GEN8+ GPU Watchdog Reset Support

2019-02-13 Thread Carlos Santa
This is a rebased on the original patch series from Michel Thierry that can be found here: https://patchwork.freedesktop.org/series/21868 Note that this series is only limited to the GPU Watchdog timeout for execlists as it leaves out support for GuC based submission for a later time. PATCH v3 o

[Intel-gfx] [PATCH v3 6/6] drm/i915: Watchdog timeout: Blindly trust watchdog timeout for reset?

2019-02-13 Thread Carlos Santa
the hang by itself later on (I'm inclined to this). But the other option is to blindly trust the HW, which is what this patch does... v1: Rebase. CC: Antonio Argenziano Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/intel_hangcheck.

[Intel-gfx] [PATCH v3 3/6] drm/i915: Watchdog timeout: Ringbuffer command emission for gen8+

2019-02-13 Thread Carlos Santa
Tvrtko) Replace flag watchdog_running with enable_watchdog (Tvrtko) Emit a single MI_NOOP by conditionally checking whether the # of emitted OPs is odd (Tvrtko) Cc: Chris Wilson Cc: Antonio Argenziano Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Carlos

[Intel-gfx] [PATCH v3 4/6] drm/i915: Watchdog timeout: DRM kernel interface to set the timeout

2019-02-13 Thread Carlos Santa
o Spurio Signed-off-by: Michel Thierry Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 50 +- drivers/gpu/drm/i915/i915_gem_context.c | 91 + include/uapi/drm/i915_drm.h | 1 + 3 files changed, 141 insertions(+), 1 deletion(-

[Intel-gfx] [PATCH v3 2/6] drm/i915: Watchdog timeout: IRQ handler for gen8+

2019-02-13 Thread Carlos Santa
ke all engines checks all class based checks (Tvrtko) Cc: Antonio Argenziano Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 8 +++ drivers/gpu/drm/i915/i915_gpu_error.h | 4 ++ drivers/gpu/drm/i915/i915_irq.c

[Intel-gfx] [PATCH v4 4/5] drm/i915: Watchdog timeout: DRM kernel interface to set the timeout

2019-02-20 Thread Carlos Santa
o Spurio Signed-off-by: Michel Thierry Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 50 +- drivers/gpu/drm/i915/i915_gem_context.c | 91 + include/uapi/drm/i915_drm.h | 1 + 3 files changed, 141 insertions(+), 1 deletion(-

[Intel-gfx] [PATCH v4 1/5] drm/i915: Add engine reset count in get-reset-stats ioctl

2019-02-20 Thread Carlos Santa
y. v3: Keep rejecting attempts to use pad as input (Antonio) v4: Rebased. v5: Rebased. Cc: Chris Wilson Cc: Mika Kuoppala Cc: Antonio Argenziano Cc: Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_gem_context.c | 12 ++-- in

[Intel-gfx] [PATCH v4 2/5] drm/i915: Watchdog timeout: IRQ handler for gen8+

2019-02-20 Thread Carlos Santa
ke all engines checks all class based checks (Tvrtko) Cc: Antonio Argenziano Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 8 +++ drivers/gpu/drm/i915/i915_gpu_error.h | 4 ++ drivers/gpu/drm/i915/i915_irq.c

[Intel-gfx] [PATCH v4 3/5] drm/i915: Watchdog timeout: Ringbuffer command emission for gen8+

2019-02-20 Thread Carlos Santa
Tvrtko) Replace flag watchdog_running with enable_watchdog (Tvrtko) Emit a single MI_NOOP by conditionally checking whether the # of emitted OPs is odd (Tvrtko) Cc: Chris Wilson Cc: Antonio Argenziano Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Carlos

[Intel-gfx] [PATCH v4 5/5] drm/i915: Watchdog timeout: Include threshold value in error state

2019-02-20 Thread Carlos Santa
From: Michel Thierry Save the watchdog threshold (in us) as part of the engine state. v2: Only do it for gen8+ (and prevent a missing-case warn). v3: use ctx->__engine. v4: Rebase. v5: Rebase. Cc: Antonio Argenziano Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Car

[Intel-gfx] [PATCH v4 0/5] GEN8+ GPU Watchdog Reset Support

2019-02-20 Thread Carlos Santa
This is a rebased on the original patch series from Michel Thierry that can be found here: https://patchwork.freedesktop.org/series/21868 Note that this series is only limited to the GPU Watchdog timeout for execlists as it leaves out support for GuC based submission for a later time. PATCH v4 o

[Intel-gfx] drm/i915: Replace global_seqno with a hangcheck heartbeat seqno

2019-02-20 Thread Carlos Santa
From: Chris Wilson To determine whether an engine has 'stuck', we simply check whether or not is still on the same seqno for several seconds. To keep this simple mechanism intact over the loss of a global seqno, we can simply add a new global heartbeat seqno instead. As we cannot know the sequenc

Re: [Intel-gfx] [PATCH v4 2/5] drm/i915: Watchdog timeout: IRQ handler for gen8+

2019-02-28 Thread Carlos Santa
On Thu, 2019-02-28 at 17:38 +, Tvrtko Ursulin wrote: > On 21/02/2019 02:58, Carlos Santa wrote: > > From: Michel Thierry > > > > *** General *** > > > > Watchdog timeout (or "media engine reset") is a feature that allows > > userland applicat

Re: [Intel-gfx] [PATCH v4 2/5] drm/i915: Watchdog timeout: IRQ handler for gen8+

2019-03-01 Thread Carlos Santa
On Fri, 2019-03-01 at 09:36 +, Chris Wilson wrote: > Quoting Carlos Santa (2019-02-21 02:58:16) > > +#define GEN8_WATCHDOG_1000US(dev_priv) > > watchdog_to_clock_counts(dev_priv, 1000) > > +static void gen8_watchdog_irq_handler(unsigned long data) > > +{ > &g

[Intel-gfx] drm/i915: Watchdog timeout: DRM kernel interface to set the timeout

2019-01-04 Thread Carlos Santa
, Update UAPI to use engine class while keeping thresholds per engine class (Michel). Cc: Antonio Argenziano Cc: Tvrtko Ursulin Cc: Daniele Ceraolo Spurio Signed-off-by: Michel Thierry Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 56 +++

[Intel-gfx] Gen8+ engine-reset

2019-01-04 Thread Carlos Santa
/pull/429/files The testbed used on this series included a SKL-based NUC with 2 BSD rings as well as a KBL-based Chromebook with a 1 BSD ring. Carlos Santa (1): drm/i915: Only process VCS2 only when supported Michel Thierry (7): drm/i915: Add engine reset count in get-reset-stats ioctl

[Intel-gfx] drm/i915: Only process VCS2 only when supported

2019-01-04 Thread Carlos Santa
: 02c0 [ 468.628088] ---[ end trace a7a497ddeb44bcf8 ]--- Tested-by: Carlos Santa Cc: Tvrtko Ursulin Cc: Antonio Argenziano Cc: Michel Thierry Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_irq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm

[Intel-gfx] drm/i915: Watchdog timeout: Blindly trust watchdog timeout for reset?

2019-01-04 Thread Carlos Santa
the hang by itself later on (I'm inclined to this). But the other option is to blindly trust the HW, which is what this patch does... CC: Antonio Argenziano Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/intel_hangcheck.c | 3 ++- 1

[Intel-gfx] drm/i915: Watchdog timeout: Include threshold value in error state

2019-01-04 Thread Carlos Santa
From: Michel Thierry Save the watchdog threshold (in us) as part of the engine state. v2: Only do it for gen8+ (and prevent a missing-case warn). v3: use ctx->__engine. v4: Rebase. Cc: Antonio Argenziano Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Carlos Sa

[Intel-gfx] drm/i915: Watchdog timeout: IRQ handler for gen8+

2019-01-04 Thread Carlos Santa
n (no longer in execlists struct). v10: Rebase. Cc: Antonio Argenziano Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_gpu_error.h | 4 ++ drivers/gpu/drm/i915/i915_irq.c | 14 +++- drivers/gpu/drm/i915/i915_reg.h

[Intel-gfx] drm/i915: Watchdog timeout: Ringbuffer command emission for gen8+

2019-01-04 Thread Carlos Santa
cmd size in emit_stop_watchdog. (Chris) v4: Rebase. v5: use to_intel_context instead of ctx->engine. v6: Rebase. Cc: Chris Wilson Cc: Antonio Argenziano Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_gem_context.h | 4 ++ drivers/g

[Intel-gfx] drm/i915/watchdog: move emit_stop_watchdog until the very end of the ring commands

2019-01-04 Thread Carlos Santa
From: Michel Thierry On command streams that could potentially hang the GPU after a last flush command, it's best not to cancel the watchdog until after all commands have executed. Patch shared by Michel Thierry through IIRC after reproduction on my local setup. Tested-by: Carlos Sant

[Intel-gfx] drm/i915: Add engine reset count in get-reset-stats ioctl

2019-01-04 Thread Carlos Santa
y. v3: Keep rejecting attempts to use pad as input (Antonio) v4: Rebased. Cc: Chris Wilson Cc: Mika Kuoppala Cc: Antonio Argenziano Cc: Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_gem_context.c | 12 ++-- include/uap

Re: [Intel-gfx] [PATCH v4 1/5] drm/i915: Add engine reset count in get-reset-stats ioctl

2019-03-06 Thread Carlos Santa
On Mon, 2019-02-25 at 13:34 +, Tvrtko Ursulin wrote: > On 21/02/2019 02:58, Carlos Santa wrote: > > From: Michel Thierry > > > > Users/tests relying on the total reset count will start seeing a > > smaller > > number since most of the hangs can be handled

Re: [Intel-gfx] [PATCH v4 2/5] drm/i915: Watchdog timeout: IRQ handler for gen8+

2019-03-07 Thread Carlos Santa
On Fri, 2019-03-01 at 09:36 +, Chris Wilson wrote: > > > Quoting Carlos Santa (2019-02-21 02:58:16) > > +#define GEN8_WATCHDOG_1000US(dev_priv) > > watchdog_to_clock_counts(dev_priv, 1000) > > +static void gen8_watchdog_irq_handler(unsigned long data) > > +{ &

Re: [Intel-gfx] [PATCH v4 2/5] drm/i915: Watchdog timeout: IRQ handler for gen8+

2019-03-17 Thread Carlos Santa
On Mon, 2019-03-11 at 10:39 +, Tvrtko Ursulin wrote: > On 08/03/2019 03:16, Carlos Santa wrote: > > On Fri, 2019-03-01 at 09:36 +, Chris Wilson wrote: > > > > > > > > > > Quoting Carlos Santa (2019-02-21 02:58:16) > &g

Re: [Intel-gfx] [PATCH v4 2/5] drm/i915: Watchdog timeout: IRQ handler for gen8+

2019-03-19 Thread Carlos Santa
On Tue, 2019-03-19 at 12:46 +, Tvrtko Ursulin wrote: > On 19/03/2019 12:39, Tvrtko Ursulin wrote: > > > > On 18/03/2019 00:15, Carlos Santa wrote: > > > On Mon, 2019-03-11 at 10:39 +, Tvrtko Ursulin wrote: > > > > On 08/03/2019 03:16, Carlos Santa wrote

[Intel-gfx] [PATCH v5 0/5] GEN8+ GPU Watchdog Reset Support

2019-03-22 Thread Carlos Santa
This is a rebased on the original patch series from Michel Thierry: https://patchwork.freedesktop.org/series/21868 Note that this series is only limited to the GPU Watchdog timeout for execlists as it leaves out support for GuC based submissions for later. PATCH v5 of this series was tested from

[Intel-gfx] [PATCH v5 4/5] drm/i915: Watchdog timeout: DRM kernel interface to set the timeout

2019-03-22 Thread Carlos Santa
use it (Tvrtko) Let the compiler takes care of inlines (Tvrtko) Make watchdog_to_clock_counts more robust (Tvrtko) Cc: Antonio Argenziano Cc: Tvrtko Ursulin Cc: Daniele Ceraolo Spurio Signed-off-by: Michel Thierry Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h

[Intel-gfx] [PATCH v5 5/5] drm/i915: Watchdog timeout: Include threshold value in error state

2019-03-22 Thread Carlos Santa
-by: Michel Thierry Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_gpu_error.c | 14 ++ drivers/gpu/drm/i915/i915_gpu_error.h | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.

[Intel-gfx] [PATCH v5 2/5] drm/i915: Watchdog timeout: IRQ handler for gen8+

2019-03-22 Thread Carlos Santa
Rebase, skip checking for the guilty seqno in the tasklet (Tvrtko) Cc: Antonio Argenziano Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_gpu_error.h | 4 ++ drivers/gpu/drm/i915/i915_irq.c | 14 -- driver

[Intel-gfx] [PATCH v5 1/5] drm/i915: Add engine reset count in get-reset-stats ioctl

2019-03-22 Thread Carlos Santa
y. v3: Keep rejecting attempts to use pad as input (Antonio) v4: Rebased. v5: Rebased. Get rid of the union to store pad/engine count (Chris) Cc: Chris Wilson Cc: Mika Kuoppala Cc: Antonio Argenziano Cc: Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Carlos Santa --- dr

[Intel-gfx] [PATCH v5 3/5] drm/i915: Watchdog timeout: Ringbuffer command emission for gen8+

2019-03-22 Thread Carlos Santa
Tvrtko) Replace flag watchdog_running with enable_watchdog (Tvrtko) Emit a single MI_NOOP by conditionally checking whether the # of emitted OPs is odd (Tvrtko) v8: Rebase Cc: Chris Wilson Cc: Antonio Argenziano Cc: Tvrtko Ursulin Signed-off-by: Michel Thierry Signed-off-by: Carlos

Re: [Intel-gfx] [PATCH v5 2/5] drm/i915: Watchdog timeout: IRQ handler for gen8+

2019-03-26 Thread Carlos Santa
On Mon, 2019-03-25 at 10:00 +, Tvrtko Ursulin wrote: > On 22/03/2019 23:41, Carlos Santa wrote: > > From: Michel Thierry > > > > *** General *** > > > > Watchdog timeout (or "media engine reset") is a feature that allows > > userland applicat

[Intel-gfx] [PATCH v3 03/21] drm/i915: Introduce GEN6_FEATURES for device info

2016-08-09 Thread Carlos Santa
Based on the GEN7_FEATURES changes from Ben W. Use it for snb. Signed-off-by: Carlos Santa Reviewed-by: Rodrigo Vivi --- drivers/gpu/drm/i915/i915_pci.c | 26 -- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers

[Intel-gfx] [PATCH v3 06/21] drm/i915 Move HAS_CSR definition to platform definition

2016-08-09 Thread Carlos Santa
Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH v3 07/21] drm/i915: Move HAS_RESOURCE_STREAMER definition to platform definition

2016-08-09 Thread Carlos Santa
Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 4

[Intel-gfx] [PATCH v3 15/21] drm/i915: Introduce GEN2_FEATURES for device info

2016-08-09 Thread Carlos Santa
Based on the GEN7_FEATURES changes from Ben W. Use it for 830, 845g, i85x, i865g. Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_pci.c | 37 - 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_pci.c b

[Intel-gfx] [PATCH v3 08/21] drm/i915: Move HAS_RC6 definition to platform definition

2016-08-09 Thread Carlos Santa
Moving all GPU features to the platform struct definition allows for - standard place when adding new features from new platforms - possible to see supported features when dumping struct definitions Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_drv.h | 3

[Intel-gfx] [PATCH v3 05/21] drm/i915: Get rid of HAS_CORE_RING_FREQ

2016-08-09 Thread Carlos Santa
No need for HAS_CORE_RING_FREQ as that flag is actually the same as .has_llc. Feedback from V. Syrjala. Signed-off-by: Carlos Santa --- drivers/gpu/drm/i915/i915_debugfs.c | 3 ++- drivers/gpu/drm/i915/i915_drv.h | 4 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a

  1   2   >