projects / profile / ivi / vaapi-intel-driver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 60c394e)
Support sub-partition for Inter frame
authorXiang, Haihao <haihao.xiang@intel.com>
Fri, 6 Apr 2012 07:46:18 +0000 (15:46 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Fri, 6 Apr 2012 08:07:02 +0000 (16:07 +0800)
Also support 32 MVs

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
src/shaders/vme/inter_frame.asm patch | blob | history
src/shaders/vme/inter_frame.g6b patch | blob | history
src/shaders/vme/inter_frame.g7b patch | blob | history
src/shaders/vme/intra_frame.g6b patch | blob | history
src/shaders/vme/intra_frame.g7b patch | blob | history
src/shaders/vme/vme.inc patch | blob | history

diff --git a/src/shaders/vme/inter_frame.asm b/src/shaders/vme/inter_frame.asm
index a808cf3..f6877aa 100644 (file)
--- a/src/shaders/vme/inter_frame.asm
+++ b/src/shaders/vme/inter_frame.asm
@@ -89,14 +89,30 @@ mov  (8) msg_reg0.0<1>:UD       obw_m0.0<8,8,1>:UD {align1};
 #ifdef DEV_SNB        
 mov  (16) obw_m1.0<1>:UW        vme_wb1.0<16,16,1>:UB  {align1};
 add  (8) obw_m1.0<2>:W          obw_m1.0<16,8,2>:W -64:W {align1};
-add  (8) obw_m1.2<2>:W          obw_m1.2<16,8,2>:W -48:W {align1}; 
+add  (8) obw_m1.2<2>:W          obw_m1.2<16,8,2>:W -48:W {align1};
+mov  (16) obw_m2.0<1>:UW        vme_wb1.16<16,16,1>:UB  {align1};
+add  (8) obw_m2.0<2>:W          obw_m2.0<16,8,2>:W -64:W {align1};
+add  (8) obw_m2.2<2>:W          obw_m2.2<16,8,2>:W -48:W {align1}; 
+mov  (16) obw_m3.0<1>:UW        vme_wb2.0<16,16,1>:UB  {align1};
+add  (8) obw_m3.0<2>:W          obw_m3.0<16,8,2>:W -64:W {align1};
+add  (8) obw_m3.2<2>:W          obw_m3.2<16,8,2>:W -48:W {align1};
+mov  (16) obw_m4.0<1>:UW        vme_wb2.16<16,16,1>:UB  {align1};
+add  (8) obw_m4.0<2>:W          obw_m4.0<16,8,2>:W -64:W {align1};
+add  (8) obw_m4.2<2>:W          obw_m4.2<16,8,2>:W -48:W {align1}; 
 #else
-mov  (16) obw_m1.0<1>:UW        vme_wb1.0<16,16,1>:B  {align1};        
+mov  (16) obw_m1.0<1>:UW        vme_wb1.0<16,16,1>:B  {align1};
+mov  (16) obw_m2.0<1>:UW        vme_wb1.16<16,16,1>:B  {align1};
+mov  (16) obw_m3.0<1>:UW        vme_wb2.0<16,16,1>:B  {align1};
+mov  (16) obw_m4.0<1>:UW        vme_wb2.16<16,16,1>:B  {align1};                
 #endif       
         
 mov  (8) msg_reg1.0<1>:UD       obw_m1.0<8,8,1>:UD   {align1};
 
-mov  (8) msg_reg2.0<1>:UD       obw_m1.0<8,8,1>:UD   {align1};
+mov  (8) msg_reg2.0<1>:UD       obw_m2.0<8,8,1>:UD   {align1};
+
+mov  (8) msg_reg3.0<1>:UD       obw_m3.0<8,8,1>:UD   {align1};
+
+mov  (8) msg_reg4.0<1>:UD       obw_m4.0<8,8,1>:UD   {align1};                
 
 /* bind index 3, write 8 oword, msg type: 8(OWord Block Write) */
 send (16)
diff --git a/src/shaders/vme/inter_frame.g6b b/src/shaders/vme/inter_frame.g6b
index 82a6e91..4520cff 100644 (file)
--- a/src/shaders/vme/inter_frame.g6b
+++ b/src/shaders/vme/inter_frame.g6b
@@ -5,7 +5,7 @@
    { 0x00200009, 0x24402e29, 0x004500a0, 0x00040004 },
    { 0x00000040, 0x24403dad, 0x00000440, 0xfff0fff0 },
    { 0x00000040, 0x24423dad, 0x00000442, 0xfff4fff4 },
-   { 0x00000001, 0x244c0061, 0x00000000, 0x70203100 },
+   { 0x00000001, 0x244c0061, 0x00000000, 0x00203100 },
    { 0x00000001, 0x24540231, 0x00000014, 0x00000000 },
    { 0x00000001, 0x24560169, 0x00000000, 0x28302830 },
    { 0x00000001, 0x24600061, 0x00000000, 0x00000002 },
@@ -25,24 +25,35 @@
    { 0x00800001, 0x24a00229, 0x00b101a0, 0x00000000 },
    { 0x00600040, 0x44a03dad, 0x00ae04a0, 0xffc0ffc0 },
    { 0x00600040, 0x44a23dad, 0x00ae04a2, 0xffd0ffd0 },
+   { 0x00800001, 0x24c00229, 0x00b101b0, 0x00000000 },
+   { 0x00600040, 0x44c03dad, 0x00ae04c0, 0xffc0ffc0 },
+   { 0x00600040, 0x44c23dad, 0x00ae04c2, 0xffd0ffd0 },
+   { 0x00800001, 0x24e00229, 0x00b101c0, 0x00000000 },
+   { 0x00600040, 0x44e03dad, 0x00ae04e0, 0xffc0ffc0 },
+   { 0x00600040, 0x44e23dad, 0x00ae04e2, 0xffd0ffd0 },
+   { 0x00800001, 0x25000229, 0x00b101d0, 0x00000000 },
+   { 0x00600040, 0x45003dad, 0x00ae0500, 0xffc0ffc0 },
+   { 0x00600040, 0x45023dad, 0x00ae0502, 0xffd0ffd0 },
    { 0x00600001, 0x20200022, 0x008d04a0, 0x00000000 },
-   { 0x00600001, 0x20400022, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x20400022, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x20600022, 0x008d04e0, 0x00000000 },
+   { 0x00600001, 0x20800022, 0x008d0500, 0x00000000 },
    { 0x05800031, 0x22001cdd, 0x00000000, 0x0a1b0403 },
    { 0x00000040, 0x20080c22, 0x00000488, 0x00000008 },
-   { 0x00000001, 0x24e20169, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x24e40061, 0x00000000, 0x00000000 },
+   { 0x00000001, 0x25420169, 0x00000000, 0x00000000 },
+   { 0x00000001, 0x25440061, 0x00000000, 0x00000000 },
    { 0x01000005, 0x20000c20, 0x00000180, 0x00002000 },
-   { 0x00010005, 0x24e22d29, 0x00000182, 0x00700070 },
-   { 0x00010008, 0x24e43d21, 0x002004e2, 0x00040004 },
-   { 0x00010041, 0x24e40c21, 0x000004e4, 0x00000060 },
-   { 0x00010040, 0x24e42c21, 0x000004e4, 0x00200020 },
-   { 0x00010009, 0x24e22d29, 0x000004e2, 0x00010001 },
-   { 0x00010040, 0x24e22d29, 0x000004e2, 0x00400040 },
-   { 0x00000040, 0x24e22d29, 0x000004e2, 0x000e000e },
+   { 0x00010005, 0x25422d29, 0x00000182, 0x00700070 },
+   { 0x00010008, 0x25443d21, 0x00200542, 0x00040004 },
+   { 0x00010041, 0x25440c21, 0x00000544, 0x00000060 },
+   { 0x00010040, 0x25442c21, 0x00000544, 0x00200020 },
+   { 0x00010009, 0x25422d29, 0x00000542, 0x00010001 },
+   { 0x00010040, 0x25422d29, 0x00000542, 0x00400040 },
+   { 0x00000040, 0x25422d29, 0x00000542, 0x000e000e },
    { 0x00000001, 0x2020012a, 0x00000180, 0x00000000 },
-   { 0x00000001, 0x2022012a, 0x000004e2, 0x00000000 },
+   { 0x00000001, 0x2022012a, 0x00000542, 0x00000000 },
    { 0x00000001, 0x20240022, 0x0000019c, 0x00000000 },
-   { 0x00000001, 0x20280022, 0x000004e4, 0x00000000 },
+   { 0x00000001, 0x20280022, 0x00000544, 0x00000000 },
    { 0x05800031, 0x22001cdd, 0x00000000, 0x041b0003 },
    { 0x00000040, 0x20a02e31, 0x000000a0, 0x00010001 },
    { 0x00000040, 0x24482d29, 0x00000448, 0x00100010 },
@@ -55,6 +66,6 @@
    { 0x00010040, 0x24423dad, 0x00000442, 0x00100010 },
    { 0x00000040, 0x24882c21, 0x00000488, 0x000a000a },
    { 0x01000040, 0x20a63dad, 0x020000a6, 0xffffffff },
-   { 0x00110020, 0x34001c00, 0x02001400, 0xffffffae },
+   { 0x00110020, 0x34001c00, 0x02001400, 0xffffff98 },
    { 0x00600001, 0x20000022, 0x008d0000, 0x00000000 },
    { 0x07800031, 0x24001cc8, 0x00000000, 0x82000010 },
diff --git a/src/shaders/vme/inter_frame.g7b b/src/shaders/vme/inter_frame.g7b
index 6be71a8..ef0f9db 100644 (file)
--- a/src/shaders/vme/inter_frame.g7b
+++ b/src/shaders/vme/inter_frame.g7b
@@ -4,7 +4,7 @@
    { 0x00200009, 0x24482e29, 0x004500a0, 0x00040004 },
    { 0x00000001, 0x244001ed, 0x00000000, 0xfff0fff0 },
    { 0x00000001, 0x244201ed, 0x00000000, 0xfff4fff4 },
-   { 0x00000001, 0x244c0061, 0x00000000, 0x70203100 },
+   { 0x00000001, 0x244c0061, 0x00000000, 0x00203100 },
    { 0x00000001, 0x24540231, 0x00000014, 0x00000000 },
    { 0x00000001, 0x24560169, 0x00000000, 0x28302830 },
    { 0x00000001, 0x24600061, 0x00000000, 0x00000002 },
@@ -22,24 +22,29 @@
    { 0x08600031, 0x21801cbd, 0x00000800, 0x0a682000 },
    { 0x00600001, 0x28000021, 0x008d0480, 0x00000000 },
    { 0x00800001, 0x24a002a9, 0x00b101a0, 0x00000000 },
+   { 0x00800001, 0x24c002a9, 0x00b101b0, 0x00000000 },
+   { 0x00800001, 0x24e002a9, 0x00b101c0, 0x00000000 },
+   { 0x00800001, 0x250002a9, 0x00b101d0, 0x00000000 },
    { 0x00600001, 0x28200021, 0x008d04a0, 0x00000000 },
-   { 0x00600001, 0x28400021, 0x008d04a0, 0x00000000 },
+   { 0x00600001, 0x28400021, 0x008d04c0, 0x00000000 },
+   { 0x00600001, 0x28600021, 0x008d04e0, 0x00000000 },
+   { 0x00600001, 0x28800021, 0x008d0500, 0x00000000 },
    { 0x0a800031, 0x20001cac, 0x00000800, 0x0a0a0403 },
    { 0x00000040, 0x28080c21, 0x00000488, 0x00000008 },
-   { 0x00000001, 0x24e20169, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x24e40061, 0x00000000, 0x00000000 },
+   { 0x00000001, 0x25420169, 0x00000000, 0x00000000 },
+   { 0x00000001, 0x25440061, 0x00000000, 0x00000000 },
    { 0x01000005, 0x20000c20, 0x00000180, 0x00002000 },
-   { 0x00010005, 0x24e22d29, 0x00000182, 0x00700070 },
-   { 0x00010008, 0x24e43d21, 0x002004e2, 0x00040004 },
-   { 0x00010041, 0x24e40c21, 0x000004e4, 0x00000060 },
-   { 0x00010040, 0x24e42c21, 0x000004e4, 0x00200020 },
-   { 0x00010009, 0x24e22d29, 0x000004e2, 0x00010001 },
-   { 0x00010040, 0x24e22d29, 0x000004e2, 0x00400040 },
-   { 0x00000040, 0x24e22d29, 0x000004e2, 0x000e000e },
+   { 0x00010005, 0x25422d29, 0x00000182, 0x00700070 },
+   { 0x00010008, 0x25443d21, 0x00200542, 0x00040004 },
+   { 0x00010041, 0x25440c21, 0x00000544, 0x00000060 },
+   { 0x00010040, 0x25442c21, 0x00000544, 0x00200020 },
+   { 0x00010009, 0x25422d29, 0x00000542, 0x00010001 },
+   { 0x00010040, 0x25422d29, 0x00000542, 0x00400040 },
+   { 0x00000040, 0x25422d29, 0x00000542, 0x000e000e },
    { 0x00000001, 0x28200129, 0x00000180, 0x00000000 },
-   { 0x00000001, 0x28220129, 0x000004e2, 0x00000000 },
+   { 0x00000001, 0x28220129, 0x00000542, 0x00000000 },
    { 0x00000001, 0x28240021, 0x0000019c, 0x00000000 },
-   { 0x00000001, 0x28280021, 0x000004e4, 0x00000000 },
+   { 0x00000001, 0x28280021, 0x00000544, 0x00000000 },
    { 0x0a800031, 0x20001cac, 0x00000800, 0x040a0003 },
    { 0x00000040, 0x20a02e31, 0x000000a0, 0x00010001 },
    { 0x00000040, 0x24482d29, 0x00000448, 0x00100010 },
@@ -49,6 +54,6 @@
    { 0x00010040, 0x244a2d29, 0x0000044a, 0x00100010 },
    { 0x00000040, 0x24882c21, 0x00000488, 0x000a000a },
    { 0x01000040, 0x20a63dad, 0x020000a6, 0xffffffff },
-   { 0x00110020, 0x34001c00, 0x02001400, 0xffffffb8 },
+   { 0x00110020, 0x34001c00, 0x02001400, 0xffffffae },
    { 0x00600001, 0x28000021, 0x008d0000, 0x00000000 },
    { 0x07800031, 0x24001ca8, 0x00000800, 0x82000010 },
diff --git a/src/shaders/vme/intra_frame.g6b b/src/shaders/vme/intra_frame.g6b
index 638a7ad..ddc7404 100644 (file)
--- a/src/shaders/vme/intra_frame.g6b
+++ b/src/shaders/vme/intra_frame.g6b
@@ -29,9 +29,9 @@
    { 0x00010040, 0x247d1e31, 0x0000047d, 0x00000010 },
    { 0x02000041, 0x20004628, 0x000000a0, 0x000000a1 },
    { 0x00010040, 0x247d1e31, 0x0000047d, 0x00000004 },
-   { 0x00000040, 0x24c02e2d, 0x000000a0, 0x00010001 },
-   { 0x00000040, 0x24c0352d, 0x000000a2, 0x000044c0 },
-   { 0x02000041, 0x200045a0, 0x000004c0, 0x000000a1 },
+   { 0x00000040, 0x25202e2d, 0x000000a0, 0x00010001 },
+   { 0x00000040, 0x2520352d, 0x000000a2, 0x00004520 },
+   { 0x02000041, 0x200045a0, 0x00000520, 0x000000a1 },
    { 0x00010040, 0x247d1e31, 0x0000047d, 0x00000008 },
    { 0x00600001, 0x20200022, 0x008d0460, 0x00000000 },
    { 0x00600001, 0x20400062, 0x00000000, 0x00000000 },
diff --git a/src/shaders/vme/intra_frame.g7b b/src/shaders/vme/intra_frame.g7b
index 7d08ee3..db5b2a0 100644 (file)
--- a/src/shaders/vme/intra_frame.g7b
+++ b/src/shaders/vme/intra_frame.g7b
@@ -29,9 +29,9 @@
    { 0x00010040, 0x247d1e31, 0x0000047d, 0x00000010 },
    { 0x02000041, 0x20004628, 0x000000a0, 0x000000a1 },
    { 0x00010040, 0x247d1e31, 0x0000047d, 0x00000004 },
-   { 0x00000040, 0x24c02e2d, 0x000000a0, 0x00010001 },
-   { 0x00000040, 0x24c0352d, 0x000000a2, 0x000044c0 },
-   { 0x02000041, 0x200045a0, 0x000004c0, 0x000000a1 },
+   { 0x00000040, 0x25202e2d, 0x000000a0, 0x00010001 },
+   { 0x00000040, 0x2520352d, 0x000000a2, 0x00004520 },
+   { 0x02000041, 0x200045a0, 0x00000520, 0x000000a1 },
    { 0x00010040, 0x247d1e31, 0x0000047d, 0x00000008 },
    { 0x00600001, 0x28200021, 0x008d0460, 0x00000000 },
    { 0x00600001, 0x28400061, 0x00000000, 0x00000000 },
diff --git a/src/shaders/vme/vme.inc b/src/shaders/vme/vme.inc
index cf1069a..cbd189b 100644 (file)
--- a/src/shaders/vme/vme.inc
+++ b/src/shaders/vme/vme.inc
@@ -46,7 +46,7 @@ define(`INTER_SAD_HAAR',                `0x00200000')
 define(`INTRA_SAD_NONE',                `0x00000000')
 define(`INTRA_SAD_HAAR',                `0x00800000')
 
-define(`INTER_PART_MASK',               `0x70000000')
+define(`INTER_PART_MASK',               `0x00000000')
 
 define(`SEARCH_CTRL_SINGLE',            `0x00000000')
 define(`SEARCH_CTRL_DUAL_START',        `0x00000100')
@@ -190,20 +190,26 @@ define(`obw_m0',                `tmp_reg4')
 define(`tmp_reg5',              `r37')
 define(`obw_m1',                `tmp_reg5')
 define(`tmp_reg6',              `r38')
-define(`tmp_x_w',               `tmp_reg6.0')
+define(`obw_m2',                `tmp_reg6')
 define(`tmp_reg7',              `r39')
-define(`tmp_ud0',               `tmp_reg7.0')
-define(`tmp_ud1',               `tmp_reg7.4')
-define(`tmp_ud2',               `tmp_reg7.8')
-define(`tmp_ud3',               `tmp_reg7.12')
-define(`tmp_uw0',               `tmp_reg7.0')
-define(`tmp_uw1',               `tmp_reg7.2')
-define(`tmp_uw2',               `tmp_reg7.4')
-define(`tmp_uw3',               `tmp_reg7.6')
-define(`tmp_uw4',               `tmp_reg7.8')
-define(`tmp_uw5',               `tmp_reg7.10')
-define(`tmp_uw6',               `tmp_reg7.12')
-define(`tmp_uw7',               `tmp_reg7.14')
+define(`obw_m3',                `tmp_reg7')
+define(`tmp_reg8',              `r40')
+define(`obw_m4',                `tmp_reg8')
+define(`tmp_reg9',              `r41')
+define(`tmp_x_w',               `tmp_reg9.0')
+define(`tmp_rega',              `r42')
+define(`tmp_ud0',               `tmp_rega.0')
+define(`tmp_ud1',               `tmp_rega.4')
+define(`tmp_ud2',               `tmp_rega.8')
+define(`tmp_ud3',               `tmp_rega.12')
+define(`tmp_uw0',               `tmp_rega.0')
+define(`tmp_uw1',               `tmp_rega.2')
+define(`tmp_uw2',               `tmp_rega.4')
+define(`tmp_uw3',               `tmp_rega.6')
+define(`tmp_uw4',               `tmp_rega.8')
+define(`tmp_uw5',               `tmp_rega.10')
+define(`tmp_uw6',               `tmp_rega.12')
+define(`tmp_uw7',               `tmp_rega.14')
 
 /*
  * MRF registers
Domain: Multimedia / Uncategorized;