Gen8 Engine reset preparatory patches
Subsystems (2)
cover Gen8 Engine reset preparatory patches
First batch of prep patches for Engine reset feature available from Gen8 onwards. The reset code is recently prep'd to support this feature, now others can follow now.
Arun Siluvery (2):
drm/i915/tdr: Prepare error handler to accept mask of hung engines drm/i915: Update i915.reset to handle engine resets
Tomas Elf (1):
drm/i915/tdr: Initialize hangcheck struct for each engine
drivers/gpu/drm/i915/i915_dma.c | 12 ++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 5 +++-- drivers/gpu/drm/i915/i915_gpu_error.c | 8 ++++---- drivers/gpu/drm/i915/i915_irq.c | 16 ++++++++-------- drivers/gpu/drm/i915/i915_params.c | 6 +++--- drivers/gpu/drm/i915/i915_params.h | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 7 ++++++- 8 files changed, 38 insertions(+), 20 deletions(-)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/3 drm/i915/tdr: Initialize hangcheck struct for each engine
From: Tomas Elf <[email protected]>
Initialize hangcheck struct during driver load. Since we do the same after recovering from a reset, this is extracted into a helper function.
--- drivers/gpu/drm/i915/i915_dma.c | 12 ++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_lrc.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 7 ++++++- 4 files changed, 20 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +12 -0
@@ -945,6 +945,16 @@ static void intel_init_dpio(struct drm_i915_private *dev_priv) } } +static void i915_hangcheck_init (struct drm_device *dev) +{ +int i; +struct intel_engine_cs *engine; +struct drm_i915_private *dev_priv = dev->dev_private; + +for_each_engine (engine, dev_priv, i) +intel_engine_init_hangcheck (engine); +} +static int i915_workqueues_init (struct drm_i915_private *dev_priv) {/*
@@ -1233,6 +1243,8 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)i915_gem_load_init_fences (dev_priv); +i915_hangcheck_init (dev); +/* On the 945G/GM, the chipset reports the MSI capability on the * integrated graphics even though the support isn't actually there * according to the published specs. It doesn't appear to function
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -2718,6 +2718,7 @@ extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,extern int intel_gpu_reset (struct drm_device *dev,u32 engine_mask);extern bool intel_has_gpu_reset (struct drm_device *dev);extern int i915_reset (struct drm_device *dev); +extern void intel_engine_init_hangcheck (struct intel_engine_cs *engine);extern unsigned long i915_chipset_val (struct drm_i915_private *dev_priv);extern unsigned long i915_mch_val (struct drm_i915_private *dev_priv);extern unsigned long i915_gfx_val (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_lrc.c +1 -1
@@ -1606,7 +1606,7 @@ static int gen8_init_common_ring(struct intel_engine_cs *engine) engine->next_context_status_buffer = next_context_status_buffer_hw;DRM_DEBUG_DRIVER ("Execlists enabled for %s\n" , engine->name); -memset (&engine->hangcheck,0 ,sizeof (engine->hangcheck)); +intel_engine_init_hangcheck (engine);return 0 ; }
drivers/gpu/drm/i915/intel_ringbuffer.c +6 -1
@@ -555,6 +555,11 @@ static bool stop_ring(struct intel_engine_cs *engine)return (I915_READ_HEAD (engine) &HEAD_ADDR ) ==0 ; } +void intel_engine_init_hangcheck (struct intel_engine_cs *engine) +{ +memset (&engine->hangcheck,0 ,sizeof (engine->hangcheck)); +} +static int init_ring_common (struct intel_engine_cs *engine) {struct drm_device *dev = engine->dev;
@@ -634,7 +639,7 @@ static int init_ring_common(struct intel_engine_cs *engine) ringbuf->tail =I915_READ_TAIL (engine) &TAIL_ADDR ;intel_ring_update_space (ringbuf); -memset (&engine->hangcheck,0 ,sizeof (engine->hangcheck)); +intel_engine_init_hangcheck (engine); out:intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/3] drm/i915/tdr: Initialize hangcheck struct for each engine
Quoted 37 lines · Arun Siluvery
From: Tomas Elf <[email protected]>
Initialize hangcheck struct during driver load. Since we do the same after recovering from a reset, this is extracted into a helper function.
Cc Mika Kuoppala <[email protected]>Signed-off-by Tomas Elf <[email protected]>Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_dma.c | 12 ++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_lrc.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 7 ++++++- 4 files changed, 20 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_dma.c +10
-0@@ -945,6 +945,16 @@ static void intel_init_dpio(struct drm_i915_private *dev_priv) } } +static void i915_hangcheck_init (struct drm_device *dev) +{ +int i; +struct intel_engine_cs *engine; +struct drm_i915_private *dev_priv = dev->dev_private; + +for_each_engine (engine, dev_priv, i) +intel_engine_init_hangcheck (engine); +} +static int i915_workqueues_init (struct drm_i915_private *dev_priv) {/*
drivers/gpu/drm/i915/i915_dma.c static int i915_driver_init_hw(struct drm_i915_private *dev_priv) · line 1246
Quoted 4 lines
drivers/gpu/drm/i915/i915_dma.c +1
-0@@ -1233,6 +1243,8 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)i915_gem_load_init_fences (dev_priv); +i915_hangcheck_init (dev);
This is tautological. If we are clearing the per-engine hangcheck in ring->init_hw() then we will do later anyway. So why now? -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/3] drm/i915/tdr: Initialize hangcheck struct for each engine
Quoted 39 lines · Chris Wilson
Quoted 38 lines · Arun Siluvery
From: Tomas Elf <[email protected]>
Initialize hangcheck struct during driver load. Since we do the same after recovering from a reset, this is extracted into a helper function.
Cc Mika Kuoppala <[email protected]>Signed-off-by Tomas Elf <[email protected]>Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_dma.c | 12 ++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_lrc.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 7 ++++++- 4 files changed, 20 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_dma.c +10
-0@@ -945,6 +945,16 @@ static void intel_init_dpio(struct drm_i915_private *dev_priv) } } +static void i915_hangcheck_init (struct drm_device *dev) +{ +int i; +struct intel_engine_cs *engine; +struct drm_i915_private *dev_priv = dev->dev_private; + +for_each_engine (engine, dev_priv, i) +intel_engine_init_hangcheck (engine); +} +static int i915_workqueues_init (struct drm_i915_private *dev_priv) {/* @@ -1233,6 +1243,8 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)
Quoted 6 lines
drivers/gpu/drm/i915/i915_dma.c static int i915_driver_init_hw(struct drm_i915_private *dev_priv) · line 1246
Quoted 3 lines
drivers/gpu/drm/i915/i915_dma.c +1
-0i915_gem_load_init_fences (dev_priv); +i915_hangcheck_init (dev);This is tautological. If we are clearing the per-engine hangcheck in
ring->init_hw()then we will do later anyway. So why now?
It was doing slightly more earlier but now it is not required. The helper function intel_engine_init_hangcheck() also doesn't add much value so this patch can be ignored.
regards
Arun
Quoted 2 lines
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/3] drm/i915/tdr: Initialize hangcheck struct for each engine
Quoted 42 lines · Arun Siluvery
Quoted 41 lines · Chris Wilson
Quoted 40 lines · Arun Siluvery
From: Tomas Elf <[email protected]>
Initialize hangcheck struct during driver load. Since we do the same after recovering from a reset, this is extracted into a helper function.
Cc Mika Kuoppala <[email protected]>Signed-off-by Tomas Elf <[email protected]>Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_dma.c | 12 ++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_lrc.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 7 ++++++- 4 files changed, 20 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_dma.c +10
-0@@ -945,6 +945,16 @@ static void intel_init_dpio(struct drm_i915_private *dev_priv) } } +static void i915_hangcheck_init (struct drm_device *dev) +{ +int i; +struct intel_engine_cs *engine; +struct drm_i915_private *dev_priv = dev->dev_private; + +for_each_engine (engine, dev_priv, i) +intel_engine_init_hangcheck (engine); +} +static int i915_workqueues_init (struct drm_i915_private *dev_priv) {/* @@ -1233,6 +1243,8 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)i915_gem_load_init_fences (dev_priv);
Quoted 8 lines
Quoted 4 lines
drivers/gpu/drm/i915/i915_dma.c static int i915_driver_init_hw(struct drm_i915_private *dev_priv) · line 1246
Quoted 1 line
drivers/gpu/drm/i915/i915_dma.c +1
-0+i915_hangcheck_init (dev);This is tautological. If we are clearing the per-engine hangcheck in
ring->init_hw()then we will do later anyway. So why now?It was doing slightly more earlier but now it is not required. The helper function
intel_engine_init_hangcheck()also doesn't add much value so this patch can be ignored.
The helper function is ok, it adds a little bit of documentation which is far more meaningful than memset(). I was just wondering if there was an actual requirement I missed for i915_driver_init_hw() to do so, or if there will be.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/1 drm/i915/tdr: Initialize hangcheck struct for each engine
In reply to Arun SiluveryFrom: Tomas Elf <[email protected]>
Initialize hangcheck struct during driver load. Since we do the same after recovering from a reset, this is extracted into a helper function.
v2: remove redundant hangcheck init during load as this is done when engines are initialized (Chris)
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_lrc.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 7 ++++++- 3 files changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -2718,6 +2718,7 @@ extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,extern int intel_gpu_reset (struct drm_device *dev,u32 engine_mask);extern bool intel_has_gpu_reset (struct drm_device *dev);extern int i915_reset (struct drm_device *dev); +extern void intel_engine_init_hangcheck (struct intel_engine_cs *engine);extern unsigned long i915_chipset_val (struct drm_i915_private *dev_priv);extern unsigned long i915_mch_val (struct drm_i915_private *dev_priv);extern unsigned long i915_gfx_val (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_lrc.c +1 -1
@@ -1606,7 +1606,7 @@ static int gen8_init_common_ring(struct intel_engine_cs *engine) engine->next_context_status_buffer = next_context_status_buffer_hw;DRM_DEBUG_DRIVER ("Execlists enabled for %s\n" , engine->name); -memset (&engine->hangcheck,0 ,sizeof (engine->hangcheck)); +intel_engine_init_hangcheck (engine);return 0 ; }
drivers/gpu/drm/i915/intel_ringbuffer.c +6 -1
@@ -555,6 +555,11 @@ static bool stop_ring(struct intel_engine_cs *engine)return (I915_READ_HEAD (engine) &HEAD_ADDR ) ==0 ; } +void intel_engine_init_hangcheck (struct intel_engine_cs *engine) +{ +memset (&engine->hangcheck,0 ,sizeof (engine->hangcheck)); +} +static int init_ring_common (struct intel_engine_cs *engine) {struct drm_device *dev = engine->dev;
@@ -634,7 +639,7 @@ static int init_ring_common(struct intel_engine_cs *engine) ringbuf->tail =I915_READ_TAIL (engine) &TAIL_ADDR ;intel_ring_update_space (ringbuf); -memset (&engine->hangcheck,0 ,sizeof (engine->hangcheck)); +intel_engine_init_hangcheck (engine); out:intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2] drm/i915/tdr: Initialize hangcheck struct for each engine
Quoted 11 lines · Arun Siluvery
From: Tomas Elf <[email protected]>
Initialize hangcheck struct during driver load. Since we do the same after recovering from a reset, this is extracted into a helper function.
v2: remove redundant hangcheck init during load as this is done when engines are initialized (Chris)
Cc Mika Kuoppala <[email protected]>Signed-off-by Tomas Elf <[email protected]>Signed-off-by Arun Siluvery <[email protected]>
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/3 drm/i915/tdr: Prepare error handler to accept mask of hung engines
In reply to Arun SiluveryIn preparation for engine reset, the wedged argument of i915_handle_error() is extended to reflect as a mask of engines that are hung. This is further passed down to error state capture functions which are also updated.
Engine reset recovery mechanism uses this mask and schedules recovery work for those particular engines.
--- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- drivers/gpu/drm/i915/i915_gpu_error.c | 8 ++++---- drivers/gpu/drm/i915/i915_irq.c | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -2735,7 +2735,7 @@ bool intel_hpd_pin_to_port(enum hpd_pin pin, enum port *port);/* i915_irq.c */ void i915_queue_hangcheck (struct drm_device *dev); __printf(3, 4) -void i915_handle_error (struct drm_device *dev,bool wedged, +void i915_handle_error (struct drm_device *dev,u32 engine_mask,const char *fmt, ...);extern void intel_irq_init (struct drm_i915_private *dev_priv);
@@ -3321,7 +3321,7 @@ static inline void i915_error_state_buf_release( {kfree (eb->buf); } -void i915_capture_error_state (struct drm_device *dev,bool wedge, +void i915_capture_error_state (struct drm_device *dev,u32 engine_mask,const char *error_msg);void i915_error_state_get (struct drm_device *dev,struct i915_error_state_file_priv *error_priv);
drivers/gpu/drm/i915/i915_gpu_error.c +4 -4
@@ -1301,7 +1301,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,static void i915_error_capture_msg (struct drm_device *dev,struct drm_i915_error_state *error, -bool wedged, +u32 engine_mask,const char *error_msg) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1324,7 +1324,7 @@ static void i915_error_capture_msg(struct drm_device *dev,scnprintf (error->error_msg + len,sizeof (error->error_msg) - len,", reason: %s, action: %s" , error_msg, - wedged ?"reset" :"continue" ); + engine_mask ?"reset" :"continue" ); } static void i915_capture_gen_state(struct drm_i915_private *dev_priv,
@@ -1347,7 +1347,7 @@ static void i915_capture_gen_state(struct drm_i915_private *dev_priv,* out a structure which becomes available in debugfs for user level tools * to pick up. */ -void i915_capture_error_state (struct drm_device *dev,bool wedged, +void i915_capture_error_state (struct drm_device *dev,u32 engine_mask,const char *error_msg) {static bool warned;
@@ -1375,7 +1375,7 @@ void i915_capture_error_state(struct drm_device *dev, bool wedged, error->overlay =intel_overlay_capture_error_state (dev); error->display =intel_display_capture_error_state (dev); -i915_error_capture_msg (dev, error, wedged, error_msg); +i915_error_capture_msg (dev, error, engine_mask, error_msg);DRM_INFO ("%s\n" , error->error_msg);spin_lock_irqsave (&dev_priv->gpu_error.lock, flags);
drivers/gpu/drm/i915/i915_irq.c +8 -8
@@ -2653,14 +2653,14 @@ static void i915_report_and_clear_eir(struct drm_device *dev)/** * i915_handle_error - handle a gpu error * @dev: drm device -* +* @engine_mask: mask representing engines that are hung * Do some basic checking of register state at error time and * dump it to the syslog. Also call i915_capture_error_state() to make * sure we get a record and make it available in debugfs. Fire a uevent * so userspace knows something bad happened (should trigger collection * of a ring dump etc.). */ -void i915_handle_error (struct drm_device *dev,bool wedged, +void i915_handle_error (struct drm_device *dev,u32 engine_mask,const char *fmt, ...) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -2671,10 +2671,10 @@ void i915_handle_error(struct drm_device *dev, bool wedged,vscnprintf (error_msg,sizeof (error_msg), fmt, args);va_end (args); -i915_capture_error_state (dev, wedged, error_msg); +i915_capture_error_state (dev, engine_mask, error_msg);i915_report_and_clear_eir (dev); -if (wedged) { +if (engine_mask) {atomic_or (I915_RESET_IN_PROGRESS_FLAG , &dev_priv->gpu_error.reset_counter);
@@ -3033,7 +3033,7 @@ ring_stuck(struct intel_engine_cs *engine, u64 acthd)*/ tmp =I915_READ_CTL (engine);if (tmp &RING_WAIT ) { -i915_handle_error (dev, false, +i915_handle_error (dev,0 ,"Kicking stuck wait on %s" , engine->name);I915_WRITE_CTL (engine, tmp);
@@ -3045,7 +3045,7 @@ ring_stuck(struct intel_engine_cs *engine, u64 acthd)default :return HANGCHECK_HUNG ;case 1 : -i915_handle_error (dev, false, +i915_handle_error (dev,0 ,"Kicking stuck semaphore on %s" , engine->name);I915_WRITE_CTL (engine, tmp);
@@ -3189,12 +3189,12 @@ static void i915_hangcheck_elapsed(struct work_struct *work)DRM_INFO ("%s on %s\n" , stuck[i] ?"stuck" :"no progress" , engine->name); - rings_hung++; + rings_hung |=intel_engine_flag (engine); } }if (rings_hung) { -i915_handle_error (dev, true,"Ring hung" ); +i915_handle_error (dev, rings_hung,"Engine(s) hung" ); goto out; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/3] drm/i915/tdr: Prepare error handler to accept mask of hung engines
Quoted 133 lines · Arun Siluvery
[ text/plain ]
In preparation for engine reset, the wedged argument ofi915_handle_error()is extended to reflect as a mask of engines that are hung. This is further passed down to error state capture functions which are also updated.Engine reset recovery mechanism uses this mask and schedules recovery work for those particular engines.
Cc Chris Wilson <[email protected]>Cc Mika Kuoppala <[email protected]>Signed-off-by Tomas Elf <[email protected]>Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- drivers/gpu/drm/i915/i915_gpu_error.c | 8 ++++---- drivers/gpu/drm/i915/i915_irq.c | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/i915_drv.h +2
-2@@ -2735,7 +2735,7 @@ bool intel_hpd_pin_to_port(enum hpd_pin pin, enum port *port);/* i915_irq.c */ void i915_queue_hangcheck (struct drm_device *dev); __printf(3, 4) -void i915_handle_error (struct drm_device *dev,bool wedged, +void i915_handle_error (struct drm_device *dev,u32 engine_mask,const char *fmt, ...);extern void intel_irq_init (struct drm_i915_private *dev_priv);@@ -3321,7 +3321,7 @@ static inline void i915_error_state_buf_release( {kfree (eb->buf); } -void i915_capture_error_state (struct drm_device *dev,bool wedge, +void i915_capture_error_state (struct drm_device *dev,u32 engine_mask,const char *error_msg);void i915_error_state_get (struct drm_device *dev,struct i915_error_state_file_priv *error_priv);drivers/gpu/drm/i915/i915_gpu_error.c +4
-4@@ -1301,7 +1301,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,static void i915_error_capture_msg (struct drm_device *dev,struct drm_i915_error_state *error, -bool wedged, +u32 engine_mask,const char *error_msg) {struct drm_i915_private *dev_priv = dev->dev_private;@@ -1324,7 +1324,7 @@ static void i915_error_capture_msg(struct drm_device *dev,scnprintf (error->error_msg + len,sizeof (error->error_msg) - len,", reason: %s, action: %s" , error_msg, - wedged ?"reset" :"continue" ); + engine_mask ?"reset" :"continue" ); } static void i915_capture_gen_state(struct drm_i915_private *dev_priv,@@ -1347,7 +1347,7 @@ static void i915_capture_gen_state(struct drm_i915_private *dev_priv,* out a structure which becomes available in debugfs for user level tools * to pick up. */ -void i915_capture_error_state (struct drm_device *dev,bool wedged, +void i915_capture_error_state (struct drm_device *dev,u32 engine_mask,const char *error_msg) {static bool warned;@@ -1375,7 +1375,7 @@ void i915_capture_error_state(struct drm_device *dev, bool wedged, error->overlay =intel_overlay_capture_error_state (dev); error->display =intel_display_capture_error_state (dev); -i915_error_capture_msg (dev, error, wedged, error_msg); +i915_error_capture_msg (dev, error, engine_mask, error_msg);DRM_INFO ("%s\n" , error->error_msg);spin_lock_irqsave (&dev_priv->gpu_error.lock, flags);drivers/gpu/drm/i915/i915_irq.c +6
-6@@ -2653,14 +2653,14 @@ static void i915_report_and_clear_eir(struct drm_device *dev)/** * i915_handle_error - handle a gpu error * @dev: drm device -* +* @engine_mask: mask representing engines that are hung * Do some basic checking of register state at error time and * dump it to the syslog. Also call i915_capture_error_state() to make * sure we get a record and make it available in debugfs. Fire a uevent * so userspace knows something bad happened (should trigger collection * of a ring dump etc.). */ -void i915_handle_error (struct drm_device *dev,bool wedged, +void i915_handle_error (struct drm_device *dev,u32 engine_mask,const char *fmt, ...) {struct drm_i915_private *dev_priv = dev->dev_private;@@ -2671,10 +2671,10 @@ void i915_handle_error(struct drm_device *dev, bool wedged,vscnprintf (error_msg,sizeof (error_msg), fmt, args);va_end (args); -i915_capture_error_state (dev, wedged, error_msg); +i915_capture_error_state (dev, engine_mask, error_msg);i915_report_and_clear_eir (dev); -if (wedged) { +if (engine_mask) {atomic_or (I915_RESET_IN_PROGRESS_FLAG , &dev_priv->gpu_error.reset_counter);@@ -3033,7 +3033,7 @@ ring_stuck(struct intel_engine_cs *engine, u64 acthd)*/ tmp =I915_READ_CTL (engine);if (tmp &RING_WAIT ) { -i915_handle_error (dev, false, +i915_handle_error (dev,0 ,"Kicking stuck wait on %s" , engine->name);I915_WRITE_CTL (engine, tmp);@@ -3045,7 +3045,7 @@ ring_stuck(struct intel_engine_cs *engine, u64 acthd)default :return HANGCHECK_HUNG ;case 1 : -i915_handle_error (dev, false, +i915_handle_error (dev,0 ,"Kicking stuck semaphore on %s" , engine->name);I915_WRITE_CTL (engine, tmp);
drivers/gpu/drm/i915/i915_irq.c static void i915_hangcheck_elapsed(struct work_struct *work) · line 3192
Quoted 5 lines
drivers/gpu/drm/i915/i915_irq.c +1
-1@@ -3189,12 +3189,12 @@ static void i915_hangcheck_elapsed(struct work_struct *work)DRM_INFO ("%s on %s\n" , stuck[i] ?"stuck" :"no progress" , engine->name); - rings_hung++; + rings_hung |=intel_engine_flag (engine);
We can change the int to u32 when we rename rings_hung to engines_hung.
Quoted 11 lines
drivers/gpu/drm/i915/i915_irq.c +1
-1} }if (rings_hung) { -i915_handle_error (dev, true,"Ring hung" ); +i915_handle_error (dev, rings_hung,"Engine(s) hung" ); goto out; }Signature · 1 line
1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 drm/i915: Update i915.reset to handle engine resets
In reply to Arun SiluveryIn preparation for engine reset work update this parameter to handle more than one type of reset. Default at the moment is still full gpu reset.
--- drivers/gpu/drm/i915/i915_params.c | 6 +++--- drivers/gpu/drm/i915/i915_params.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_params.c +3 -3
@@ -45,7 +45,7 @@ struct i915_params i915 __read_mostly = { .fastboot = 0, .prefault_disable = 0, .load_detect_test = 0, - .reset = true, + .reset = 1, .invert_brightness = 0, .disable_display = 0, .enable_cmd_parser = 1,
@@ -108,8 +108,8 @@ MODULE_PARM_DESC(vbt_sdvo_panel_type,"Override/Ignore selection of SDVO panel mode in the VBT " "(-2=ignore, -1=auto [default], index in VBT BIOS table)"); -module_param_named_unsafe (reset, i915.reset, bool,0600 ); -MODULE_PARM_DESC (reset,"Attempt GPU resets (default: true)" ); +module_param_named_unsafe (reset, i915.reset, int,0600 ); +MODULE_PARM_DESC (reset,"Attempt GPU resets (0=disabled, 1=full gpu reset [default], 2=engine reset)" );module_param_named_unsafe (enable_hangcheck, i915.enable_hangcheck, bool,0644 ); MODULE_PARM_DESC(enable_hangcheck,
drivers/gpu/drm/i915/i915_params.h +1 -1
@@ -34,6 +34,7 @@ struct i915_params {int lvds_channel_mode;int panel_use_ssc;int vbt_sdvo_panel_type; +int reset;int enable_rc6;int enable_dc;int enable_fbc;
@@ -55,7 +56,6 @@ struct i915_params {bool fastboot;bool prefault_disable;bool load_detect_test; -bool reset;bool disable_display;bool enable_guc_submission;bool verbose_state_checks;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for Gen8 Engine reset preparatory patches
In reply to Arun Siluvery== Series Details ==
== Series Details ==
Series: Gen8 Engine reset preparatory patches
URL : https://patchwork.freedesktop.org/series/4649/
State : warning
== Summary ==
Series 4649v1 Gen8 Engine reset preparatory patches
http://patchwork.freedesktop.org/api/1.0/series/4649/revisions/1/mbox/
Test gem_ringfill:
Subgroup basic-default-s3:
dmesg-warn -> PASS (bsw-nuc-2)
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
fail -> PASS (byt-nuc)
Test kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-a:
dmesg-warn -> PASS (snb-x220t)
Test pm_rpm:
Subgroup basic-pci-d3-state:
pass -> DMESG-WARN (byt-nuc)
Subgroup basic-rte:
pass -> DMESG-WARN (snb-x220t)
pass -> DMESG-WARN (snb-dellxps)bdw-nuci7 total:194 pass:182 dwarn:0 dfail:0 fail:0 skip:12 bdw-ultra total:194 pass:173 dwarn:0 dfail:0 fail:0 skip:21 bsw-nuc-2 total:194 pass:157 dwarn:0 dfail:0 fail:0 skip:37 byt-nuc total:194 pass:158 dwarn:1 dfail:0 fail:0 skip:35 hsw-brixbox total:194 pass:172 dwarn:0 dfail:0 fail:0 skip:22 hsw-gt2 total:63 pass:56 dwarn:1 dfail:0 fail:0 skip:5 ilk-hp8440p total:194 pass:131 dwarn:0 dfail:0 fail:0 skip:63 ivb-t430s total:194 pass:169 dwarn:0 dfail:0 fail:0 skip:25 skl-i7k-2 total:194 pass:171 dwarn:0 dfail:0 fail:0 skip:23 snb-dellxps total:194 pass:158 dwarn:2 dfail:0 fail:0 skip:34 snb-x220t total:194 pass:159 dwarn:1 dfail:0 fail:1 skip:33
Results at /archive/results/CI_IGT_test/Patchwork_1651/
e7a7673e9840fe8b50a5a2894c75565ec7858a00 drm-intel-nightly: 2016y-03m-19d-10h-09m-53s UTC integration manifest 7c0f4608adca88e892b960731daa63a7e517ae6a drm/i915: Update i915.reset to handle engine resets 6ed4bf4ebc4670b287988f96fa64ea0dfd4a8203 drm/i915/tdr: Prepare error handler to accept mask of hung engines 0bac550038d55cbdf4ccaad57d371a41b22f90e7 drm/i915/tdr: Initialize hangcheck struct for each engine
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: warning for Gen8 Engine reset preparatory patches
Quoted 12 lines · Patchwork
== Series Details ==
Series: Gen8 Engine reset preparatory patches
URL : https://patchwork.freedesktop.org/series/4649/
State : warning== Summary ==
Series 4649v1 Gen8 Engine reset preparatory patches
http://patchwork.freedesktop.org/api/1.0/series/4649/revisions/1/mbox/Test
gem_ringfill:
Quoted 11 lines
Subgroup basic-default-s3:
dmesg-warn -> PASS (bsw-nuc-2)
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
fail -> PASS (byt-nuc)
Test kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-a:
dmesg-warn -> PASS (snb-x220t)
Test pm_rpm:
Subgroup basic-pci-d3-state:
pass -> DMESG-WARN (byt-nuc)unrelated and known issue,
Bug 94164 - [BAT BYT/BSW] pm_rpm@basic-pci-d3-state *ERROR* Unclaimed access detected prior to suspending
https://bugs.freedesktop.org/show_bug.cgi?id=94164
Quoted 3 lines
Subgroup basic-rte:
pass -> DMESG-WARN (snb-x220t)
pass -> DMESG-WARN (snb-dellxps)unrelated and known issue,
Bug 94349 - [SNB HSW BDW BAT IGT] igt/kms_pipe_crc_basic: Device suspended during HW access
https://bugs.freedesktop.org/show_bug.cgi?id=94349
regards
Arun
Quoted 13 lines
bdw-nuci7 total:194 pass:182 dwarn:0 dfail:0 fail:0 skip:12 bdw-ultra total:194 pass:173 dwarn:0 dfail:0 fail:0 skip:21 bsw-nuc-2 total:194 pass:157 dwarn:0 dfail:0 fail:0 skip:37 byt-nuc total:194 pass:158 dwarn:1 dfail:0 fail:0 skip:35 hsw-brixbox total:194 pass:172 dwarn:0 dfail:0 fail:0 skip:22 hsw-gt2 total:63 pass:56 dwarn:1 dfail:0 fail:0 skip:5 ilk-hp8440p total:194 pass:131 dwarn:0 dfail:0 fail:0 skip:63 ivb-t430s total:194 pass:169 dwarn:0 dfail:0 fail:0 skip:25 skl-i7k-2 total:194 pass:171 dwarn:0 dfail:0 fail:0 skip:23 snb-dellxps total:194 pass:158 dwarn:2 dfail:0 fail:0 skip:34 snb-x220t total:194 pass:159 dwarn:1 dfail:0 fail:1 skip:33
Quoted 8 lines
Results at /archive/results/CI_IGT_test/Patchwork_1651/
e7a7673e9840fe8b50a5a2894c75565ec7858a00drm-intel-nightly: 2016y-03m-19d-10h-09m-53s UTC integration manifest7c0f4608adca88e892b960731daa63a7e517ae6adrm/i915: Update i915.reset to handle engine resets6ed4bf4ebc4670b287988f96fa64ea0dfd4a8203drm/i915/tdr: Prepare error handler to accept mask of hung engines0bac550038d55cbdf4ccaad57d371a41b22f90e7drm/i915/tdr: Initialize hangcheck struct for each engine
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: warning for Gen8 Engine reset preparatory patches
In reply to PatchworkQuoted 12 lines · Patchwork
== Series Details ==
Series: Gen8 Engine reset preparatory patches
URL : https://patchwork.freedesktop.org/series/4649/
State : warning== Summary ==
Series 4649v1 Gen8 Engine reset preparatory patches
http://patchwork.freedesktop.org/api/1.0/series/4649/revisions/1/mbox/Test
gem_ringfill:
Quoted 11 lines
Subgroup basic-default-s3:
dmesg-warn -> PASS (bsw-nuc-2)
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
fail -> PASS (byt-nuc)
Test kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-a:
dmesg-warn -> PASS (snb-x220t)
Test pm_rpm:
Subgroup basic-pci-d3-state:
pass -> DMESG-WARN (byt-nuc)unrelated and known issue,
Bug 94164 - [BAT BYT/BSW] pm_rpm@basic-pci-d3-state *ERROR* Unclaimed access detected prior to suspending
https://bugs.freedesktop.org/show_bug.cgi?id=94164
Quoted 3 lines
Subgroup basic-rte:
pass -> DMESG-WARN (snb-x220t)
pass -> DMESG-WARN (snb-dellxps)unrelated and known issue,
Bug 94349 - [SNB HSW BDW BAT IGT] igt/kms_pipe_crc_basic: Device suspended during HW access
https://bugs.freedesktop.org/show_bug.cgi?id=94349
previous reply didn't made it to the list, sending again.
regards
Arun
Quoted 13 lines
bdw-nuci7 total:194 pass:182 dwarn:0 dfail:0 fail:0 skip:12 bdw-ultra total:194 pass:173 dwarn:0 dfail:0 fail:0 skip:21 bsw-nuc-2 total:194 pass:157 dwarn:0 dfail:0 fail:0 skip:37 byt-nuc total:194 pass:158 dwarn:1 dfail:0 fail:0 skip:35 hsw-brixbox total:194 pass:172 dwarn:0 dfail:0 fail:0 skip:22 hsw-gt2 total:63 pass:56 dwarn:1 dfail:0 fail:0 skip:5 ilk-hp8440p total:194 pass:131 dwarn:0 dfail:0 fail:0 skip:63 ivb-t430s total:194 pass:169 dwarn:0 dfail:0 fail:0 skip:25 skl-i7k-2 total:194 pass:171 dwarn:0 dfail:0 fail:0 skip:23 snb-dellxps total:194 pass:158 dwarn:2 dfail:0 fail:0 skip:34 snb-x220t total:194 pass:159 dwarn:1 dfail:0 fail:1 skip:33
Quoted 8 lines
Results at /archive/results/CI_IGT_test/Patchwork_1651/
e7a7673e9840fe8b50a5a2894c75565ec7858a00drm-intel-nightly: 2016y-03m-19d-10h-09m-53s UTC integration manifest7c0f4608adca88e892b960731daa63a7e517ae6adrm/i915: Update i915.reset to handle engine resets6ed4bf4ebc4670b287988f96fa64ea0dfd4a8203drm/i915/tdr: Prepare error handler to accept mask of hung engines0bac550038d55cbdf4ccaad57d371a41b22f90e7drm/i915/tdr: Initialize hangcheck struct for each engine
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for Gen8 Engine reset preparatory patches (rev2)
In reply to Arun Siluvery== Series Details ==
== Series Details ==
Series: Gen8 Engine reset preparatory patches (rev2)
URL : https://patchwork.freedesktop.org/series/4649/
State : warning
== Summary ==
Series 4649v2 Gen8 Engine reset preparatory patches
http://patchwork.freedesktop.org/api/1.0/series/4649/revisions/2/mbox/
Test kms_flip:
Subgroup basic-flip-vs-dpms:
dmesg-warn -> PASS (ilk-hp8440p) UNSTABLE
Subgroup basic-flip-vs-modeset:
pass -> DMESG-WARN (hsw-brixbox)
Subgroup basic-plain-flip:
dmesg-warn -> PASS (bdw-ultra)
Test kms_force_connector_basic:
Subgroup force-connector-state:
pass -> SKIP (ivb-t430s)
Test kms_pipe_crc_basic:
Subgroup hang-read-crc-pipe-b:
pass -> SKIP (hsw-brixbox)
Subgroup suspend-read-crc-pipe-c:
dmesg-warn -> PASS (bsw-nuc-2)
Test pm_rpm:
Subgroup basic-pci-d3-state:
fail -> DMESG-FAIL (snb-x220t)
pass -> DMESG-WARN (snb-dellxps)
Subgroup basic-rte:
pass -> DMESG-WARN (bsw-nuc-2)
dmesg-warn -> PASS (snb-dellxps)
dmesg-warn -> PASS (byt-nuc) UNSTABLEbdw-nuci7 total:192 pass:180 dwarn:0 dfail:0 fail:0 skip:12 bdw-ultra total:192 pass:171 dwarn:0 dfail:0 fail:0 skip:21 bsw-nuc-2 total:192 pass:154 dwarn:1 dfail:0 fail:0 skip:37 byt-nuc total:192 pass:157 dwarn:0 dfail:0 fail:0 skip:35 hsw-brixbox total:192 pass:168 dwarn:1 dfail:0 fail:0 skip:23 ilk-hp8440p total:192 pass:129 dwarn:0 dfail:0 fail:0 skip:63 ivb-t430s total:192 pass:166 dwarn:0 dfail:0 fail:0 skip:26 skl-i5k-2 total:192 pass:169 dwarn:0 dfail:0 fail:0 skip:23 skl-i7k-2 total:192 pass:169 dwarn:0 dfail:0 fail:0 skip:23 snb-dellxps total:192 pass:157 dwarn:1 dfail:0 fail:0 skip:34 snb-x220t total:192 pass:157 dwarn:1 dfail:1 fail:0 skip:33
Results at /archive/results/CI_IGT_test/Patchwork_1666/
4b39223f6e3bef4dfa678f7239dcd87c38e20e96 drm-intel-nightly: 2016y-03m-21d-18h-43m-18s UTC integration manifest 5a5d13e93c178526e252c1d16d1a1a07b5ffbf5e drm/i915: Update i915.reset to handle engine resets b1f9c41920a13427d6c34854f185f651d5906333 drm/i915/tdr: Prepare error handler to accept mask of hung engines 8c44cb0ee612be9e037d40f6391ad622a76d2b36 drm/i915/tdr: Initialize hangcheck struct for each engine
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 5 lines · Arun Siluvery
[ text/plain ]
First batch of prep patches for Engine reset feature available from Gen8 onwards. The reset code is recently prep'd to support this feature, now others can follow now.
Quoted 7 lines
Arun Siluvery (2):
drm/i915/tdr: Prepare error handler to accept mask of hung engines drm/i915: Update i915.reset to handle engine resetsTomas Elf (1):
drm/i915/tdr: Initialize hangcheck struct for each engine
Patches 1/3 [v2] and 2/3 pushed. Thanks for patches and review.
-Mika
Quoted 12 lines
drivers/gpu/drm/i915/i915_dma.c | 12 ++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 5 +++-- drivers/gpu/drm/i915/i915_gpu_error.c | 8 ++++---- drivers/gpu/drm/i915/i915_irq.c | 16 ++++++++-------- drivers/gpu/drm/i915/i915_params.c | 6 +++--- drivers/gpu/drm/i915/i915_params.h | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 7 ++++++- 8 files changed, 38 insertions(+), 20 deletions(-)Signature · 1 line
1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx