diff options
author | Dave Airlie <airlied@redhat.com> | 2007-11-22 17:17:06 +1100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2007-11-22 17:17:06 +1100 |
commit | a20587e3950f849deb1e723a0b4455a19f7b3fb8 (patch) | |
tree | de0a9d0b6558f3b359acf7985ddf4b8e7e83ee24 /shared-core/i915_drm.h | |
parent | 8fd8bf599b42b6caa062afabdfce7385d59a7695 (diff) | |
parent | 5dc5c36e624e5393b5427a159ad34e5fc358cc9f (diff) |
Merge branch 'origin' into modesetting-101
Conflicts:
linux-core/drmP.h
shared-core/i915_dma.c
shared-core/i915_drm.h
shared-core/radeon_drv.h
Diffstat (limited to 'shared-core/i915_drm.h')
-rw-r--r-- | shared-core/i915_drm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/shared-core/i915_drm.h b/shared-core/i915_drm.h index 3a1dcad6..65bc9e89 100644 --- a/shared-core/i915_drm.h +++ b/shared-core/i915_drm.h @@ -314,7 +314,7 @@ typedef struct drm_i915_mmio_entry { unsigned int flag; unsigned int offset; unsigned int size; -}drm_i915_mmio_entry_t; +} drm_i915_mmio_entry_t; typedef struct drm_i915_mmio { unsigned int read_write:1; @@ -359,6 +359,7 @@ struct drm_i915_execbuffer { uint64_t ops_list; uint32_t num_buffers; struct drm_i915_batchbuffer batch; + drm_context_t context; /* for lockless use in the future */ struct drm_fence_arg fence_arg; }; |