diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2008-10-14 23:13:40 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2008-10-14 23:13:40 -0400 |
| commit | 282f51c3f0e5bc2cedd2f60f458ca2662290d471 (patch) | |
| tree | 3bd89c1d2effcc7b8e1b2b9c805244806b3546bc /src/i830_batchbuffer.c | |
| parent | 8a54e3be5c5057fe8e3c52c03401fdada7978c45 (diff) | |
| parent | 4dd00681dd0f9fce8dfd4592b46418edbbd2eeb4 (diff) | |
Merge commit 'origin/master' into HEAD
Diffstat (limited to 'src/i830_batchbuffer.c')
| -rw-r--r-- | src/i830_batchbuffer.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/i830_batchbuffer.c b/src/i830_batchbuffer.c index 47fc331b..9ae2141b 100644 --- a/src/i830_batchbuffer.c +++ b/src/i830_batchbuffer.c @@ -45,9 +45,11 @@ intel_nondrm_exec(dri_bo *bo, unsigned int used, void *priv) ScrnInfoPtr pScrn = priv; I830Ptr pI830 = I830PTR(pScrn); - BEGIN_LP_RING(2); + BEGIN_LP_RING(4); OUT_RING(MI_BATCH_BUFFER_START | (2 << 6)); OUT_RING(bo->offset); + OUT_RING(MI_NOOP); + OUT_RING(MI_NOOP); ADVANCE_LP_RING(); return 0; @@ -64,6 +66,7 @@ intel_nondrm_exec_i830(dri_bo *bo, unsigned int used, void *priv) OUT_RING(bo->offset); OUT_RING(bo->offset + pI830->batch_used - 4); OUT_RING(MI_NOOP); + ADVANCE_LP_RING(); return 0; } |