diff options
author | Thomas Hellstrom <thellstrom@vmware.com> | 2011-09-01 16:18:43 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-09-06 06:48:43 -0400 |
commit | 4f73a96bd76914009682432842ac04a32ab9115b (patch) | |
tree | 65264c569d796be5388008b8303738b642fd9c83 /drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |
parent | 6bcd8d3c782b7b2c98c8f414a6bb43cf6b84e53c (diff) |
vmwgfx: Make vmw_wait_seqno a bit more readable
Break out on-demand enabling and disabling of fence irqs to make
the function more readable. Also make dev_priv->fence_queue_waiters an int
instead of an atomic_t since we only manipulate it with dev_priv->hw_mutex
held.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_drv.c')
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index c8b5a53f140b..4f65f1e34b8f 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |||
@@ -291,7 +291,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) | |||
291 | mutex_init(&dev_priv->init_mutex); | 291 | mutex_init(&dev_priv->init_mutex); |
292 | init_waitqueue_head(&dev_priv->fence_queue); | 292 | init_waitqueue_head(&dev_priv->fence_queue); |
293 | init_waitqueue_head(&dev_priv->fifo_queue); | 293 | init_waitqueue_head(&dev_priv->fifo_queue); |
294 | atomic_set(&dev_priv->fence_queue_waiters, 0); | 294 | dev_priv->fence_queue_waiters = 0; |
295 | atomic_set(&dev_priv->fifo_queue_waiters, 0); | 295 | atomic_set(&dev_priv->fifo_queue_waiters, 0); |
296 | 296 | ||
297 | dev_priv->io_start = pci_resource_start(dev->pdev, 0); | 297 | dev_priv->io_start = pci_resource_start(dev->pdev, 0); |