summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2007-05-15 13:35:33 -0700
committerEric Anholt <eric@anholt.net>2007-05-29 15:02:44 -0700
commitb0c8d885ce645aee5027a75e4149ba4be265b55d (patch)
treeb251dd646c19199ad69d8c91b6aa5d483e946aed /shared-core
parentfdc293d40c2fdd184d89bd38257ade2437c4cbc1 (diff)
Update a bunch of FreeBSD port code.
Tested on r200/r300. i915 updates still remain to be done.
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/i915_dma.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index 8991a3ce..5ea0bdab 100644
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -471,7 +471,9 @@ int i915_emit_mi_flush(drm_device_t *dev, uint32_t flush)
static int i915_dispatch_cmdbuffer(drm_device_t * dev,
drm_i915_cmdbuffer_t * cmd)
{
+#ifdef I915_HAVE_FENCE
drm_i915_private_t *dev_priv = dev->dev_private;
+#endif
int nbox = cmd->num_cliprects;
int i = 0, count, ret;
@@ -856,7 +858,7 @@ static int i915_mmio(DRM_IOCTL_ARGS)
return DRM_ERR(EINVAL);
e = &mmio_table[mmio.reg];
- base = dev_priv->mmio_map->handle + e->offset;
+ base = (u8 *) dev_priv->mmio_map->handle + e->offset;
switch (mmio.read_write) {
case I915_MMIO_READ: