Move the WM kernel to a separate file.

2 files changed, 54 insertions, 52 deletions

diff --git a/src/i830_video.c b/src/i830_video.c
index 01a028d3..a3f8b62b 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -2728,58 +2728,7 @@ static const CARD32 sf_kernel_static[][4] = {
 #define PS_MAX_THREADS	   1 /* MIN(12, PS_KERNEL_NUM_URB / 2) */
 
 static const CARD32 ps_kernel_static[][4] = {
-/*    mov (8) g2<1>F g1.8<0,1,0>UW { align1 +  } */
-   { 0x00600001, 0x2040013d, 0x00000028, 0x00000000 },
-/*    add (8) g2<1>F g2<8,8,1>F g1<0,1,0>F { align1 +  } */
-   { 0x00600040, 0x204077bd, 0x008d0040, 0x00004020 },
-/*    mul (8) g2<1>F g2<8,8,1>F g10<0,1,0>F { align1 +  } */
-   { 0x00600041, 0x204077bd, 0x008d0040, 0x00000140 },
-/*    add (8) g2<1>F g2<8,8,1>F g12<0,1,0>F { align1 +  } */
-   { 0x00600040, 0x204077bd, 0x008d0040, 0x00000180 },
-/*    mov (8) g3<1>F g1.10<0,1,0>UW { align1 +  } */
-   { 0x00600001, 0x2060013d, 0x0000002a, 0x00000000 },
-/*    add (8) g3<1>F g3<8,8,1>F g1.4<0,1,0>F { align1 +  } */
-   { 0x00600040, 0x206077bd, 0x008d0060, 0x00004024 },
-/*    mul (8) g3<1>F g3<8,8,1>F g11<0,1,0>F { align1 +  } */
-   { 0x00600041, 0x206077bd, 0x008d0060, 0x00000160 },
-/*    add (8) g3<1>F g3<8,8,1>F g12.4<0,1,0>F { align1 +  } */
-   { 0x00600040, 0x206077bd, 0x008d0060, 0x00000184 },
-/*    mov (8) m2<1>F g2<8,8,1>F { align1 +  } */
-   { 0x00600001, 0x204003be, 0x008d0040, 0x00000000 },
-/*    mov (8) m3<1>F g3<8,8,1>F { align1 +  } */
-   { 0x00600001, 0x206003be, 0x008d0060, 0x00000000 },
-/*    mov (8) m4<1>F 0{ align1 +  } */
-   { 0x00600001, 0x208073fe, 0x00000000, 0x00000000 },
-/*    mov (8) m5<1>F 1{ align1 +  } */
-   { 0x00600001, 0x20a073fe, 0x00000000, 0x3f800000 },
-/*    mov (8) m6<1>F g2<8,8,1>F { align1 +  } */
-   { 0x00600001, 0x20c003be, 0x008d0040, 0x00000000 },
-/*    mov (8) m7<1>F g3<8,8,1>F { align1 +  } */
-   { 0x00600001, 0x20e003be, 0x008d0060, 0x00000000 },
-/*    mov (8) m8<1>F 0{ align1 +  } */
-   { 0x00600001, 0x210073fe, 0x00000000, 0x00000000 },
-/*    mov (8) m9<1>F 1{ align1 +  } */
-   { 0x00600001, 0x212073fe, 0x00000000, 0x3f800000 },
-/*    mov (8) m1<1>UD g1<8,8,1>UD { align1 mask_disable +  } */
-   { 0x00600201, 0x20200022, 0x008d0020, 0x00000000 },
-/*    send   0 (16) a0<1>UW g0<8,8,1>UW write mlen 10 rlen 0 EOT{ align1 +  } */
-   { 0x00800031, 0x20001d28, 0x008d0000, 0x85a04800 },
-/*    nop (4) g0<1>UD { align1 +  } */
-   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
-/*    nop (4) g0<1>UD { align1 +  } */
-   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+#include "wm_prog.h"
 };
 
 #define ALIGN(i,m)    (((i) + (m) - 1) & ~((m) - 1))
diff --git a/src/wm_prog.h b/src/wm_prog.h
new file mode 100644
index 00000000..9fe775c8
--- /dev/null
+++ b/src/wm_prog.h
@@ -0,0 +1,53 @@
+/* wm_program */
+/*    mov (8) g2<1>F g1.8<0,1,0>UW { align1 +  } */
+   { 0x00600001, 0x2040013d, 0x00000028, 0x00000000 },
+/*    add (8) g2<1>F g2<8,8,1>F g1<0,1,0>F { align1 +  } */
+   { 0x00600040, 0x204077bd, 0x008d0040, 0x00004020 },
+/*    mul (8) g2<1>F g2<8,8,1>F g10<0,1,0>F { align1 +  } */
+   { 0x00600041, 0x204077bd, 0x008d0040, 0x00000140 },
+/*    add (8) g2<1>F g2<8,8,1>F g12<0,1,0>F { align1 +  } */
+   { 0x00600040, 0x204077bd, 0x008d0040, 0x00000180 },
+/*    mov (8) g3<1>F g1.10<0,1,0>UW { align1 +  } */
+   { 0x00600001, 0x2060013d, 0x0000002a, 0x00000000 },
+/*    add (8) g3<1>F g3<8,8,1>F g1.4<0,1,0>F { align1 +  } */
+   { 0x00600040, 0x206077bd, 0x008d0060, 0x00004024 },
+/*    mul (8) g3<1>F g3<8,8,1>F g11<0,1,0>F { align1 +  } */
+   { 0x00600041, 0x206077bd, 0x008d0060, 0x00000160 },
+/*    add (8) g3<1>F g3<8,8,1>F g12.4<0,1,0>F { align1 +  } */
+   { 0x00600040, 0x206077bd, 0x008d0060, 0x00000184 },
+/*    mov (8) m2<1>F g2<8,8,1>F { align1 +  } */
+   { 0x00600001, 0x204003be, 0x008d0040, 0x00000000 },
+/*    mov (8) m3<1>F g3<8,8,1>F { align1 +  } */
+   { 0x00600001, 0x206003be, 0x008d0060, 0x00000000 },
+/*    mov (8) m4<1>F 0{ align1 +  } */
+   { 0x00600001, 0x208073fe, 0x00000000, 0x00000000 },
+/*    mov (8) m5<1>F 1{ align1 +  } */
+   { 0x00600001, 0x20a073fe, 0x00000000, 0x3f800000 },
+/*    mov (8) m6<1>F g2<8,8,1>F { align1 +  } */
+   { 0x00600001, 0x20c003be, 0x008d0040, 0x00000000 },
+/*    mov (8) m7<1>F g3<8,8,1>F { align1 +  } */
+   { 0x00600001, 0x20e003be, 0x008d0060, 0x00000000 },
+/*    mov (8) m8<1>F 0{ align1 +  } */
+   { 0x00600001, 0x210073fe, 0x00000000, 0x00000000 },
+/*    mov (8) m9<1>F 1{ align1 +  } */
+   { 0x00600001, 0x212073fe, 0x00000000, 0x3f800000 },
+/*    mov (8) m1<1>UD g1<8,8,1>UD { align1 mask_disable +  } */
+   { 0x00600201, 0x20200022, 0x008d0020, 0x00000000 },
+/*    send   0 (16) a0<1>UW g0<8,8,1>UW write mlen 10 rlen 0 EOT{ align1 +  } */
+   { 0x00800031, 0x20001d28, 0x008d0000, 0x85a04800 },
+/*    nop (4) g0<1>UD { align1 +  } */
+   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+/*    nop (4) g0<1>UD { align1 +  } */
+   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+/*    nop (4) g0<1>UD { align1 +  } */
+   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+/*    nop (4) g0<1>UD { align1 +  } */
+   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+/*    nop (4) g0<1>UD { align1 +  } */
+   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+/*    nop (4) g0<1>UD { align1 +  } */
+   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+/*    nop (4) g0<1>UD { align1 +  } */
+   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },
+/*    nop (4) g0<1>UD { align1 +  } */
+   { 0x0040007e, 0x20000c21, 0x00690000, 0x00000000 },