summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-09-08 17:24:38 +0200
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-09-08 17:24:38 +0200
commit99acb7936660843090ea8a9f22d2d50d9433e0de (patch)
tree99044a2f889da0354027a59561bbbdf8896fcc18 /shared-core
parente3f54ecdd9d266607afd7d8b62960b2154b63e9d (diff)
Various bugfixes.
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/drm.h4
-rw-r--r--shared-core/i915_drv.h1
-rw-r--r--shared-core/i915_irq.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h
index e39f888a..bed55173 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -728,7 +728,7 @@ typedef struct drm_ttm_arg {
/* Don't place this buffer on the unfenced list.*/
#define DRM_BO_HINT_DONT_FENCE 0x00000004
#define DRM_BO_HINT_WAIT_LAZY 0x00000008
-
+#define DRM_BO_HINT_ALLOW_UNFENCED_MAP 0x00000010
/* Driver specific flags. Could be for example rendering engine */
@@ -792,7 +792,7 @@ typedef struct drm_bo_arg{
union {
drm_bo_arg_request_t req;
drm_bo_arg_reply_t rep;
- };
+ } d;
} drm_bo_arg_t;
typedef union drm_mm_init_arg{
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index f8d08741..2aa3b947 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -105,6 +105,7 @@ typedef struct drm_i915_private {
int vblank_pipe;
spinlock_t user_irq_lock;
int user_irq_refcount;
+ int fence_irq_on;
uint32_t irq_enable_reg;
int irq_enabled;
diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c
index a3f6a03b..4a1b2987 100644
--- a/shared-core/i915_irq.c
+++ b/shared-core/i915_irq.c
@@ -106,7 +106,7 @@ void i915_user_irq_on(drm_i915_private_t *dev_priv)
{
spin_lock(&dev_priv->user_irq_lock);
- if (dev_priv->irq_enabled && (++dev_priv->user_irq_refcount > 0)){
+ if (dev_priv->irq_enabled && (++dev_priv->user_irq_refcount == 1)){
dev_priv->irq_enable_reg |= USER_INT_FLAG;
I915_WRITE16(I915REG_INT_ENABLE_R, dev_priv->irq_enable_reg);
}