diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-23 08:49:38 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-23 08:49:38 +0000 |
| commit | 3685092b717882bb9b6801bf3e4b02a106e3b129 (patch) | |
| tree | 71455c11ad45b72d5c7fc804e25a9d7f7940e7dd /drivers/gpu/drm/i915/i915_irq.c | |
| parent | 5f75377db4d8d81ca4465b54d3c339c70c6a0fa2 (diff) | |
| download | linux-3685092b717882bb9b6801bf3e4b02a106e3b129.tar.bz2 | |
drm/i915: Avoid oops when capturing NULL ring for inactive pinned buffers
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 0b6052abedd1..a8f55f061f6d 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -575,7 +575,7 @@ static u32 capture_bo_list(struct drm_i915_error_buffer *err, err->tiling = obj->tiling_mode; err->dirty = obj->dirty; err->purgeable = obj->madv != I915_MADV_WILLNEED; - err->ring = obj->ring->id; + err->ring = obj->ring ? obj->ring->id : 0; if (++i == count) break; |