diff options
author | Zou Nan hai <nanhai.zou@intel.com> | 2008-08-11 15:45:35 +0800 |
---|---|---|
committer | Zou Nan hai <nanhai.zou@intel.com> | 2008-08-11 15:45:35 +0800 |
commit | 915c370964d8dbab48ff24ede2c5e78e7b39132d (patch) | |
tree | 6e8b571fd50b26e52712f4798c819288bcbf7c34 | |
parent | 19ebdf1b24184c0a293a698d44c4e0571109d153 (diff) |
[965-xvmc] some fixes for earlier 965 chips
-rw-r--r-- | src/xvmc/backward.g4a | 2 | ||||
-rw-r--r-- | src/xvmc/backward.g4b | 26 | ||||
-rw-r--r-- | src/xvmc/f_b.g4a | 2 | ||||
-rw-r--r-- | src/xvmc/f_b.g4b | 50 | ||||
-rw-r--r-- | src/xvmc/forward.g4a | 2 | ||||
-rw-r--r-- | src/xvmc/forward.g4b | 26 | ||||
-rw-r--r-- | src/xvmc/i965_xvmc.c | 2 | ||||
-rw-r--r-- | src/xvmc/ipicture.g4a | 2 | ||||
-rw-r--r-- | src/xvmc/ipicture.g4b | 2 | ||||
-rw-r--r-- | src/xvmc/motion.g4i | 8 | ||||
-rw-r--r-- | src/xvmc/null.g4a | 2 | ||||
-rw-r--r-- | src/xvmc/null.g4b | 2 |
12 files changed, 63 insertions, 63 deletions
diff --git a/src/xvmc/backward.g4a b/src/xvmc/backward.g4a index 4197bd1c..55c1f73b 100644 --- a/src/xvmc/backward.g4a +++ b/src/xvmc/backward.g4a @@ -154,5 +154,5 @@ mov (16) m1.0<1>UD g4.0<8,8,1>UD {align1 compr}; send (16) 0 acc0<1>UW g1<8,8,1>UW write(2, 0, 2, 0) mlen 3 rlen 0 { align1 }; /* kill the thread */ -send (16) 0 null g0<8,8,1>UW +send (16) 0 acc0<1>UW g0<8,8,1>UW thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT}; diff --git a/src/xvmc/backward.g4b b/src/xvmc/backward.g4b index ab52774a..f1e9edd3 100644 --- a/src/xvmc/backward.g4b +++ b/src/xvmc/backward.g4b @@ -8,7 +8,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x00210074, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a007 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -144,7 +144,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210070, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a007 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -253,7 +253,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x00210074, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a007 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -389,7 +389,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210070, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a007 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -498,7 +498,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x00210074, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a007 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -634,7 +634,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210070, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a007 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -742,7 +742,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x00210074, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a007 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -878,7 +878,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210070, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a007 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -988,7 +988,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x00210074, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a008 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -1124,7 +1124,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210070, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a008 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -1231,7 +1231,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x00210074, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a009 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -1367,7 +1367,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210070, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a009 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -1469,4 +1469,4 @@ { 0x00800001, 0x20b00231, 0x00b20120, 0x00000000 }, { 0x00802001, 0x20200022, 0x008d0080, 0x00000000 }, { 0x00800031, 0x24001d28, 0x008d0020, 0x05302002 }, - { 0x00800031, 0x20001d3c, 0x008d0000, 0x87100000 }, + { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 }, diff --git a/src/xvmc/f_b.g4a b/src/xvmc/f_b.g4a index 4c4acb3d..ebded357 100644 --- a/src/xvmc/f_b.g4a +++ b/src/xvmc/f_b.g4a @@ -201,5 +201,5 @@ include(`correct.g4i') mov (16) m1.0<1>UD g4.0<8,8,1>UD {align1 compr}; send (16) 0 acc0<1>UW g1<8,8,1>UW write(2, 0, 2, 0) mlen 3 rlen 0 { align1 }; -send (16) 0 null g0<8,8,1>UW +send (16) 0 acc0<1>UW g0<8,8,1>UW thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT}; diff --git a/src/xvmc/f_b.g4b b/src/xvmc/f_b.g4b index 1477f2c8..beace4df 100644 --- a/src/xvmc/f_b.g4b +++ b/src/xvmc/f_b.g4b @@ -7,7 +7,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x00210074, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a004 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -143,7 +143,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210070, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a004 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -226,7 +226,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x0021007c, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a007 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -362,7 +362,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210078, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a007 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -488,7 +488,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x00210074, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a004 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -624,7 +624,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210070, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a004 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -707,7 +707,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x0021007c, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a007 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -843,7 +843,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210078, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a007 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -969,7 +969,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x00210074, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a004 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -1105,7 +1105,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210070, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a004 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -1188,7 +1188,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x0021007c, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a007 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -1324,7 +1324,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210078, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a007 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -1449,7 +1449,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x00210074, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a004 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -1585,7 +1585,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210070, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a004 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -1668,7 +1668,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x0021007c, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a007 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -1804,7 +1804,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210078, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a007 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -1930,7 +1930,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x00210074, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a005 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -2066,7 +2066,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210070, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a005 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -2150,7 +2150,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x0021007c, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a008 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -2286,7 +2286,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210078, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a008 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -2410,7 +2410,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x00210074, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a006 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -2546,7 +2546,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210070, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a006 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -2629,7 +2629,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x0021007c, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a009 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -2765,7 +2765,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210078, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a009 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -2883,4 +2883,4 @@ { 0x00800001, 0x20b00231, 0x00b20120, 0x00000000 }, { 0x00802001, 0x20200022, 0x008d0080, 0x00000000 }, { 0x00800031, 0x24001d28, 0x008d0020, 0x05302002 }, - { 0x00800031, 0x20001d3c, 0x008d0000, 0x87100000 }, + { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 }, diff --git a/src/xvmc/forward.g4a b/src/xvmc/forward.g4a index bcb1a32e..4f772a58 100644 --- a/src/xvmc/forward.g4a +++ b/src/xvmc/forward.g4a @@ -152,5 +152,5 @@ mov (16) m1.0<1>UD g4.0<8,8,1>UD {align1 compr}; send (16) 0 acc0<1>UW g1<8,8,1>UW write(2, 0, 2, 0) mlen 3 rlen 0 { align1 }; /* kill the thread */ -send (16) 0 null g0<8,8,1>UW +send (16) 0 acc0<1>UW g0<8,8,1>UW thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT}; diff --git a/src/xvmc/forward.g4b b/src/xvmc/forward.g4b index 2e9a5239..6c46c508 100644 --- a/src/xvmc/forward.g4b +++ b/src/xvmc/forward.g4b @@ -7,7 +7,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x00210074, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a004 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -143,7 +143,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210070, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a004 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -252,7 +252,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x00210074, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a004 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -388,7 +388,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210070, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a004 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -497,7 +497,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x00210074, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a004 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -633,7 +633,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210070, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a004 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -741,7 +741,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x00210074, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a004 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -877,7 +877,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210070, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a004 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -987,7 +987,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x00210074, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a005 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -1123,7 +1123,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210070, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a005 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -1230,7 +1230,7 @@ { 0x00010020, 0x34001c00, 0x00001400, 0x00000088 }, { 0x01000005, 0x20000c3c, 0x00210074, 0x00000001 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000055 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a006 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000011 }, @@ -1366,7 +1366,7 @@ { 0x00000020, 0x34001c00, 0x00001400, 0x0000004e }, { 0x01000005, 0x20000c3c, 0x00210070, 0x00000000 }, { 0x00010020, 0x34001c00, 0x00001400, 0x00000034 }, - { 0x00000001, 0x20480061, 0x00000000, 0x0008000f }, + { 0x00000001, 0x20480061, 0x00000000, 0x0009000f }, { 0x00000005, 0x20580c21, 0x00210040, 0x00000003 }, { 0x00800031, 0x21801d29, 0x008d0040, 0x0415a006 }, { 0x00000041, 0x20580c21, 0x00210058, 0x00000009 }, @@ -1468,4 +1468,4 @@ { 0x00800001, 0x20b00231, 0x00b20120, 0x00000000 }, { 0x00802001, 0x20200022, 0x008d0080, 0x00000000 }, { 0x00800031, 0x24001d28, 0x008d0020, 0x05302002 }, - { 0x00800031, 0x20001d3c, 0x008d0000, 0x87100000 }, + { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 }, diff --git a/src/xvmc/i965_xvmc.c b/src/xvmc/i965_xvmc.c index 761ff9bf..eea6566c 100644 --- a/src/xvmc/i965_xvmc.c +++ b/src/xvmc/i965_xvmc.c @@ -408,7 +408,7 @@ static void vfe_state(struct media_state *media_state) state->vfe1.num_urb_entries = 1; /* XXX TODO */ /* should carefully caculate those values for performance */ - state->vfe1.urb_entry_alloc_size = 18; + state->vfe1.urb_entry_alloc_size = 2; state->vfe1.max_threads = 15; state->vfe2.interface_descriptor_base = media_state->interface_descriptor_offset[0] >> 4; diff --git a/src/xvmc/ipicture.g4a b/src/xvmc/ipicture.g4a index f40210c7..ca4ed9db 100644 --- a/src/xvmc/ipicture.g4a +++ b/src/xvmc/ipicture.g4a @@ -169,5 +169,5 @@ mov (16) g9.16<1>UB g7.0<16,16,2>UB {align1 }; mov (16) m1<1>UD g8.0<8,8,1>UD {align1 compr}; send (16) 0 acc0<1>UW g1<8,8,1>UW write(2, 0, 2, 0) mlen 3 rlen 0 { align1 }; -send (16) 0 null g0<8,8,1>UW +send (16) 0 acc0<1>UW g0<8,8,1>UW thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT}; diff --git a/src/xvmc/ipicture.g4b b/src/xvmc/ipicture.g4b index 1e009ac6..875cf5c6 100644 --- a/src/xvmc/ipicture.g4b +++ b/src/xvmc/ipicture.g4b @@ -116,4 +116,4 @@ { 0x00800001, 0x21300231, 0x00b200e0, 0x00000000 }, { 0x00802001, 0x20200022, 0x008d0100, 0x00000000 }, { 0x00800031, 0x24001d28, 0x008d0020, 0x05302002 }, - { 0x00800031, 0x20001d3c, 0x008d0000, 0x87100000 }, + { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 }, diff --git a/src/xvmc/motion.g4i b/src/xvmc/motion.g4i index a6172afc..04b5c4ba 100644 --- a/src/xvmc/motion.g4i +++ b/src/xvmc/motion.g4i @@ -43,8 +43,8 @@ /* if ((mv[1] & 1 == 1) { */ and.z (1) null mv2<1,1,1>UD 1UD {align1}; (f0) jmpi L2; - /* 9x16 media read */ - mov (1) g2.8<1>UD 0x008000fUD {align1}; + /* 10x16 media read */ + mov (1) g2.8<1>UD 0x009000fUD {align1}; include(`media_read_avg_x1y1.g4i') jmpi L3; /* } else { */ @@ -61,8 +61,8 @@ L1: and.z (1) null mv1<1,1,1>UD 0UD {align1}; /* jump to L4 */ (f0) jmpi L4; - /* 9x16 media read */ - mov (1) g2.8<1>UD 0x008000fUD {align1}; + /* 10x16 media read */ + mov (1) g2.8<1>UD 0x009000fUD {align1}; include(`media_read_avg_x0y1.g4i') /* } else { */ L4: diff --git a/src/xvmc/null.g4a b/src/xvmc/null.g4a index b17b2fb1..2e8eb977 100644 --- a/src/xvmc/null.g4a +++ b/src/xvmc/null.g4a @@ -29,5 +29,5 @@ shr (1) g1.4<1>UD g3.4<1,1,1>UD 1D {align1}; send (16) 0 acc0<1>UW g1<8,8,1>UW write(2, 0, 2, 0) mlen 3 rlen 0 { align1 }; send (16) 0 acc0<1>UW g1<8,8,1>UW write(1, 0, 2, 0) mlen 3 rlen 0 { align1 }; -send (16) 0 null g0<8,8,1>UW +send (16) 0 acc0<1>UW g0<8,8,1>UW thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT}; diff --git a/src/xvmc/null.g4b b/src/xvmc/null.g4b index 165aead5..60542cfc 100644 --- a/src/xvmc/null.g4b +++ b/src/xvmc/null.g4b @@ -20,4 +20,4 @@ { 0x00000008, 0x20241c21, 0x00210064, 0x00000001 }, { 0x00800031, 0x24001d28, 0x008d0020, 0x05302002 }, { 0x00800031, 0x24001d28, 0x008d0020, 0x05302001 }, - { 0x00800031, 0x20001d3c, 0x008d0000, 0x87100000 }, + { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 }, |