drm/i915: Extract register state error capture
Subsystems (2)
PATCH 1/6 drm/i915: Extract register state error capture
The code has become quite hairy. By relocating all the generic registers it will become more obvious where future ones should go. There is still admittedly a bit of confusion left for things like per ring registers.
A subsequent patch will clean this function up.
--- drivers/gpu/drm/i915/i915_gpu_error.c | 77 +++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 34 deletions(-)
drivers/gpu/drm/i915/i915_gpu_error.c +43 -34
@@ -1012,43 +1012,13 @@ static void i915_gem_capture_buffers(struct drm_i915_private *dev_priv, } } -/** -* i915_capture_error_state - capture an error record for later analysis -* @dev: drm device -* -* Should be called when an error is detected (either a hang or an error -* interrupt) to capture error state from the time of the error. Fills -* out a structure which becomes available in debugfs for user level tools -* to pick up. -*/ -void i915_capture_error_state (struct drm_device *dev) +/* Capture all registers which don't fit into another category. */ +static void i915_capture_reg_state (struct drm_i915_private *dev_priv, +struct drm_i915_error_state *error) { -struct drm_i915_private *dev_priv = dev->dev_private; -struct drm_i915_error_state *error; -unsigned long flags; +struct drm_device *dev = dev_priv->dev;int pipe; -spin_lock_irqsave (&dev_priv->gpu_error.lock, flags); - error = dev_priv->gpu_error.first_error; -spin_unlock_irqrestore (&dev_priv->gpu_error.lock, flags); -if (error) -return ; - -/* Account for pipe specific data like PIPE*STAT */ - error =kzalloc (sizeof (*error),GFP_ATOMIC ); -if (!error) { -DRM_DEBUG_DRIVER ("out of memory, not capturing error state\n" ); -return ; - } - -DRM_INFO ("GPU crash dump saved to /sys/class/drm/card%d/error\n" , - dev->primary->index); -DRM_INFO ("GPU hangs can indicate a bug anywhere in the entire gfx stack, including userspace.\n" ); -DRM_INFO ("Please file a _new_ bug report on bugs.freedesktop.org against DRI -> DRM/Intel\n" ); -DRM_INFO ("drm/i915 developers can then reassign to the right component if it's not a kernel issue.\n" ); -DRM_INFO ("The gpu crash dump is required to analyze gpu hangs, so please always attach it.\n" ); - -kref_init (&error->ref); error->eir =I915_READ (EIR ); error->pgtbl_er =I915_READ (PGTBL_ER );if (HAS_HW_CONTEXTS (dev))
@@ -1086,7 +1056,46 @@ void i915_capture_error_state(struct drm_device *dev) error->err_int =I915_READ (GEN7_ERR_INT );i915_get_extra_instdone (dev, error->extra_instdone); +} + +/** +* i915_capture_error_state - capture an error record for later analysis +* @dev: drm device +* +* Should be called when an error is detected (either a hang or an error +* interrupt) to capture error state from the time of the error. Fills +* out a structure which becomes available in debugfs for user level tools +* to pick up. +*/ +void i915_capture_error_state (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +struct drm_i915_error_state *error; +unsigned long flags; + +spin_lock_irqsave (&dev_priv->gpu_error.lock, flags); + error = dev_priv->gpu_error.first_error; +spin_unlock_irqrestore (&dev_priv->gpu_error.lock, flags); +if (error) +return ; + +/* Account for pipe specific data like PIPE*STAT */ + error =kzalloc (sizeof (*error),GFP_ATOMIC ); +if (!error) { +DRM_DEBUG_DRIVER ("out of memory, not capturing error state\n" ); +return ; + } + +DRM_INFO ("GPU crash dump saved to /sys/class/drm/card%d/error\n" , + dev->primary->index); +DRM_INFO ("GPU hangs can indicate a bug anywhere in the entire gfx stack, including userspace.\n" ); +DRM_INFO ("Please file a _new_ bug report on bugs.freedesktop.org against DRI -> DRM/Intel\n" ); +DRM_INFO ("drm/i915 developers can then reassign to the right component if it's not a kernel issue.\n" ); +DRM_INFO ("The gpu crash dump is required to analyze gpu hangs, so please always attach it.\n" ); + +kref_init (&error->ref); +i915_capture_reg_state (dev_priv, error);i915_gem_capture_buffers (dev_priv, error);i915_gem_record_fences (dev, error);i915_gem_record_rings (dev, error);
Signature · 1 line
1.8.5.3
PATCH 2/6 drm/i915: Logically reorder error register capture
Create logical sections in an attempt to clean up, and continue to keep future additions clean.
v2: Reworded the comments. Added section headers (Chris)
--- drivers/gpu/drm/i915/i915_gpu_error.c | 59 +++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/i915_gpu_error.c +36 -23
@@ -1019,41 +1019,54 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,struct drm_device *dev = dev_priv->dev;int pipe; - error->eir =I915_READ (EIR ); - error->pgtbl_er =I915_READ (PGTBL_ER ); -if (HAS_HW_CONTEXTS (dev)) - error->ccid =I915_READ (CCID ); +/* General organization +* 1. Registers specific to a single generation +* 2. Registers which belong to multiple generations +* 3. Feature specific registers. +* 4. Everything else +* Please try to follow the order. +*/ -if (HAS_PCH_SPLIT (dev)) - error->ier =I915_READ (DEIER ) |I915_READ (GTIER ); -else if (IS_VALLEYVIEW (dev)) +/* 1: Registers specific to a single generation */ +if (IS_VALLEYVIEW (dev)) { error->ier =I915_READ (GTIER ) |I915_READ (VLV_IER ); -else if (IS_GEN2 (dev)) - error->ier =I915_READ16 (IER ); -else - error->ier =I915_READ (IER ); + error->forcewake =I915_READ (FORCEWAKE_VLV ); + } -if (INTEL_INFO (dev)->gen >=6 ) - error->derrmr =I915_READ (DERRMR ); +if (IS_GEN7 (dev)) + error->err_int =I915_READ (GEN7_ERR_INT ); -if (IS_VALLEYVIEW (dev)) - error->forcewake =I915_READ (FORCEWAKE_VLV ); -else if (INTEL_INFO (dev)->gen >=7 ) - error->forcewake =I915_READ (FORCEWAKE_MT ); -else if (INTEL_INFO (dev)->gen ==6 ) +if (IS_GEN6 (dev)) error->forcewake =I915_READ (FORCEWAKE ); -if (!HAS_PCH_SPLIT (dev)) -for_each_pipe (pipe) - error->pipestat[pipe] =I915_READ (PIPESTAT (pipe)); +if (IS_GEN2 (dev)) + error->ier =I915_READ16 (IER ); + +/* 2: Registers which belong to multiple generations */ +if (INTEL_INFO (dev)->gen >=7 ) + error->forcewake =I915_READ (FORCEWAKE_MT );if (INTEL_INFO (dev)->gen >=6 ) { + error->derrmr =I915_READ (DERRMR ); error->error =I915_READ (ERROR_GEN6 ); error->done_reg =I915_READ (DONE_REG ); } -if (INTEL_INFO (dev)->gen ==7 ) - error->err_int =I915_READ (GEN7_ERR_INT ); +/* 3: Feature specific registers */ +if (HAS_HW_CONTEXTS (dev)) + error->ccid =I915_READ (CCID ); + +if (HAS_PCH_SPLIT (dev)) + error->ier =I915_READ (DEIER ) |I915_READ (GTIER ); +else { + error->ier =I915_READ (IER ); +for_each_pipe (pipe) + error->pipestat[pipe] =I915_READ (PIPESTAT (pipe)); + } + +/* 4: Everything else */ + error->eir =I915_READ (EIR ); + error->pgtbl_er =I915_READ (PGTBL_ER );i915_get_extra_instdone (dev, error->extra_instdone); }
Signature · 1 line
1.8.5.3
PATCH 3/6 drm/i915: Reorder struct members
In reply to Ben WidawskyThis helps make an upcoming patch a bit more reviewable
--- drivers/gpu/drm/i915/i915_drv.h | 43 ++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +25 -18
@@ -295,14 +295,26 @@ struct intel_display_error_state;struct drm_i915_error_state {struct kref ref; +struct timeval time; + +/* Generic register state */ u32 eir;u32 pgtbl_er;u32 ier;u32 ccid;u32 derrmr;u32 forcewake; -bool waiting[I915_NUM_RINGS ]; +u32 error;/* gen6+ */ +u32 err_int;/* gen7 */ +u32 done_reg; +u32 extra_instdone[I915_NUM_INSTDONE_REG ];u32 pipestat[I915_MAX_PIPES ]; +u64 fence[I915_MAX_NUM_FENCES ]; +struct intel_overlay_error_state *overlay; +struct intel_display_error_state *display; + +/* Per ring register state +* TODO: Move these to per ring */ u32 tail[I915_NUM_RINGS ];u32 head[I915_NUM_RINGS ];u32 ctl[I915_NUM_RINGS ];
@@ -311,25 +323,25 @@ struct drm_i915_error_state {u32 ipehr[I915_NUM_RINGS ];u32 instdone[I915_NUM_RINGS ];u32 acthd[I915_NUM_RINGS ]; -u32 semaphore_mboxes[I915_NUM_RINGS ][I915_NUM_RINGS -1 ]; -u32 semaphore_seqno[I915_NUM_RINGS ][I915_NUM_RINGS -1 ]; -u32 rc_psmi[I915_NUM_RINGS ];/* sleep state */ -/* our own tracking of ring head and tail */ -u32 cpu_ring_head[I915_NUM_RINGS ]; -u32 cpu_ring_tail[I915_NUM_RINGS ]; -u32 error;/* gen6+ */ -u32 err_int;/* gen7 */ u32 bbstate[I915_NUM_RINGS ];u32 instpm[I915_NUM_RINGS ];u32 instps[I915_NUM_RINGS ]; -u32 extra_instdone[I915_NUM_INSTDONE_REG ];u32 seqno[I915_NUM_RINGS ];u64 bbaddr[I915_NUM_RINGS ];u32 fault_reg[I915_NUM_RINGS ]; -u32 done_reg;u32 faddr[I915_NUM_RINGS ]; -u64 fence[I915_MAX_NUM_FENCES ]; -struct timeval time; +u32 rc_psmi[I915_NUM_RINGS ];/* sleep state */ +u32 semaphore_mboxes[I915_NUM_RINGS ][I915_NUM_RINGS -1 ]; + +/* Software tracked state */ +bool waiting[I915_NUM_RINGS ]; +int hangcheck_score[I915_NUM_RINGS ]; +enum intel_ring_hangcheck_action hangcheck_action[I915_NUM_RINGS ]; + +/* our own tracking of ring head and tail */ +u32 cpu_ring_head[I915_NUM_RINGS ]; +u32 cpu_ring_tail[I915_NUM_RINGS ]; +u32 semaphore_seqno[I915_NUM_RINGS ][I915_NUM_RINGS -1 ];struct drm_i915_error_ring {bool valid;
@@ -363,11 +375,6 @@ struct drm_i915_error_state { } **active_bo, **pinned_bo;u32 *active_bo_count, *pinned_bo_count;u32 vm_count; - -struct intel_overlay_error_state *overlay; -struct intel_display_error_state *display; -int hangcheck_score[I915_NUM_RINGS ]; -enum intel_ring_hangcheck_action hangcheck_action[I915_NUM_RINGS ]; };struct intel_connector ;
Signature · 1 line
1.8.5.3
PATCH 4/6 drm/i915: Move per ring error state to ring_error
In reply to Ben Widawskyv2: Moved num_requests up (Chris)
Rebased on new hws page capture which required a rename since it made two members named, 'hws' in the per ring error state. (Ben)
--- drivers/gpu/drm/i915/i915_drv.h | 65 ++++++++-------- drivers/gpu/drm/i915/i915_gpu_error.c | 143 +++++++++++++++++----------------- 2 files changed, 104 insertions(+), 104 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +33 -32
@@ -313,49 +313,50 @@ struct drm_i915_error_state {struct intel_overlay_error_state *overlay;struct intel_display_error_state *display; -/* Per ring register state -* TODO: Move these to per ring */ -u32 tail[I915_NUM_RINGS ]; -u32 head[I915_NUM_RINGS ]; -u32 ctl[I915_NUM_RINGS ]; -u32 hws[I915_NUM_RINGS ]; -u32 ipeir[I915_NUM_RINGS ]; -u32 ipehr[I915_NUM_RINGS ]; -u32 instdone[I915_NUM_RINGS ]; -u32 acthd[I915_NUM_RINGS ]; -u32 bbstate[I915_NUM_RINGS ]; -u32 instpm[I915_NUM_RINGS ]; -u32 instps[I915_NUM_RINGS ]; -u32 seqno[I915_NUM_RINGS ]; -u64 bbaddr[I915_NUM_RINGS ]; -u32 fault_reg[I915_NUM_RINGS ]; -u32 faddr[I915_NUM_RINGS ]; -u32 rc_psmi[I915_NUM_RINGS ];/* sleep state */ -u32 semaphore_mboxes[I915_NUM_RINGS ][I915_NUM_RINGS -1 ]; - -/* Software tracked state */ -bool waiting[I915_NUM_RINGS ]; -int hangcheck_score[I915_NUM_RINGS ]; -enum intel_ring_hangcheck_action hangcheck_action[I915_NUM_RINGS ]; - -/* our own tracking of ring head and tail */ -u32 cpu_ring_head[I915_NUM_RINGS ]; -u32 cpu_ring_tail[I915_NUM_RINGS ]; -u32 semaphore_seqno[I915_NUM_RINGS ][I915_NUM_RINGS -1 ]; -struct drm_i915_error_ring {bool valid; +/* Software tracked state */ +bool waiting; +int hangcheck_score; +enum intel_ring_hangcheck_action hangcheck_action; +int num_requests; + +/* our own tracking of ring head and tail */ +u32 cpu_ring_head; +u32 cpu_ring_tail; + +u32 semaphore_seqno[I915_NUM_RINGS -1 ]; + +/* Register state */ +u32 tail; +u32 head; +u32 ctl; +u32 hws; +u32 ipeir; +u32 ipehr; +u32 instdone; +u32 acthd; +u32 bbstate; +u32 instpm; +u32 instps; +u32 seqno; +u64 bbaddr; +u32 fault_reg; +u32 faddr; +u32 rc_psmi;/* sleep state */ +u32 semaphore_mboxes[I915_NUM_RINGS -1 ]; +struct drm_i915_error_object {int page_count;u32 gtt_offset;u32 *pages[0 ]; - } *ringbuffer, *batchbuffer, *ctx, *hws; + } *ringbuffer, *batchbuffer, *ctx, *hws_page; +struct drm_i915_error_request {long jiffies;u32 seqno;u32 tail; } *requests; -int num_requests; } ring[I915_NUM_RINGS ];struct drm_i915_error_buffer {
drivers/gpu/drm/i915/i915_gpu_error.c +71 -72
224 lines not on this page · raw message
Signature · 1 line
1.8.5.3
PATCH 5/6 drm/i915: Add some more registers to error state
In reply to Ben WidawskyChris:
Do we also want to capture?
GAC_ECO_BITS /* gen6,7 */
GAM_ECOCHK /* gen6,7 */
GAB_CTL /* gen6 */
GFX_MODE /* gen6 */
--- drivers/gpu/drm/i915/i915_drv.h | 4 ++++ drivers/gpu/drm/i915/i915_gpu_error.c | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +4 -0
@@ -307,6 +307,10 @@ struct drm_i915_error_state {u32 error;/* gen6+ */ u32 err_int;/* gen7 */ u32 done_reg; +u32 gac_eco; +u32 gam_ecochk; +u32 gab_ctl; +u32 gfx_mode;u32 extra_instdone[I915_NUM_INSTDONE_REG ];u32 pipestat[I915_MAX_PIPES ];u64 fence[I915_MAX_NUM_FENCES ];
drivers/gpu/drm/i915/i915_gpu_error.c +10 -1
@@ -1035,8 +1035,11 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,if (IS_GEN7 (dev)) error->err_int =I915_READ (GEN7_ERR_INT ); -if (IS_GEN6 (dev)) +if (IS_GEN6 (dev)) { error->forcewake =I915_READ (FORCEWAKE ); + error->gab_ctl =I915_READ (GAB_CTL ); + error->gfx_mode =I915_READ (GFX_MODE ); + }if (IS_GEN2 (dev)) error->ier =I915_READ16 (IER );
@@ -1052,6 +1055,12 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, }/* 3: Feature specific registers */ +if (IS_GEN6 (dev) ||IS_GEN7 (dev)) { + error->gam_ecochk =I915_READ (GAM_ECOCHK ); + error->gac_eco =I915_READ (GAC_ECO_BITS ); + } + +/* 4: Everything else */ if (HAS_HW_CONTEXTS (dev)) error->ccid =I915_READ (CCID );
Signature · 1 line
1.8.5.3
PATCH 6/6 drm/i915: Capture PPGTT info on error capture
In reply to Ben Widawskyv2: Rebased upon cleaned up error state
v3: Make sure hangcheck info remains last (Chris)
--- drivers/gpu/drm/i915/i915_drv.h | 9 +++++++++ drivers/gpu/drm/i915/i915_gpu_error.c | 37 +++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +9 -0
@@ -361,6 +361,14 @@ struct drm_i915_error_state {u32 seqno;u32 tail; } *requests; + +struct { +u32 gfx_mode; +union { +u64 pdp[4 ]; +u32 pp_dir_base; + }; + } vm_info; } ring[I915_NUM_RINGS ];struct drm_i915_error_buffer {
@@ -378,6 +386,7 @@ struct drm_i915_error_state { s32 ring:4; u32 cache_level:3; } **active_bo, **pinned_bo; +u32 *active_bo_count, *pinned_bo_count;u32 vm_count; };
drivers/gpu/drm/i915/i915_gpu_error.c +37 -0
@@ -270,6 +270,19 @@ static void i915_ring_error_state(struct drm_i915_error_state_buf *m, ring->semaphore_seqno[2]); } } +if (USES_PPGTT (dev)) { +err_printf (m," GFX_MODE: 0x%08x\n" , ring->vm_info.gfx_mode); + +if (INTEL_INFO (dev)->gen >=8 ) { +int i; +for (i =0 ; i <4 ; i++) +err_printf (m," PDP%d: 0x%016llx\n" , + i, ring->vm_info.pdp[i]); + }else { +err_printf (m," PP_DIR_BASE: 0x%08x\n" , + ring->vm_info.pp_dir_base); + } + }err_printf (m," seqno: 0x%08x\n" , ring->seqno);err_printf (m," waiting: %s\n" ,yesno (ring->waiting));err_printf (m," ring->head: 0x%08x\n" , ring->cpu_ring_head);
@@ -847,6 +860,30 @@ static void i915_record_ring_state(struct drm_device *dev, ering->hangcheck_score = ring->hangcheck.score; ering->hangcheck_action = ring->hangcheck.action; + +if (USES_PPGTT (dev)) { +int i; + + ering->vm_info.gfx_mode =I915_READ (RING_MODE_GEN7 (ring)); + +switch (INTEL_INFO (dev)->gen) { +case 8 : +for (i =0 ; i <4 ; i++) { + ering->vm_info.pdp[i] = +I915_READ (GEN8_RING_PDP_UDW (ring, i)); + ering->vm_info.pdp[i] <<=32 ; + ering->vm_info.pdp[i] |= +I915_READ (GEN8_RING_PDP_LDW (ring, i)); + } +break ; +case 7 : + ering->vm_info.pp_dir_base =RING_PP_DIR_BASE (ring); +break ; +case 6 : + ering->vm_info.pp_dir_base =RING_PP_DIR_BASE_READ (ring); +break ; + } + } }
Signature · 1 line
1.8.5.3
Re: [PATCH 6/6] drm/i915: Capture PPGTT info on error capture
Quoted 5 lines · Ben Widawsky
v2: Rebased upon cleaned up error state
v3: Make sure hangcheck info remains last (Chris)Cc Chris Wilson <[email protected]>Signed-off-by Ben Widawsky <[email protected]>
Pulled in entire series with Chris' irc ack on the remaining two patches. Note that there have been a few conflicts aroung ring_error_state->valid (dunno how that happen, I guess this series wasn't strictly based on -nightly), please double-check things.
Thanks, Daniel
Quoted 94 lines
--- drivers/gpu/drm/i915/i915_drv.h | 9 +++++++++ drivers/gpu/drm/i915/i915_gpu_error.c | 37 +++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+)drivers/gpu/drm/i915/i915_drv.h +9
-0@@ -361,6 +361,14 @@ struct drm_i915_error_state {u32 seqno;u32 tail; } *requests; + +struct { +u32 gfx_mode; +union { +u64 pdp[4 ]; +u32 pp_dir_base; + }; + } vm_info; } ring[I915_NUM_RINGS ];struct drm_i915_error_buffer {@@ -378,6 +386,7 @@ struct drm_i915_error_state { s32 ring:4; u32 cache_level:3; } **active_bo, **pinned_bo; +u32 *active_bo_count, *pinned_bo_count;u32 vm_count; };drivers/gpu/drm/i915/i915_gpu_error.c +37
-0@@ -270,6 +270,19 @@ static void i915_ring_error_state(struct drm_i915_error_state_buf *m, ring->semaphore_seqno[2]); } } +if (USES_PPGTT (dev)) { +err_printf (m," GFX_MODE: 0x%08x\n" , ring->vm_info.gfx_mode); + +if (INTEL_INFO (dev)->gen >=8 ) { +int i; +for (i =0 ; i <4 ; i++) +err_printf (m," PDP%d: 0x%016llx\n" , + i, ring->vm_info.pdp[i]); + }else { +err_printf (m," PP_DIR_BASE: 0x%08x\n" , + ring->vm_info.pp_dir_base); + } + }err_printf (m," seqno: 0x%08x\n" , ring->seqno);err_printf (m," waiting: %s\n" ,yesno (ring->waiting));err_printf (m," ring->head: 0x%08x\n" , ring->cpu_ring_head);@@ -847,6 +860,30 @@ static void i915_record_ring_state(struct drm_device *dev, ering->hangcheck_score = ring->hangcheck.score; ering->hangcheck_action = ring->hangcheck.action; + +if (USES_PPGTT (dev)) { +int i; + + ering->vm_info.gfx_mode =I915_READ (RING_MODE_GEN7 (ring)); + +switch (INTEL_INFO (dev)->gen) { +case 8 : +for (i =0 ; i <4 ; i++) { + ering->vm_info.pdp[i] = +I915_READ (GEN8_RING_PDP_UDW (ring, i)); + ering->vm_info.pdp[i] <<=32 ; + ering->vm_info.pdp[i] |= +I915_READ (GEN8_RING_PDP_LDW (ring, i)); + } +break ; +case 7 : + ering->vm_info.pp_dir_base =RING_PP_DIR_BASE (ring); +break ; +case 6 : + ering->vm_info.pp_dir_base =RING_PP_DIR_BASE_READ (ring); +break ; + } + } }Signature · 6 lines
1.8.5.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [PATCH 6/6] drm/i915: Capture PPGTT info on error capture
Quoted 11 lines · Daniel Vetter
Quoted 5 lines · Ben Widawsky
v2: Rebased upon cleaned up error state
v3: Make sure hangcheck info remains last (Chris)Cc Chris Wilson <[email protected]>Signed-off-by Ben Widawsky <[email protected]>Pulled in entire series with Chris' irc ack on the remaining two patches. Note that there have been a few conflicts aroung
ring_error_state->valid(dunno how that happen, I guess this series wasn't strictly based on -nightly), please double-check things.
Meh, I've forgotten to check -fixes - the ring->valid patch I've been looking for was obviously there. Coffee doesn't seem to work today, I'll do a backmerge and sort this out.
Sorry for the fuss.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch