diff options
author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-09-25 18:03:31 +0200 |
---|---|---|
committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-09-25 18:03:31 +0200 |
commit | c4b3a0f602abd02038f7e5dd45fcfb2df4b5fcfa (patch) | |
tree | 803662fb4d1eadb850d9ed2a622fe55d1ec97574 /linux-core/via_fence.c | |
parent | 0774090d5b7d3eba734086b437021039bc19c365 (diff) | |
parent | 03c47f1420bf17a1e0f2b86be500656ae5a4c95b (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/via_fence.c')
-rw-r--r-- | linux-core/via_fence.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/via_fence.c b/linux-core/via_fence.c index 4576dc90..9af1bf3b 100644 --- a/linux-core/via_fence.c +++ b/linux-core/via_fence.c @@ -42,7 +42,7 @@ static uint32_t via_perform_flush(struct drm_device *dev, uint32_t class) { drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; - struct drm_fence_class_manager *fc = &dev->fm.class[class]; + struct drm_fence_class_manager *fc = &dev->fm.fence_class[class]; uint32_t pending_flush_types = 0; uint32_t signaled_flush_types = 0; uint32_t status; @@ -205,7 +205,7 @@ void via_fence_timer(unsigned long data) drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; struct drm_fence_manager *fm = &dev->fm; uint32_t pending_flush; - struct drm_fence_class_manager *fc = &dev->fm.class[0]; + struct drm_fence_class_manager *fc = &dev->fm.fence_class[0]; if (!dev_priv) return; |