diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-10-20 16:49:43 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-10-20 16:49:43 +0200 |
| commit | 48b5eaf303b60077faed09db77785d7a544ac335 (patch) | |
| tree | 1955b5a01288f33e3e4e0bca8fc2de863c39b126 /shared-core | |
| parent | c0e3537e77f1765001f665f93e5349ccd0f1d092 (diff) | |
Simple replacement for hardware lock in some cases.
Fix i915 since last commit.
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/drm.h | 1 | ||||
| -rw-r--r-- | shared-core/i915_dma.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h index 0ffd0ad5..f88192ff 100644 --- a/shared-core/drm.h +++ b/shared-core/drm.h @@ -872,6 +872,7 @@ struct drm_bo_op_arg { struct drm_mm_type_arg { unsigned int mem_type; + int lock_unlock_bm; }; struct drm_mm_init_arg { diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index 5a51f6ef..99d98cd3 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -930,6 +930,7 @@ int i915_validate_buffer_list(struct drm_file *file_priv, req->bo_req.flags, req->bo_req.mask, req->bo_req.hint, + 0, &rep.bo_info, &buffers[buf_count]); |