aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
diff options
context:
space:
mode:
authorThomas Hellstrom <thellstrom@vmware.com>2011-09-01 16:18:42 -0400
committerDave Airlie <airlied@redhat.com>2011-09-06 06:48:40 -0400
commit6bcd8d3c782b7b2c98c8f414a6bb43cf6b84e53c (patch)
treeec6f664be6a2ff92e0512494c222af6e2776130b /drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
parentf63f6a59d3905ac73aeeb617b27ac31516549ed9 (diff)
vmwgfx: Fix confusion caused by using "fence" in various places
This is needed before we introduce the fence objects. Otherwise this will be even more confusing. The plan is to use the following: seqno: A 32-bit sequence number that may be passed in the fifo. marker: Objects, carrying a seqno, that track fifo submission time. They are used for fifo lag based throttling. fence objects: Kernel space objects, possibly accessible from user-space and carrying a 32-bit seqno together with signaled status. 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.c2
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 8010254e9cf9..c8b5a53f140b 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -280,7 +280,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
280 280
281 dev_priv->dev = dev; 281 dev_priv->dev = dev;
282 dev_priv->vmw_chipset = chipset; 282 dev_priv->vmw_chipset = chipset;
283 dev_priv->last_read_sequence = (uint32_t) -100; 283 dev_priv->last_read_seqno = (uint32_t) -100;
284 mutex_init(&dev_priv->hw_mutex); 284 mutex_init(&dev_priv->hw_mutex);
285 mutex_init(&dev_priv->cmdbuf_mutex); 285 mutex_init(&dev_priv->cmdbuf_mutex);
286 mutex_init(&dev_priv->release_mutex); 286 mutex_init(&dev_priv->release_mutex);