xf86-video-intel: Branch 'xf86-video-intel-2.6-branch' - 4 commits - src/i830_debug.c src/i830_driver.c src/xvmc/dual_prime.g4a src/xvmc/dual_prime.g4b src/xvmc/dual_prime_igd.g4a src/xvmc/dual_prime_igd.g4b src/xvmc/i965_xvmc.c

Zhenyu Wang zhen at kemper.freedesktop.org
Sun Dec 14 07:36:28 PST 2008


 src/i830_debug.c            |    2 
 src/i830_driver.c           |   48 +++---
 src/xvmc/dual_prime.g4a     |  159 +++++++++-------------
 src/xvmc/dual_prime.g4b     |  317 +++++++++++++++++++++++++++++---------------
 src/xvmc/dual_prime_igd.g4a |  159 +++++++++-------------
 src/xvmc/dual_prime_igd.g4b |  317 +++++++++++++++++++++++++++++---------------
 src/xvmc/i965_xvmc.c        |    1 
 7 files changed, 598 insertions(+), 405 deletions(-)

New commits:
commit f1681971157c83a68fe76a8561220fcebecf80f8
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Fri Dec 12 11:18:25 2008 -0800

    Update binary versions of the dual-prime kernels
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit f3e59e59b54696667b127c82327e16b14d7bab22)

diff --git a/src/xvmc/dual_prime.g4b b/src/xvmc/dual_prime.g4b
index 293d2d3..4a1eb4b 100644
--- a/src/xvmc/dual_prime.g4b
+++ b/src/xvmc/dual_prime.g4b
@@ -1,4 +1,106 @@
    { 0x00600001, 0x29800021, 0x008d0020, 0x00000000 },
+   { 0x02000005, 0x20000c3c, 0x00210040, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00000040, 0x20480c21, 0x00210988, 0x00000000 },
+   { 0x00800031, 0x20601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23401c21, 0x00b10040, 0x04110203 },
+   { 0x02000005, 0x20002d3c, 0x0021098c, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x20600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00100010 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x20700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00080008 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x21600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00040004 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x21700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x22600169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22800169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22a00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22c00169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x22e00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23000169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23200169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23400169, 0x00000000, 0x00000000 },
    { 0x00600001, 0x2e600021, 0x008d0020, 0x00000000 },
    { 0x00600001, 0x2e800021, 0x008d0020, 0x00000000 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
@@ -6,6 +108,8 @@
    { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
    { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00010001 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
    { 0x01000005, 0x20002d3c, 0x0021002e, 0x00010001 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x000000b1 },
    { 0x01000005, 0x20002d3c, 0x00210030, 0x00010001 },
@@ -297,14 +401,15 @@
    { 0x00600001, 0x27c00021, 0x008d0ca0, 0x00000000 },
    { 0x00600001, 0x28000021, 0x008d0cc0, 0x00000000 },
    { 0x00600001, 0x28400021, 0x008d0ce0, 0x00000000 },
-   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00010001 },
-   { 0x00200040, 0x2e603421, 0x00450e80, 0x00450e6e },
+   { 0x0020000c, 0x2e6e3dad, 0x00450036, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
    { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
-   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000001 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x01000005, 0x20002d3c, 0x00210032, 0x00010001 },
+   { 0x02000005, 0x20000e3c, 0x0021003f, 0x00000004 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210036, 0x00010001 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x000000b1 },
-   { 0x01000005, 0x20002d3c, 0x00210034, 0x00010001 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00010001 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x0000007d },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
    { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
@@ -481,7 +586,7 @@
    { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
    { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x00000068 },
-   { 0x01000005, 0x20002d3c, 0x00210034, 0x00010001 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00010001 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x00000035 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
    { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
@@ -594,10 +699,12 @@
    { 0x00600001, 0x28200021, 0x008d0cc0, 0x00000000 },
    { 0x00600001, 0x28600021, 0x008d0ce0, 0x00000000 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
-   { 0x0020000c, 0x2e600c21, 0x00210e80, 0x00000001 },
    { 0x0020000c, 0x2e6e3dad, 0x0045002e, 0x00020002 },
-   { 0x00200040, 0x2e603421, 0x00450e60, 0x00450e6e },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
    { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00010001 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
    { 0x01000005, 0x20002d3c, 0x0021002e, 0x00020002 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x000000a2 },
    { 0x01000005, 0x20002d3c, 0x00210030, 0x00020002 },
@@ -858,14 +965,15 @@
    { 0x00600001, 0x29200129, 0x008d0a60, 0x00000000 },
    { 0x00600001, 0x29400129, 0x008d0a80, 0x00000000 },
    { 0x00600001, 0x29600129, 0x008d0aa0, 0x00000000 },
-   { 0x0020000c, 0x2e600c21, 0x00210e80, 0x00000001 },
-   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00020002 },
-   { 0x00200040, 0x2e603421, 0x00450e60, 0x00450e6e },
+   { 0x0020000c, 0x2e6e3dad, 0x00450036, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
    { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
-   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000001 },
-   { 0x01000005, 0x20002d3c, 0x00210032, 0x00020002 },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00040004 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00020002 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x000000a2 },
-   { 0x01000005, 0x20002d3c, 0x00210034, 0x00020002 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00020002 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x00000076 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
    { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
@@ -1027,7 +1135,7 @@
    { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
    { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
-   { 0x01000005, 0x20002d3c, 0x00210034, 0x00020002 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00020002 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
    { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
@@ -1123,29 +1231,33 @@
    { 0x00600001, 0x29300129, 0x008d0a60, 0x00000000 },
    { 0x00600001, 0x29500129, 0x008d0a80, 0x00000000 },
    { 0x00600001, 0x29700129, 0x008d0aa0, 0x00000000 },
-   { 0x0020000c, 0x2e6e3dad, 0x00450036, 0x00010001 },
-   { 0x00200040, 0x2e603421, 0x00450e80, 0x00450e6e },
+   { 0x00600001, 0x20200021, 0x008d0e80, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00000001, 0x20280061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
    { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
-   { 0x00000040, 0x2e641c21, 0x00210e64, 0x00000001 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x01000005, 0x20002d3c, 0x00210036, 0x00010001 },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00020002 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210032, 0x00010001 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x000000b1 },
-   { 0x01000005, 0x20002d3c, 0x00210038, 0x00010001 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00010001 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x0000007d },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
-   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a007 },
    { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
    { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
    { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
@@ -1258,16 +1370,16 @@
    { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x0000009a },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
-   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
    { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
    { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
    { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
@@ -1307,22 +1419,22 @@
    { 0x80800042, 0x2cc04629, 0x00b10b43, 0x00b10b44 },
    { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10b84 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x00000068 },
-   { 0x01000005, 0x20002d3c, 0x00210038, 0x00010001 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00010001 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x00000035 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
-   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a007 },
    { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
    { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
    { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
@@ -1363,16 +1475,16 @@
    { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
-   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
    { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
    { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
    { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
@@ -1419,30 +1531,30 @@
    { 0x00600001, 0x24c00021, 0x008d0ca0, 0x00000000 },
    { 0x00600001, 0x25000021, 0x008d0cc0, 0x00000000 },
    { 0x00600001, 0x25400021, 0x008d0ce0, 0x00000000 },
-   { 0x03000010, 0x20003dbc, 0x00210034, 0x00000000 },
-   { 0x00010040, 0x203c3dad, 0x0021003c, 0x00050005 },
    { 0x0020000c, 0x2e6e3dad, 0x0045003a, 0x00010001 },
-   { 0x00200040, 0x2e603421, 0x00450e80, 0x00450e6e },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
    { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20000c3c, 0x00210054, 0x00000008 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
    { 0x01000005, 0x20002d3c, 0x0021003a, 0x00010001 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x000000b1 },
    { 0x01000005, 0x20002d3c, 0x0021003c, 0x00010001 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x0000007d },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
-   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a007 },
    { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
    { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
    { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
@@ -1555,16 +1667,16 @@
    { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x0000009a },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
-   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
    { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
    { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
    { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
@@ -1607,19 +1719,19 @@
    { 0x01000005, 0x20002d3c, 0x0021003c, 0x00010001 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x00000035 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
-   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a007 },
    { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
    { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
    { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
@@ -1660,16 +1772,16 @@
    { 0x80800042, 0x2ce04629, 0x00b10b83, 0x00b10bc3 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x00000031 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
-   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
    { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
    { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
    { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
@@ -1725,24 +1837,25 @@
    { 0x80800042, 0x25402529, 0x00b10840, 0x00b10540 },
    { 0x80800042, 0x25602529, 0x00b10860, 0x00b10ce0 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
-   { 0x0020000c, 0x2e600c21, 0x00210e80, 0x00000001 },
-   { 0x0020000c, 0x2e6e3dad, 0x00450036, 0x00020002 },
-   { 0x00200040, 0x2e603421, 0x00450e60, 0x00450e6e },
+   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
    { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
-   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000001 },
-   { 0x01000005, 0x20002d3c, 0x00210036, 0x00020002 },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00020002 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210032, 0x00020002 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x000000a2 },
-   { 0x01000005, 0x20002d3c, 0x00210038, 0x00020002 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00020002 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x00000076 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
-   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
-   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
    { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
    { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
-   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a005 },
-   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a006 },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a008 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a009 },
    { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
    { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
    { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
@@ -1853,8 +1966,8 @@
    { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x00000082 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
-   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
-   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
    { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
    { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
    { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
@@ -1894,14 +2007,14 @@
    { 0x80800042, 0x2a804629, 0x00ad0ba3, 0x00ad0ba4 },
    { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc4 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x00000058 },
-   { 0x01000005, 0x20002d3c, 0x00210038, 0x00020002 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00020002 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
-   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
-   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
-   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a005 },
-   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a006 },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a008 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a009 },
    { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
    { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
    { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
@@ -1942,8 +2055,8 @@
    { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
-   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
-   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
    { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
    { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
    { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
@@ -1990,23 +2103,25 @@
    { 0x00600001, 0x26200129, 0x008d0a60, 0x00000000 },
    { 0x00600001, 0x26400129, 0x008d0a80, 0x00000000 },
    { 0x00600001, 0x26600129, 0x008d0aa0, 0x00000000 },
-   { 0x0020000c, 0x2e600c21, 0x00210e80, 0x00000001 },
    { 0x0020000c, 0x2e6e3dad, 0x0045003a, 0x00020002 },
-   { 0x00200040, 0x2e603421, 0x00450e60, 0x00450e6e },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
    { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00080008 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
    { 0x01000005, 0x20002d3c, 0x0021003a, 0x00020002 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x000000a2 },
    { 0x01000005, 0x20002d3c, 0x0021003c, 0x00020002 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x00000076 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
-   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
-   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
    { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
    { 0x00000041, 0x20580c21, 0x00210058, 0x00000019 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
-   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a005 },
-   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a006 },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a008 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a009 },
    { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
    { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
    { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
@@ -2117,8 +2232,8 @@
    { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x00000082 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
-   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
-   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
    { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
    { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
    { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
@@ -2161,11 +2276,11 @@
    { 0x01000005, 0x20002d3c, 0x0021003c, 0x00020002 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x0000002d },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
-   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
-   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
-   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a005 },
-   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a006 },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a008 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a009 },
    { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
    { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
    { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
@@ -2206,8 +2321,8 @@
    { 0x80800042, 0x2aa04629, 0x00ad0bc3, 0x00ad0bc3 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x00000029 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
-   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
-   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
    { 0x00000005, 0x20580c21, 0x00210e60, 0x00000003 },
    { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 },
    { 0x00000020, 0x34001400, 0x00001400, 0x00210058 },
diff --git a/src/xvmc/dual_prime_igd.g4b b/src/xvmc/dual_prime_igd.g4b
index a411432..6477d06 100644
--- a/src/xvmc/dual_prime_igd.g4b
+++ b/src/xvmc/dual_prime_igd.g4b
@@ -1,4 +1,106 @@
    { 0x00600001, 0x29800021, 0x008d0020, 0x00000000 },
+   { 0x02000005, 0x20000c3c, 0x00210040, 0x00000001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000030 },
+   { 0x00000040, 0x20480c21, 0x00210988, 0x00000000 },
+   { 0x00800031, 0x20601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x20e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x21e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22401c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22601c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22801c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22a01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22c01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x22e01c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23001c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23201c21, 0x00b10040, 0x04110203 },
+   { 0x00000040, 0x20480c21, 0x00210048, 0x00000020 },
+   { 0x00800031, 0x23401c21, 0x00b10040, 0x04110203 },
+   { 0x02000005, 0x20002d3c, 0x0021098c, 0x00200020 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x20600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00100010 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x20700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x20f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00080008 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x21600169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21800169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21a00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21c00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21e00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22000169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22200169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22400169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00040004 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
+   { 0x00600001, 0x21700169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21900169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21b00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21d00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x21f00169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22100169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22300169, 0x00000000, 0x00000000 },
+   { 0x00600001, 0x22500169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00020002 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x22600169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22800169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22a00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x22c00169, 0x00000000, 0x00000000 },
+   { 0x02000005, 0x20002d3c, 0x0021002c, 0x00010001 },
+   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
+   { 0x00800001, 0x22e00169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23000169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23200169, 0x00000000, 0x00000000 },
+   { 0x00800001, 0x23400169, 0x00000000, 0x00000000 },
    { 0x00600001, 0x2e600021, 0x008d0020, 0x00000000 },
    { 0x00600001, 0x2e800021, 0x008d0020, 0x00000000 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
@@ -6,6 +108,8 @@
    { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
    { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00010001 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
    { 0x01000005, 0x20002d3c, 0x0021002e, 0x00010001 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x00000045 },
    { 0x01000005, 0x20002d3c, 0x00210030, 0x00010001 },
@@ -129,14 +233,15 @@
    { 0x00600001, 0x27c00021, 0x008d0ca0, 0x00000000 },
    { 0x00600001, 0x28000021, 0x008d0cc0, 0x00000000 },
    { 0x00600001, 0x28400021, 0x008d0ce0, 0x00000000 },
-   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00010001 },
-   { 0x00200040, 0x2e603421, 0x00450e80, 0x00450e6e },
+   { 0x0020000c, 0x2e6e3dad, 0x00450036, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
    { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
-   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000001 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x01000005, 0x20002d3c, 0x00210032, 0x00010001 },
+   { 0x02000005, 0x20000e3c, 0x0021003f, 0x00000004 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210036, 0x00010001 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x00000045 },
-   { 0x01000005, 0x20002d3c, 0x00210034, 0x00010001 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00010001 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x0000002f },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
    { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
@@ -205,7 +310,7 @@
    { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
    { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x0000002c },
-   { 0x01000005, 0x20002d3c, 0x00210034, 0x00010001 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00010001 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x00000017 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
    { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
@@ -258,10 +363,12 @@
    { 0x00600001, 0x28200021, 0x008d0cc0, 0x00000000 },
    { 0x00600001, 0x28600021, 0x008d0ce0, 0x00000000 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
-   { 0x0020000c, 0x2e600c21, 0x00210e80, 0x00000001 },
    { 0x0020000c, 0x2e6e3dad, 0x0045002e, 0x00020002 },
-   { 0x00200040, 0x2e603421, 0x00450e60, 0x00450e6e },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
    { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00010001 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
    { 0x01000005, 0x20002d3c, 0x0021002e, 0x00020002 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x00000036 },
    { 0x01000005, 0x20002d3c, 0x00210030, 0x00020002 },
@@ -354,14 +461,15 @@
    { 0x00600001, 0x29200129, 0x008d0a60, 0x00000000 },
    { 0x00600001, 0x29400129, 0x008d0a80, 0x00000000 },
    { 0x00600001, 0x29600129, 0x008d0aa0, 0x00000000 },
-   { 0x0020000c, 0x2e600c21, 0x00210e80, 0x00000001 },
-   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00020002 },
-   { 0x00200040, 0x2e603421, 0x00450e60, 0x00450e6e },
+   { 0x0020000c, 0x2e6e3dad, 0x00450036, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
    { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
-   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000001 },
-   { 0x01000005, 0x20002d3c, 0x00210032, 0x00020002 },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00040004 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210038, 0x00020002 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x00000036 },
-   { 0x01000005, 0x20002d3c, 0x00210034, 0x00020002 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00020002 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x00000028 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
    { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
@@ -415,7 +523,7 @@
    { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
    { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x0000001c },
-   { 0x01000005, 0x20002d3c, 0x00210034, 0x00020002 },
+   { 0x01000005, 0x20002d3c, 0x0021003a, 0x00020002 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x0000000f },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
    { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
@@ -451,29 +559,33 @@
    { 0x00600001, 0x29300129, 0x008d0a60, 0x00000000 },
    { 0x00600001, 0x29500129, 0x008d0a80, 0x00000000 },
    { 0x00600001, 0x29700129, 0x008d0aa0, 0x00000000 },
-   { 0x0020000c, 0x2e6e3dad, 0x00450036, 0x00010001 },
-   { 0x00200040, 0x2e603421, 0x00450e80, 0x00450e6e },
+   { 0x00600001, 0x20200021, 0x008d0e80, 0x00000000 },
+   { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
+   { 0x00000001, 0x20280061, 0x00000000, 0x0007000f },
+   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00010001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
    { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
-   { 0x00000040, 0x2e641c21, 0x00210e64, 0x00000001 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x01000005, 0x20002d3c, 0x00210036, 0x00010001 },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00020002 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210032, 0x00010001 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x00000045 },
-   { 0x01000005, 0x20002d3c, 0x00210038, 0x00010001 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00010001 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x0000002f },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
-   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a007 },
    { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
    { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
    { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
@@ -508,16 +620,16 @@
    { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x00000040 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
-   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
    { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
    { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
    { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
@@ -527,22 +639,22 @@
    { 0x80800042, 0x2cc04629, 0x00b10b40, 0x00b10b41 },
    { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10b81 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x0000002c },
-   { 0x01000005, 0x20002d3c, 0x00210038, 0x00010001 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00010001 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x00000017 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
-   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a007 },
    { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
    { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
    { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
@@ -553,16 +665,16 @@
    { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x00000013 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
-   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
    { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
    { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
    { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
@@ -579,30 +691,30 @@
    { 0x00600001, 0x24c00021, 0x008d0ca0, 0x00000000 },
    { 0x00600001, 0x25000021, 0x008d0cc0, 0x00000000 },
    { 0x00600001, 0x25400021, 0x008d0ce0, 0x00000000 },
-   { 0x03000010, 0x20003dbc, 0x00210034, 0x00000000 },
-   { 0x00010040, 0x203c3dad, 0x0021003c, 0x00050005 },
    { 0x0020000c, 0x2e6e3dad, 0x0045003a, 0x00010001 },
-   { 0x00200040, 0x2e603421, 0x00450e80, 0x00450e6e },
+   { 0x00200040, 0x2e6034a5, 0x00450e80, 0x00450e6e },
    { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
+   { 0x02000005, 0x20000c3c, 0x00210054, 0x00000008 },
+   { 0x00010040, 0x2e641ca5, 0x00210e64, 0x00000001 },
    { 0x01000005, 0x20002d3c, 0x0021003a, 0x00010001 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x00000045 },
    { 0x01000005, 0x20002d3c, 0x0021003c, 0x00010001 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x0000002f },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
-   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a007 },
    { 0x00800040, 0x2c004629, 0x00b109c0, 0x00b10a00 },
    { 0x00800040, 0x2c204629, 0x00b10a00, 0x00b10a40 },
    { 0x00800040, 0x2c404629, 0x00b10a40, 0x00b10a80 },
@@ -637,16 +749,16 @@
    { 0x00800008, 0x2ce02d29, 0x00b10ce0, 0x00020002 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x00000040 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
-   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
    { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b109c1 },
    { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a01 },
    { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a41 },
@@ -659,19 +771,19 @@
    { 0x01000005, 0x20002d3c, 0x0021003c, 0x00010001 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x00000017 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
-   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2bc01d29, 0x008d0e60, 0x0411a007 },
    { 0x80800042, 0x2c004629, 0x00b109c0, 0x00b10a00 },
    { 0x80800042, 0x2c204629, 0x00b10a00, 0x00b10a40 },
    { 0x80800042, 0x2c404629, 0x00b10a40, 0x00b10a80 },
@@ -682,16 +794,16 @@
    { 0x80800042, 0x2ce04629, 0x00b10b80, 0x00b10bc0 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x00000013 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000001f },
-   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x29c01d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a001d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a401d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
-   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a004 },
+   { 0x00800031, 0x2a801d29, 0x008d0e60, 0x0411a007 },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000002 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007001f },
-   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a004 },
+   { 0x00800031, 0x2ac01d29, 0x008d0e60, 0x0418a007 },
    { 0x00800001, 0x2c000229, 0x00b109c0, 0x00000000 },
    { 0x00800001, 0x2c200229, 0x00b10a00, 0x00000000 },
    { 0x00800001, 0x2c400229, 0x00b10a40, 0x00000000 },
@@ -717,22 +829,23 @@
    { 0x80800042, 0x25402529, 0x00b10840, 0x00b10540 },
    { 0x80800042, 0x25602529, 0x00b10860, 0x00b10ce0 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
-   { 0x0020000c, 0x2e600c21, 0x00210e80, 0x00000001 },
-   { 0x0020000c, 0x2e6e3dad, 0x00450036, 0x00020002 },
-   { 0x00200040, 0x2e603421, 0x00450e60, 0x00450e6e },
+   { 0x0020000c, 0x2e6e3dad, 0x00450032, 0x00020002 },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
    { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
-   { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000001 },
-   { 0x01000005, 0x20002d3c, 0x00210036, 0x00020002 },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00020002 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
+   { 0x01000005, 0x20002d3c, 0x00210032, 0x00020002 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x00000036 },
-   { 0x01000005, 0x20002d3c, 0x00210038, 0x00020002 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00020002 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x00000028 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
-   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
-   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
-   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a005 },
-   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a006 },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a008 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a009 },
    { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
    { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
    { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
@@ -767,8 +880,8 @@
    { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x00000028 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
-   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
-   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
    { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
    { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
    { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
@@ -778,14 +891,14 @@
    { 0x80800042, 0x2a804629, 0x00ad0ba0, 0x00ad0ba1 },
    { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0bc1 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x0000001c },
-   { 0x01000005, 0x20002d3c, 0x00210038, 0x00020002 },
+   { 0x01000005, 0x20002d3c, 0x00210034, 0x00020002 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x0000000f },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
-   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
-   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
-   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a005 },
-   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a006 },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a008 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a009 },
    { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
    { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
    { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
@@ -796,8 +909,8 @@
    { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x0000000b },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
-   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
-   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
    { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
    { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
    { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
@@ -814,21 +927,23 @@
    { 0x00600001, 0x26200129, 0x008d0a60, 0x00000000 },
    { 0x00600001, 0x26400129, 0x008d0a80, 0x00000000 },
    { 0x00600001, 0x26600129, 0x008d0aa0, 0x00000000 },
-   { 0x0020000c, 0x2e600c21, 0x00210e80, 0x00000001 },
    { 0x0020000c, 0x2e6e3dad, 0x0045003a, 0x00020002 },
-   { 0x00200040, 0x2e603421, 0x00450e60, 0x00450e6e },
+   { 0x0020000c, 0x2e601ca5, 0x00450e80, 0x00000001 },
+   { 0x00200040, 0x2e6034a5, 0x00450e60, 0x00450e6e },
    { 0x00000005, 0x2e640c21, 0x00210e64, 0xfffffffe },
+   { 0x02000005, 0x20002e3c, 0x0021003f, 0x00080008 },
+   { 0x00010040, 0x2e640c21, 0x00210e64, 0x00000001 },
    { 0x01000005, 0x20002d3c, 0x0021003a, 0x00020002 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x00000036 },
    { 0x01000005, 0x20002d3c, 0x0021003c, 0x00020002 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x00000028 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
-   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
-   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0001000f },
    { 0x00000040, 0x2e640c21, 0x00210e64, 0x00000008 },
-   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a005 },
-   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a006 },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a008 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a009 },
    { 0x00800040, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
    { 0x00800040, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
    { 0x00800040, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
@@ -863,8 +978,8 @@
    { 0x80800008, 0x2aa02d29, 0x00b10aa0, 0x00020002 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x00000028 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
-   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
-   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
    { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ac1 },
    { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0ae1 },
    { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b01 },
@@ -877,11 +992,11 @@
    { 0x01000005, 0x20002d3c, 0x0021003c, 0x00020002 },
    { 0x00010020, 0x34001c00, 0x00001400, 0x0000000f },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
-   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
-   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0000000f },
-   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a005 },
-   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a006 },
+   { 0x00800031, 0x2b401d29, 0x00ad0e60, 0x0411a008 },
+   { 0x00800031, 0x2be01d29, 0x00ad0e60, 0x0411a009 },
    { 0x80800042, 0x29c04629, 0x00ad0ac0, 0x00ad0ae0 },
    { 0x80800042, 0x29e04629, 0x00ad0ae0, 0x00ad0b00 },
    { 0x80800042, 0x2a004629, 0x00ad0b00, 0x00ad0b20 },
@@ -892,8 +1007,8 @@
    { 0x80800042, 0x2aa04629, 0x00ad0bc0, 0x00ad0be0 },
    { 0x00000020, 0x34001c00, 0x00001400, 0x0000000b },
    { 0x00000001, 0x2e680061, 0x00000000, 0x0007000f },
-   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a005 },
-   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a006 },
+   { 0x00800031, 0x2ac01d29, 0x00ad0e60, 0x0414a008 },
+   { 0x00800031, 0x2b601d29, 0x00ad0e60, 0x0414a009 },
    { 0x00800001, 0x29c00229, 0x00ad0ac0, 0x00000000 },
    { 0x00800001, 0x29e00229, 0x00ad0ae0, 0x00000000 },
    { 0x00800001, 0x2a000229, 0x00ad0b00, 0x00000000 },
commit fb84568d66aa9fe083da8ad34c1a847849622bd9
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Fri Dec 12 18:27:29 2008 +0800

    Don't warn on ring enabled in GEM
    (cherry picked from commit 80d588e9c49719ec494e705edfc14c78908bbc3f)

diff --git a/src/i830_debug.c b/src/i830_debug.c
index 17ee40f..8ce6ce6 100644
--- a/src/i830_debug.c
+++ b/src/i830_debug.c
@@ -1762,7 +1762,7 @@ i830_check_error_state(ScrnInfoPtr pScrn)
 	errors++;
     }
     temp = INREG(LP_RING + RING_LEN);
-    if (temp & 1) {
+    if (!pI830->memory_manager && (temp & 1)) {
 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
 		   "PRB0_CTL (0x%08lx) indicates ring buffer enabled\n", temp);
 	errors++;
commit c755187b695cd9093084fcf59bce57f00d959fb1
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Fri Dec 12 18:00:09 2008 +0800

    Fix directRenderingType check
    
    Don't miss classic texture memory allocation in DRI.
    (cherry picked from commit 60c4ee9ece8ea57e61b1590dfeb69d08555e465c)

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 7590257..d3b539a 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1557,21 +1557,14 @@ I830AccelMethodInit(ScrnInfoPtr pScrn)
 	pI830->directRenderingType = DRI_DISABLED;
 
 #ifdef XF86DRI
-    if (pI830->directRenderingType == DRI_XF86DRI) {
-	if ((pI830->accel == ACCEL_NONE) || pI830->SWCursor) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "DRI is disabled because it "
-		       "needs HW cursor and 2D acceleration.\n");
-	    pI830->directRenderingType = DRI_DISABLED;
-	} else if (pScrn->depth != 16 && pScrn->depth != 24) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "DRI is disabled because it "
-		       "runs only at depths 16 and 24.\n");
-	    pI830->directRenderingType = DRI_DISABLED;
-	}
-
-	if (pI830->directRenderingType == DRI_XF86DRI) {
-	   pI830->allocate_classic_textures =
-	      xf86ReturnOptValBool(pI830->Options, OPTION_LEGACY3D, TRUE);
-	}
+    if (pI830->accel == ACCEL_NONE) {
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "DRI is disabled because it "
+		"needs 2D acceleration.\n");
+	pI830->directRenderingType = DRI_DISABLED;
+    } else if (pScrn->depth != 16 && pScrn->depth != 24) {
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "DRI is disabled because it "
+		"runs only at depths 16 and 24.\n");
+	pI830->directRenderingType = DRI_DISABLED;
     }
 #endif /* XF86DRI */
 
@@ -1691,14 +1684,6 @@ I830XvInit(ScrnInfoPtr pScrn)
     xf86DrvMsg(pScrn->scrnIndex, from, "video overlay key set to 0x%x\n",
 	       pI830->colorKey);
 #endif
-#ifdef INTEL_XVMC
-    pI830->XvMCEnabled = FALSE;
-    from =  (pI830->directRenderingType != DRI_DISABLED &&
-	     xf86GetOptValBool(pI830->Options, OPTION_XVMC,
-			       &pI830->XvMCEnabled)) ? X_CONFIG : X_DEFAULT;
-    xf86DrvMsg(pScrn->scrnIndex, from, "Intel XvMC decoder %sabled\n",
-	       pI830->XvMCEnabled ? "en" : "dis");
-#endif
 }
 
 static void
@@ -3105,8 +3090,16 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
    /* If DRI hasn't been explicitly disabled, try to initialize it.
     * It will be used by the memory allocator.
     */
+   if (pI830->directRenderingType == DRI_NONE && pI830->SWCursor)
+       pI830->directRenderingType = DRI_DISABLED;
+
    if (pI830->directRenderingType == DRI_NONE && I830DRIScreenInit(pScreen))
        pI830->directRenderingType = DRI_XF86DRI;
+
+   if (pI830->directRenderingType == DRI_XF86DRI) {
+       pI830->allocate_classic_textures =
+	   xf86ReturnOptValBool(pI830->Options, OPTION_LEGACY3D, TRUE);
+   }
 #endif
 
    /* Enable tiling by default */
@@ -3262,7 +3255,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     * is called.   fbScreenInit will eventually call into the drivers
     * InitGLXVisuals call back.
     */
-
    if (pI830->directRenderingType == DRI_XF86DRI) {
       if (pI830->accel == ACCEL_NONE || pI830->SWCursor || (pI830->StolenOnly && I830IsPrimary(pScrn))) {
 	 xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "DRI is disabled because it "
@@ -3426,6 +3418,14 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
    xf86DPMSInit(pScreen, xf86DPMSSet, 0);
 
 #ifdef I830_XV
+#ifdef INTEL_XVMC
+    pI830->XvMCEnabled = FALSE;
+    from =  (pI830->directRenderingType == DRI_XF86DRI &&
+	     xf86GetOptValBool(pI830->Options, OPTION_XVMC,
+			       &pI830->XvMCEnabled)) ? X_CONFIG : X_DEFAULT;
+    xf86DrvMsg(pScrn->scrnIndex, from, "Intel XvMC decoder %sabled\n",
+	       pI830->XvMCEnabled ? "en" : "dis");
+#endif
    /* Init video */
    if (pI830->XvEnabled && !pI830->use_drm_mode)
       I830InitVideo(pScreen);
commit 1e5713fc4f7fc900f2f04f48e940c14d0cc3e74d
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Thu Dec 11 15:41:59 2008 +0800

     [965-xvmc] fix dual prime kernel, flush issue on G4x
    (cherry picked from commit edf765155497d89ecac328a5b268ecf60e2f377c)

diff --git a/src/xvmc/dual_prime.g4a b/src/xvmc/dual_prime.g4a
index f1a8c31..7066a75 100644
--- a/src/xvmc/dual_prime.g4a
+++ b/src/xvmc/dual_prime.g4a
@@ -13,11 +13,11 @@
  * Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDINg BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINgEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIgHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAgES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISINg FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINgS IN THE
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
  * Author:
@@ -26,23 +26,21 @@
  *    Xing Dong sheng <dongsheng.xing at intel.com>
  *
  */
-
-//and (1) g1.4<1>UD g1.4<1,1,1>UD 0xFFFFFFFEUD {align1};
 mov (8) g76.0<1>UD g1.0<8,8,1>UD {align1};
+//mov (8) g77.0<1>UD g2.0<8,8,1>UD {align1};
+
+include(`block_clear.g4i')
 mov (8) g115.0<1>UD g1.0<8,8,1>UD {align1};
 mov (8) g116.0<1>UD g1.0<8,8,1>UD {align1};
-mov(1) g115.8<1>UD 0x007001fUD  { align1 };
-//mov(1) g1.8<1>UD 0x007000fUD  { align1 };
 
-/*first vector---Y---top*/
-//and.nz (1) null g1.31<1,1,1>UB 1UW {align1};
+/* forward---Y---first vector*/
+mov(1) g115.8<1>UD 0x007001fUD  { align1 };
 asr (2) g115.14<1>W g1.14<2,2,1>W 1W {align1};
 add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
 and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
-//and.nz (1) null g1.31<1,1,1>UB 1UW {align1};
-//(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
-//add (1) g115.4<1>UD g115.4<1,1,1>UD 0UD {align1};
 mov(1) g115.8<1>UD 0x1fUD  { align1 }; //read 1 line, 32 columns.
+and.nz (1) null g1.31<1,1,1>UB 0x1UW {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
 define(`surface',`4')
 define(`mv1',`g1.14')
 define(`mv2',`g1.16')
@@ -56,17 +54,16 @@ mov (8) g62.0<1>UD g101.0<8,8,1>UD {align1};
 mov (8) g64.0<1>UD g102.0<8,8,1>UD {align1};
 mov (8) g66.0<1>UD g103.0<8,8,1>UD {align1};
 
-/*first vector---Y---bottom*/
-asr (2) g115.14<1>W g1.18<2,2,1>W 1W {align1};
-add (2) g115.0<1>UD g116.0<2,2,1>UD g115.14<2,2,1>W {align1};
+/*forward---Y---second vector*/
+asr (2) g115.14<1>W g1.22<2,2,1>W 1W {align1};
+add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
 and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
-//and.nz (1) null g1.31<1,1,1>UB 1UW {align1};
-//(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
-add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
 mov(1) g115.8<1>UD 0x1fUD { align1 }; //read 1 line, 32 columns.
+and.nz (1) null g1.31<1,1,1>UB 0x4UD {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
 define(`surface',`4')
-define(`mv1',`g1.18')
-define(`mv2',`g1.20')
+define(`mv1',`g1.22')
+define(`mv2',`g1.24')
 include(`motion_field_y.g4i')
 mov (8) g53.0<1>UD g96.0<8,8,1>UD {align1};
 mov (8) g55.0<1>UD g97.0<8,8,1>UD {align1};
@@ -77,14 +74,14 @@ mov (8) g63.0<1>UD g101.0<8,8,1>UD {align1};
 mov (8) g65.0<1>UD g102.0<8,8,1>UD {align1};
 mov (8) g67.0<1>UD g103.0<8,8,1>UD {align1};
 
-/*first vector---UV---top*/
+/*forward---UV---first vector*/
 mov(1) g115.8<1>UD 0x007000fUD  { align1 };
-asr (2) g115.0<1>UD g116.0<1,1,1>UD 1UD {align1}; // x/=2 y/=2 
-asr (2) g115.14<1>W g1.14<2,2,1>W 2W {align1};   // vector/=4
-add (2) g115.0<1>UD g115.0<2,2,1>UD g115.14<2,2,1>W {align1}; // (x,y)+=vector
-and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};  // cut y
-//and.nz (1) null g1.31<1,1,1>UB 1UW {align1};
-//(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+asr (2) g115.14<1>W g1.14<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g1.31<1,1,1>UB 0x1UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
 define(`surface_u',`5')
 define(`surface_v',`6')
 define(`mv1',`g1.14')
@@ -99,19 +96,15 @@ mov (8) g73.0<1>UW g83.0<8,8,1>UW {align1};
 mov (8) g74.0<1>UW g84.0<8,8,1>UW {align1};
 mov (8) g75.0<1>UW g85.0<8,8,1>UW {align1};
 
-
-/*first vector---UV---bottom*/
-asr (2) g115.0<1>UD g116.0<1,1,1>UD 1UD {align1}; // x/=2 y/=2 
-asr (2) g115.14<1>W g1.18<2,2,1>W 2W {align1};   // vector/=4
-add (2) g115.0<1>UD g115.0<2,2,1>UD g115.14<2,2,1>W {align1}; // (x,y)+=vector
-and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};  // cut y
-//and.nz (1) null g1.31<1,1,1>UB 1UW {align1};
-//(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
-add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
-define(`surface_u',`5')
-define(`surface_v',`6')
-define(`mv1',`g1.18')
-define(`mv2',`g1.20')
+/*forward---UV---second vector */
+asr (2) g115.14<1>W g1.22<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g1.31<1,1,1>UB 0x4UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`mv1',`g1.24')
+define(`mv2',`g1.26')
 include(`motion_field_uv.g4i')
 mov (8) g68.16<1>UW g78.0<8,8,1>UW {align1};
 mov (8) g69.16<1>UW g79.0<8,8,1>UW {align1};
@@ -122,25 +115,19 @@ mov (8) g73.16<1>UW g83.0<8,8,1>UW {align1};
 mov (8) g74.16<1>UW g84.0<8,8,1>UW {align1};
 mov (8) g75.16<1>UW g85.0<8,8,1>UW {align1};
 
-
-
-/*second vector---Y---top*/
-//mov(1) g115.8<1>UD 0x007001fUD  { align1 };
-//mov(1) g1.8<1>UD 0x007000fUD  { align1 };
-//cmp.g (1) null g1.14<1,1,1>W 0W {align1};
-//(f0) add (1) g1.22<1>W g1.22<1,1,1>W 1W {align1};
-//cmp.g (1) null g1.16<1,1,1>W 0W {align1};
-//(f0) add (1) g1.24<1>W g1.24<1,1,1>W 10W {align1};
-asr (2) g115.14<1>W g1.22<2,2,1>W 1W {align1};
-add (2) g115.0<1>UD g116.0<2,2,1>UD g115.14<2,2,1>W {align1};
+/*backward---Y---first vector */
+mov(8) g1.0<1>UD g116.0<8,8,1>UD {align1};
+mov(1) g115.8<1>UD 0x007001fUD  { align1 };
+mov(1) g1.8<1>UD 0x007000fUD  { align1 };
+asr (2) g115.14<1>W g1.18<2,2,1>W 1W {align1};
+add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
 and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
-//and.nz (1) null g1.31<1,1,1>UB 4UW {align1};
-//(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
-add (1) g115.4<1>UD g115.4<1,1,1>UD 1D {align1};
 mov(1) g115.8<1>UD 0x1fUD  { align1 }; //read 1 line, 32 columns.
-define(`surface',`4')
-define(`mv1',`g1.22')
-define(`mv2',`g1.24')
+and.nz (1) null g1.31<1,1,1>UB 0x2UW {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
+define(`surface',`7')
+define(`mv1',`g1.18')
+define(`mv2',`g1.20')
 include(`motion_field_y.g4i')
 mov (8) g28.0<1>UD g96.0<8,8,1>UD {align1};
 mov (8) g30.0<1>UD g97.0<8,8,1>UD {align1};
@@ -151,18 +138,14 @@ mov (8) g38.0<1>UD g101.0<8,8,1>UD {align1};
 mov (8) g40.0<1>UD g102.0<8,8,1>UD {align1};
 mov (8) g42.0<1>UD g103.0<8,8,1>UD {align1};
 
-/*second vector---Y---bottom*/
-//cmp.g (1) null g1.18<1,1,1>W 0W {align1};
-//(f0) add (1) g1.26<1>W g1.26<1,1,1>W 1W {align1};
-cmp.g (1) null g1.20<1,1,1>W 0W {align1};
-(f0) add (1) g1.28<1>W g1.28<1,1,1>W 5W {align1};
+/*backward---Y---second vector */
 asr (2) g115.14<1>W g1.26<2,2,1>W 1W {align1};
-add (2) g115.0<1>UD g116.0<2,2,1>UD g115.14<2,2,1>W {align1};
+add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
 and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
-//and.nz (1)null g1.31<1,1,1>UB 4UW {align1};
-//(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
 mov(1) g115.8<1>UD 0x1fUD  { align1 }; //read 1 line, 32 columns.
-define(`surface',`4')
+and.nz (1) null g2.20<1,1,1>UD 0x8UD {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
+define(`surface',`7')
 define(`mv1',`g1.26')
 define(`mv2',`g1.28')
 include(`motion_field_y.g4i')
@@ -184,19 +167,18 @@ avg.sat (16) g41.0<1>UW g65.0<16,16,1>UW g102.0<16,16,1>UW {align1};
 avg.sat (16) g42.0<1>UW g66.0<16,16,1>UW g42.0<16,16,1>UW {align1};
 avg.sat (16) g43.0<1>UW g67.0<16,16,1>UW g103.0<16,16,1>UW {align1};
 
-/*second vector---UV---top*/
+/*backward---UV---first vector */
 mov(1) g115.8<1>UD 0x007000fUD  { align1 };
-asr (2) g115.0<1>UD g116.0<1,1,1>UD 1UD {align1}; // x/=2 y/=2 
-asr (2) g115.14<1>W g1.22<2,2,1>W 2W {align1};   // vector/=4
-add (2) g115.0<1>UD g115.0<2,2,1>UD g115.14<2,2,1>W {align1}; // (x,y)+=vector
-and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};  // cut y
-//and.nz (1) null g1.31<1,1,1>UB 4UW {align1};
-//(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
-add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
-define(`surface_u',`5')
-define(`surface_v',`6')
-define(`mv1',`g1.22')
-define(`mv2',`g1.24')
+asr (2) g115.14<1>W g1.18<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g1.31<1,1,1>UB 0x2UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface_u',`8')
+define(`surface_v',`9')
+define(`mv1',`g1.18')
+define(`mv2',`g1.20')
 include(`motion_field_uv.g4i')
 mov (8) g44.0<1>UW g78.0<8,8,1>UW {align1};
 mov (8) g45.0<1>UW g79.0<8,8,1>UW {align1};
@@ -207,15 +189,13 @@ mov (8) g49.0<1>UW g83.0<8,8,1>UW {align1};
 mov (8) g50.0<1>UW g84.0<8,8,1>UW {align1};
 mov (8) g51.0<1>UW g85.0<8,8,1>UW {align1};
 
-/*second vector---UV---bottom*/
-asr (2) g115.0<1>UD g116.0<1,1,1>UD 1UD {align1}; // x/=2 y/=2 
-asr (2) g115.14<1>W g1.26<2,2,1>W 2W {align1};   // vector/=4
-add (2) g115.0<1>UD g115.0<2,2,1>UD g115.14<2,2,1>W {align1}; // (x,y)+=vector
-and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};  // cut y
-//and.nz (1) null g1.31<1,1,1>UB 4UW {align1};
-//(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
-define(`surface_u',`5')
-define(`surface_v',`6')
+/*backward---UV---second vector */
+asr (2) g115.14<1>W g1.26<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g1.31<1,1,1>UB 0x8UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
 define(`mv1',`g1.26')
 define(`mv2',`g1.28')
 include(`motion_field_uv.g4i')
@@ -236,6 +216,7 @@ avg.sat (16) g48.0<1>UW g72.0<16,16,1>UW g48.0<16,16,1>UW {align1};
 avg.sat (16) g49.0<1>UW g73.0<16,16,1>UW g49.0<16,16,1>UW {align1};
 avg.sat (16) g50.0<1>UW g74.0<16,16,1>UW g50.0<16,16,1>UW {align1};
 avg.sat (16) g51.0<1>UW g75.0<16,16,1>UW g51.0<16,16,1>UW {align1};
+
 include(`addidct.g4i')
 
 //send (16) 0 acc0<1>UW g0<8,8,1>UW 
diff --git a/src/xvmc/dual_prime_igd.g4a b/src/xvmc/dual_prime_igd.g4a
index 4a59cad..e741244 100644
--- a/src/xvmc/dual_prime_igd.g4a
+++ b/src/xvmc/dual_prime_igd.g4a
@@ -13,11 +13,11 @@
  * Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDINg BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINgEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIgHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAgES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISINg FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINgS IN THE
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
  * Author:
@@ -26,23 +26,21 @@
  *    Xing Dong sheng <dongsheng.xing at intel.com>
  *
  */
-
-//and (1) g1.4<1>UD g1.4<1,1,1>UD 0xFFFFFFFEUD {align1};
 mov (8) g76.0<1>UD g1.0<8,8,1>UD {align1};
+//mov (8) g77.0<1>UD g2.0<8,8,1>UD {align1};
+
+include(`block_clear.g4i')
 mov (8) g115.0<1>UD g1.0<8,8,1>UD {align1};
 mov (8) g116.0<1>UD g1.0<8,8,1>UD {align1};
-mov(1) g115.8<1>UD 0x007001fUD  { align1 };
-//mov(1) g1.8<1>UD 0x007000fUD  { align1 };
 
-/*first vector---Y---top*/
-//and.nz (1) null g1.31<1,1,1>UB 1UW {align1};
+/* forward---Y---first vector*/
+mov(1) g115.8<1>UD 0x007001fUD  { align1 };
 asr (2) g115.14<1>W g1.14<2,2,1>W 1W {align1};
 add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
 and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
-//and.nz (1) null g1.31<1,1,1>UB 1UW {align1};
-//(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
-//add (1) g115.4<1>UD g115.4<1,1,1>UD 0UD {align1};
 mov(1) g115.8<1>UD 0x1fUD  { align1 }; //read 1 line, 32 columns.
+and.nz (1) null g1.31<1,1,1>UB 0x1UW {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
 define(`surface',`4')
 define(`mv1',`g1.14')
 define(`mv2',`g1.16')
@@ -56,17 +54,16 @@ mov (8) g62.0<1>UD g101.0<8,8,1>UD {align1};
 mov (8) g64.0<1>UD g102.0<8,8,1>UD {align1};
 mov (8) g66.0<1>UD g103.0<8,8,1>UD {align1};
 
-/*first vector---Y---bottom*/
-asr (2) g115.14<1>W g1.18<2,2,1>W 1W {align1};
-add (2) g115.0<1>UD g116.0<2,2,1>UD g115.14<2,2,1>W {align1};
+/*forward---Y---second vector*/
+asr (2) g115.14<1>W g1.22<2,2,1>W 1W {align1};
+add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
 and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
-//and.nz (1) null g1.31<1,1,1>UB 1UW {align1};
-//(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
-add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
 mov(1) g115.8<1>UD 0x1fUD { align1 }; //read 1 line, 32 columns.
+and.nz (1) null g1.31<1,1,1>UB 0x4UD {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
 define(`surface',`4')
-define(`mv1',`g1.18')
-define(`mv2',`g1.20')
+define(`mv1',`g1.22')
+define(`mv2',`g1.24')
 include(`motion_field_y_igd.g4i')
 mov (8) g53.0<1>UD g96.0<8,8,1>UD {align1};
 mov (8) g55.0<1>UD g97.0<8,8,1>UD {align1};
@@ -77,14 +74,14 @@ mov (8) g63.0<1>UD g101.0<8,8,1>UD {align1};
 mov (8) g65.0<1>UD g102.0<8,8,1>UD {align1};
 mov (8) g67.0<1>UD g103.0<8,8,1>UD {align1};
 
-/*first vector---UV---top*/
+/*forward---UV---first vector*/
 mov(1) g115.8<1>UD 0x007000fUD  { align1 };
-asr (2) g115.0<1>UD g116.0<1,1,1>UD 1UD {align1}; // x/=2 y/=2 
-asr (2) g115.14<1>W g1.14<2,2,1>W 2W {align1};   // vector/=4
-add (2) g115.0<1>UD g115.0<2,2,1>UD g115.14<2,2,1>W {align1}; // (x,y)+=vector
-and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};  // cut y
-//and.nz (1) null g1.31<1,1,1>UB 1UW {align1};
-//(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+asr (2) g115.14<1>W g1.14<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g1.31<1,1,1>UB 0x1UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
 define(`surface_u',`5')
 define(`surface_v',`6')
 define(`mv1',`g1.14')
@@ -99,19 +96,15 @@ mov (8) g73.0<1>UW g83.0<8,8,1>UW {align1};
 mov (8) g74.0<1>UW g84.0<8,8,1>UW {align1};
 mov (8) g75.0<1>UW g85.0<8,8,1>UW {align1};
 
-
-/*first vector---UV---bottom*/
-asr (2) g115.0<1>UD g116.0<1,1,1>UD 1UD {align1}; // x/=2 y/=2 
-asr (2) g115.14<1>W g1.18<2,2,1>W 2W {align1};   // vector/=4
-add (2) g115.0<1>UD g115.0<2,2,1>UD g115.14<2,2,1>W {align1}; // (x,y)+=vector
-and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};  // cut y
-//and.nz (1) null g1.31<1,1,1>UB 1UW {align1};
-//(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
-add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
-define(`surface_u',`5')
-define(`surface_v',`6')
-define(`mv1',`g1.18')
-define(`mv2',`g1.20')
+/*forward---UV---second vector */
+asr (2) g115.14<1>W g1.22<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g1.31<1,1,1>UB 0x4UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`mv1',`g1.24')
+define(`mv2',`g1.26')
 include(`motion_field_uv_igd.g4i')
 mov (8) g68.16<1>UW g78.0<8,8,1>UW {align1};
 mov (8) g69.16<1>UW g79.0<8,8,1>UW {align1};
@@ -122,25 +115,19 @@ mov (8) g73.16<1>UW g83.0<8,8,1>UW {align1};
 mov (8) g74.16<1>UW g84.0<8,8,1>UW {align1};
 mov (8) g75.16<1>UW g85.0<8,8,1>UW {align1};
 
-
-
-/*second vector---Y---top*/
-//mov(1) g115.8<1>UD 0x007001fUD  { align1 };
-//mov(1) g1.8<1>UD 0x007000fUD  { align1 };
-//cmp.g (1) null g1.14<1,1,1>W 0W {align1};
-//(f0) add (1) g1.22<1>W g1.22<1,1,1>W 1W {align1};
-//cmp.g (1) null g1.16<1,1,1>W 0W {align1};
-//(f0) add (1) g1.24<1>W g1.24<1,1,1>W 10W {align1};
-asr (2) g115.14<1>W g1.22<2,2,1>W 1W {align1};
-add (2) g115.0<1>UD g116.0<2,2,1>UD g115.14<2,2,1>W {align1};
+/*backward---Y---first vector */
+mov(8) g1.0<1>UD g116.0<8,8,1>UD {align1};
+mov(1) g115.8<1>UD 0x007001fUD  { align1 };
+mov(1) g1.8<1>UD 0x007000fUD  { align1 };
+asr (2) g115.14<1>W g1.18<2,2,1>W 1W {align1};
+add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
 and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
-//and.nz (1) null g1.31<1,1,1>UB 4UW {align1};
-//(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
-add (1) g115.4<1>UD g115.4<1,1,1>UD 1D {align1};
 mov(1) g115.8<1>UD 0x1fUD  { align1 }; //read 1 line, 32 columns.
-define(`surface',`4')
-define(`mv1',`g1.22')
-define(`mv2',`g1.24')
+and.nz (1) null g1.31<1,1,1>UB 0x2UW {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
+define(`surface',`7')
+define(`mv1',`g1.18')
+define(`mv2',`g1.20')
 include(`motion_field_y_igd.g4i')
 mov (8) g28.0<1>UD g96.0<8,8,1>UD {align1};
 mov (8) g30.0<1>UD g97.0<8,8,1>UD {align1};
@@ -151,18 +138,14 @@ mov (8) g38.0<1>UD g101.0<8,8,1>UD {align1};
 mov (8) g40.0<1>UD g102.0<8,8,1>UD {align1};
 mov (8) g42.0<1>UD g103.0<8,8,1>UD {align1};
 
-/*second vector---Y---bottom*/
-//cmp.g (1) null g1.18<1,1,1>W 0W {align1};
-//(f0) add (1) g1.26<1>W g1.26<1,1,1>W 1W {align1};
-cmp.g (1) null g1.20<1,1,1>W 0W {align1};
-(f0) add (1) g1.28<1>W g1.28<1,1,1>W 5W {align1};
+/*backward---Y---second vector */
 asr (2) g115.14<1>W g1.26<2,2,1>W 1W {align1};
-add (2) g115.0<1>UD g116.0<2,2,1>UD g115.14<2,2,1>W {align1};
+add (2) g115.0<1>D g116.0<2,2,1>D g115.14<2,2,1>W {align1};
 and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
-//and.nz (1)null g1.31<1,1,1>UB 4UW {align1};
-//(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
 mov(1) g115.8<1>UD 0x1fUD  { align1 }; //read 1 line, 32 columns.
-define(`surface',`4')
+and.nz (1) null g2.20<1,1,1>UD 0x8UD {align1};
+(f0) add (1) g115.4<1>D g115.4<1,1,1>D 1D {align1};
+define(`surface',`7')
 define(`mv1',`g1.26')
 define(`mv2',`g1.28')
 include(`motion_field_y_igd.g4i')
@@ -184,19 +167,18 @@ avg.sat (16) g41.0<1>UW g65.0<16,16,1>UW g102.0<16,16,1>UW {align1};
 avg.sat (16) g42.0<1>UW g66.0<16,16,1>UW g42.0<16,16,1>UW {align1};
 avg.sat (16) g43.0<1>UW g67.0<16,16,1>UW g103.0<16,16,1>UW {align1};
 
-/*second vector---UV---top*/
+/*backward---UV---first vector */
 mov(1) g115.8<1>UD 0x007000fUD  { align1 };
-asr (2) g115.0<1>UD g116.0<1,1,1>UD 1UD {align1}; // x/=2 y/=2 
-asr (2) g115.14<1>W g1.22<2,2,1>W 2W {align1};   // vector/=4
-add (2) g115.0<1>UD g115.0<2,2,1>UD g115.14<2,2,1>W {align1}; // (x,y)+=vector
-and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};  // cut y
-//and.nz (1) null g1.31<1,1,1>UB 4UW {align1};
-//(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
-add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
-define(`surface_u',`5')
-define(`surface_v',`6')
-define(`mv1',`g1.22')
-define(`mv2',`g1.24')
+asr (2) g115.14<1>W g1.18<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g1.31<1,1,1>UB 0x2UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
+define(`surface_u',`8')
+define(`surface_v',`9')
+define(`mv1',`g1.18')
+define(`mv2',`g1.20')
 include(`motion_field_uv_igd.g4i')
 mov (8) g44.0<1>UW g78.0<8,8,1>UW {align1};
 mov (8) g45.0<1>UW g79.0<8,8,1>UW {align1};
@@ -207,15 +189,13 @@ mov (8) g49.0<1>UW g83.0<8,8,1>UW {align1};
 mov (8) g50.0<1>UW g84.0<8,8,1>UW {align1};
 mov (8) g51.0<1>UW g85.0<8,8,1>UW {align1};
 
-/*second vector---UV---bottom*/
-asr (2) g115.0<1>UD g116.0<1,1,1>UD 1UD {align1}; // x/=2 y/=2 
-asr (2) g115.14<1>W g1.26<2,2,1>W 2W {align1};   // vector/=4
-add (2) g115.0<1>UD g115.0<2,2,1>UD g115.14<2,2,1>W {align1}; // (x,y)+=vector
-and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};  // cut y
-//and.nz (1) null g1.31<1,1,1>UB 4UW {align1};
-//(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
-define(`surface_u',`5')
-define(`surface_v',`6')
+/*backward---UV---second vector */
+asr (2) g115.14<1>W g1.26<2,2,1>W 2W {align1};
+asr (2) g115.0<1>D g116.0<2,2,1>D 1D {align1};
+add (2) g115.0<1>D g115.0<2,2,1>D g115.14<2,2,1>W {align1};
+and (1) g115.4<1>UD g115.4<1,1,1>UD 0xFFFFFFFEUD {align1};
+and.nz (1) null g1.31<1,1,1>UB 0x8UW {align1};
+(f0) add (1) g115.4<1>UD g115.4<1,1,1>UD 1UD {align1};
 define(`mv1',`g1.26')
 define(`mv2',`g1.28')
 include(`motion_field_uv_igd.g4i')
@@ -236,6 +216,7 @@ avg.sat (16) g48.0<1>UW g72.0<16,16,1>UW g48.0<16,16,1>UW {align1};
 avg.sat (16) g49.0<1>UW g73.0<16,16,1>UW g49.0<16,16,1>UW {align1};
 avg.sat (16) g50.0<1>UW g74.0<16,16,1>UW g50.0<16,16,1>UW {align1};
 avg.sat (16) g51.0<1>UW g75.0<16,16,1>UW g51.0<16,16,1>UW {align1};
+
 include(`addidct.g4i')
 
 //send (16) 0 acc0<1>UW g0<8,8,1>UW 
diff --git a/src/xvmc/i965_xvmc.c b/src/xvmc/i965_xvmc.c
index 8ccdd77..31d6896 100644
--- a/src/xvmc/i965_xvmc.c
+++ b/src/xvmc/i965_xvmc.c
@@ -176,6 +176,7 @@ static void flush()
     struct brw_mi_flush flush;
     memset(&flush, 0, sizeof(flush));
     flush.opcode = CMD_MI_FLUSH;
+    flush.flags = (1<<1);
     BATCH_STRUCT(flush);
 }
 


More information about the xorg-commit mailing list