Use DRM_SPINLOCK / DRM_UNSPINLOCK macros.

diff --git a/linux-core/xgi_drv.c b/linux-core/xgi_drv.c
index 241cd39..6b57655 100644 (file)
--- a/linux-core/xgi_drv.c
+++ b/linux-core/xgi_drv.c
@@ -202,7 +202,7 @@ int xgi_bootstrap(struct drm_device * dev, void * data,
        int err;
 
 
-       spin_lock_init(&info->fence_lock);
+       DRM_SPINLOCK_INIT(&info->fence_lock);
        info->next_sequence = 0;
        info->complete_sequence = 0;
 

diff --git a/linux-core/xgi_drv.h b/linux-core/xgi_drv.h
index c815f63..d43a6b4 100644 (file)
--- a/linux-core/xgi_drv.h
+++ b/linux-core/xgi_drv.h
@@ -73,7 +73,7 @@ struct xgi_info {
 
        struct xgi_cmdring_info cmdring;
 
-       spinlock_t fence_lock;
+       DRM_SPINTYPE fence_lock;
        unsigned complete_sequence;
        unsigned next_sequence;
 };

diff --git a/linux-core/xgi_fence.c b/linux-core/xgi_fence.c
index e5b545d..42ed814 100644 (file)
--- a/linux-core/xgi_fence.c
+++ b/linux-core/xgi_fence.c
@@ -41,7 +41,7 @@ static uint32_t xgi_do_flush(struct drm_device * dev, uint32_t class)
        if ((info == NULL) || (class != 0))
                return 0;
 
-       spin_lock(&info->fence_lock);
+       DRM_SPINLOCK(&info->fence_lock);
 
        pending_flush_types = fc->pending_flush |
                ((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 |
                ((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;
 
 
-       spin_lock(&info->fence_lock);
+       DRM_SPINLOCK(&info->fence_lock);
        info->next_sequence++;
        if (info->next_sequence > BEGIN_BEGIN_IDENTIFICATION_MASK) {
                info->next_sequence = 1;
        }
-       spin_unlock(&info->fence_lock);
+       DRM_SPINUNLOCK(&info->fence_lock);
        
 
        *sequence = (uint32_t) info->next_sequence;