diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-10-25 11:00:45 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-10-25 11:00:45 +0200 |
| commit | 9adf8c02563b1e6110e46dabd733e2dc440b4200 (patch) | |
| tree | 7a0e360dc9663b3e269a5d5e164672bf8885a5e4 /shared-core/i915_drv.h | |
| parent | d5f2b4b411c5ca95d6f66a33d213ece387ac4fc5 (diff) | |
| parent | b9d9c30474238ac8ba4899a19fe4a97e9376f6c4 (diff) | |
Merge branch 'master' into modesetting-101
Conflicts:
linux-core/Makefile.kernel
linux-core/drm_bo.c
linux-core/drm_objects.h
Diffstat (limited to 'shared-core/i915_drv.h')
| -rw-r--r-- | shared-core/i915_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index 12ac8b6e..be3212d1 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -143,6 +143,7 @@ struct drm_i915_private { #ifdef I915_HAVE_BUFFER void *agp_iomap; unsigned int max_validate_buffers; + struct mutex cmdbuf_mutex; #endif DRM_SPINTYPE swaps_lock; |