xf86-video-intel: Branch 'drm-gem' - 2 commits - src/i830_driver.c src/reg_dumper/idle.c

[Keith Packard]

 src/i830_driver.c     |    2 +-
 src/reg_dumper/idle.c |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 9d7929436488969ca4fd1fef4d2e92be5e1a93aa
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Jun 20 00:23:45 2008 -0700

    Flush pending batch in block handler
    
    Make sure any pending rendering commands are delivered to the hardware
    before the server goes to sleep.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 580cbbc..5525aec 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2496,7 +2496,7 @@ I830BlockHandler(int i,
 	* rendering results may not hit the framebuffer until significantly
 	* later.
 	*/
-       if (!pI830->noAccel && pI830->need_mi_flush)
+       if (!pI830->noAccel && (pI830->need_mi_flush || pI830->batch_used))
 	  I830EmitFlush(pScrn);
 
        /* Flush the batch, so that any rendering is executed in a timely
commit 2f8a0aa8cd24ede824aa52102b45a295f1b6b5be
Author: Keith Packard <keithp at keithp.com>
Date:   Tue May 20 20:29:25 2008 -0700

    Remove some unreliable regs for i915

diff --git a/src/reg_dumper/idle.c b/src/reg_dumper/idle.c
index 46a2fd5..dbfa58e 100644
--- a/src/reg_dumper/idle.c
+++ b/src/reg_dumper/idle.c
@@ -43,11 +43,13 @@ struct idle_flags {
 };
 
 struct idle_flags i915_idle_flags[] = {
+#if 0
     {IDCT_DONE, "IDCT"},
     {IQ_DONE, "IQ"},
     {PR_DONE, "PR"},
     {VLD_DONE, "VLD"},
     {IP_DONE, "IP"},
+#endif
     {FBC_DONE, "FBC"},
     {BINNER_DONE, "BINNER"},
     {SF_DONE, "SF"},
@@ -66,7 +68,9 @@ struct idle_flags i915_idle_flags[] = {
     {PS_DONE, "PS"},
     {CC_DONE, "CC"},
     {MAP_FILTER_DONE, "map filter"},
+#if 0
     {MAP_L2_IDLE, "map L2"},
+#endif
 
     {0, "total"},
     {0, "other"},
@@ -105,8 +109,8 @@ setup_other_flags(I830Ptr pI830,
 	other_idle_flags &= ~idle_flags[i].instdone_flag;
 	total_idle_flags |= idle_flags[i].instdone_flag;
     }
-    idle_flags[i - 1].instdone_flag = total_idle_flags;
-    idle_flags[i].instdone_flag = other_idle_flags;
+    idle_flags[idle_flag_count - 2].instdone_flag = total_idle_flags;
+    idle_flags[idle_flag_count - 1].instdone_flag = other_idle_flags;
 }
 
 int main(int argc, char **argv)