summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2008-06-06 13:26:03 -0700
committerKeith Packard <keithp@keithp.com>2008-06-06 13:26:03 -0700
commit6cd0ef06a6c2bdcede166d9a2d0434e58e4a01f2 (patch)
tree97bbac92f2fde075f4c3bce4b438c6346d8e744f /linux-core
parent9f46c6935d154743162c6239903a4a9e443907bc (diff)
[intel] remove settable use_mi_batchbuffer_start
The driver can know what hardware requires MI_BATCH_BUFFER vs MI_BATCH_BUFFER_START; there's no reason to let user mode configure this.
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/i915_gem.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/linux-core/i915_gem.c b/linux-core/i915_gem.c
index abc929e9..d60a98f8 100644
--- a/linux-core/i915_gem.c
+++ b/linux-core/i915_gem.c
@@ -1315,7 +1315,14 @@ i915_dispatch_gem_execbuffer(struct drm_device *dev,
return ret;
}
- if (dev_priv->use_mi_batchbuffer_start) {
+ if (IS_I830(dev) || IS_845G(dev)) {
+ BEGIN_LP_RING(4);
+ OUT_RING(MI_BATCH_BUFFER);
+ OUT_RING(exec_start | MI_BATCH_NON_SECURE);
+ OUT_RING(exec_start + exec_len - 4);
+ OUT_RING(0);
+ ADVANCE_LP_RING();
+ } else {
BEGIN_LP_RING(2);
if (IS_I965G(dev)) {
OUT_RING(MI_BATCH_BUFFER_START |
@@ -1328,14 +1335,6 @@ i915_dispatch_gem_execbuffer(struct drm_device *dev,
OUT_RING(exec_start | MI_BATCH_NON_SECURE);
}
ADVANCE_LP_RING();
-
- } else {
- BEGIN_LP_RING(4);
- OUT_RING(MI_BATCH_BUFFER);
- OUT_RING(exec_start | MI_BATCH_NON_SECURE);
- OUT_RING(exec_start + exec_len - 4);
- OUT_RING(0);
- ADVANCE_LP_RING();
}
}