aboutsummaryrefslogtreecommitdiff
path: root/linux-core/i915_fence.c
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-09-25 18:03:31 +0200
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-09-25 18:03:31 +0200
commitc4b3a0f602abd02038f7e5dd45fcfb2df4b5fcfa (patch)
tree803662fb4d1eadb850d9ed2a622fe55d1ec97574 /linux-core/i915_fence.c
parent0774090d5b7d3eba734086b437021039bc19c365 (diff)
parent03c47f1420bf17a1e0f2b86be500656ae5a4c95b (diff)
Merge branch 'master' into pre-superioctl-branch
Conflicts: linux-core/drm_bo.c linux-core/drm_fence.c linux-core/drm_objects.h shared-core/drm.h
Diffstat (limited to 'linux-core/i915_fence.c')
-rw-r--r--linux-core/i915_fence.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/i915_fence.c b/linux-core/i915_fence.c
index 5a1653e9..a0f22785 100644
--- a/linux-core/i915_fence.c
+++ b/linux-core/i915_fence.c
@@ -42,7 +42,7 @@ static void i915_perform_flush(struct drm_device * dev)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
struct drm_fence_manager *fm = &dev->fm;
- struct drm_fence_class_manager *fc = &fm->class[0];
+ struct drm_fence_class_manager *fc = &fm->fence_class[0];
struct drm_fence_driver *driver = dev->driver->fence_driver;
uint32_t flush_flags = 0;
uint32_t flush_sequence = 0;