diff options
author | Dave Airlie <airlied@redhat.com> | 2013-02-07 21:10:18 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-02-07 21:10:18 -0500 |
commit | 6dc1c49da6dd3bf020a66b2a135b9625ac01c2c7 (patch) | |
tree | 38a6c5d4896de01449e9d224088ae223161fcd3c /drivers/gpu/drm/i915/i915_drv.h | |
parent | cd17ef4114ad5c514b17e6a0bb02a309ab90b692 (diff) | |
parent | 5845b81bdad374f98f809a658ec747d92c9595c4 (diff) |
Merge branch 'fbcon-locking-fixes' of ssh://people.freedesktop.org/~airlied/linux into drm-next
This pulls in most of Linus tree up to -rc6, this fixes the worst lockdep
reported issues and re-enables fbcon lockdep.
(not the fbcon maintainer)
* 'fbcon-locking-fixes' of ssh://people.freedesktop.org/~airlied/linux: (529 commits)
Revert "Revert "console: implement lockdep support for console_lock""
fbcon: fix locking harder
fb: Yet another band-aid for fixing lockdep mess
fb: rework locking to fix lock ordering on takeover
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 984523d809a8..c338b4443fd9 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -209,10 +209,13 @@ struct drm_i915_error_state { | |||
209 | u32 pgtbl_er; | 209 | u32 pgtbl_er; |
210 | u32 ier; | 210 | u32 ier; |
211 | u32 ccid; | 211 | u32 ccid; |
212 | u32 derrmr; | ||
213 | u32 forcewake; | ||
212 | bool waiting[I915_NUM_RINGS]; | 214 | bool waiting[I915_NUM_RINGS]; |
213 | u32 pipestat[I915_MAX_PIPES]; | 215 | u32 pipestat[I915_MAX_PIPES]; |
214 | u32 tail[I915_NUM_RINGS]; | 216 | u32 tail[I915_NUM_RINGS]; |
215 | u32 head[I915_NUM_RINGS]; | 217 | u32 head[I915_NUM_RINGS]; |
218 | u32 ctl[I915_NUM_RINGS]; | ||
216 | u32 ipeir[I915_NUM_RINGS]; | 219 | u32 ipeir[I915_NUM_RINGS]; |
217 | u32 ipehr[I915_NUM_RINGS]; | 220 | u32 ipehr[I915_NUM_RINGS]; |
218 | u32 instdone[I915_NUM_RINGS]; | 221 | u32 instdone[I915_NUM_RINGS]; |