fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2025-12-20 12:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use DRM_SPINLOCK / DRM_UNSPINLOCK macros.

Browse source
This commit is contained in:
Ian Romanick 2007-08-29 00:04:18 -07:00
parent 3383e8bd6b
commit 2bcd5b5e33
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linux-core/xgi_drv.c
View file

@ -202,7 +202,7 @@ int xgi_bootstrap(struct drm_device * dev, void * data,
int err; int err;
spin_lock_init(&info->fence_lock); DRM_SPINLOCK_INIT(&info->fence_lock);
info->next_sequence = 0; info->next_sequence = 0;
info->complete_sequence = 0; info->complete_sequence = 0;

2
linux-core/xgi_drv.h
View file

@ -73,7 +73,7 @@ struct xgi_info {
struct xgi_cmdring_info cmdring; struct xgi_cmdring_info cmdring;
spinlock_t fence_lock; DRM_SPINTYPE fence_lock;
unsigned complete_sequence; unsigned complete_sequence;
unsigned next_sequence; unsigned next_sequence;
}; };

8
linux-core/xgi_fence.c
View file

@ -41,7 +41,7 @@ static uint32_t xgi_do_flush(struct drm_device * dev, uint32_t class)
if ((info == NULL) || (class != 0)) if ((info == NULL) || (class != 0))
return 0; return 0;
spin_lock(&info->fence_lock); DRM_SPINLOCK(&info->fence_lock);
pending_flush_types = fc->pending_flush | pending_flush_types = fc->pending_flush |
((fc->pending_exe_flush) ? DRM_FENCE_TYPE_EXE : 0); ((fc->pending_exe_flush) ? DRM_FENCE_TYPE_EXE : 0);
@ -64,7 +64,7 @@ static uint32_t xgi_do_flush(struct drm_device * dev, uint32_t class)
} }
} }
spin_unlock(&info->fence_lock); DRM_SPINUNLOCK(&info->fence_lock);
return fc->pending_flush | return fc->pending_flush |
((fc->pending_exe_flush) ? DRM_FENCE_TYPE_EXE : 0); ((fc->pending_exe_flush) ? DRM_FENCE_TYPE_EXE : 0);
@ -81,12 +81,12 @@ int xgi_fence_emit_sequence(struct drm_device * dev, uint32_t class,
return -EINVAL; return -EINVAL;
spin_lock(&info->fence_lock); DRM_SPINLOCK(&info->fence_lock);
info->next_sequence++; info->next_sequence++;
if (info->next_sequence > BEGIN_BEGIN_IDENTIFICATION_MASK) { if (info->next_sequence > BEGIN_BEGIN_IDENTIFICATION_MASK) {
info->next_sequence = 1; info->next_sequence = 1;
} }
spin_unlock(&info->fence_lock); DRM_SPINUNLOCK(&info->fence_lock);
*sequence = (uint32_t) info->next_sequence; *sequence = (uint32_t) info->next_sequence;