ENC: Enable all Intra mode on Ivybridge

The same fields will be ignored on Sandybridge

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>

diff --git a/src/shaders/vme/inter_frame.asm b/src/shaders/vme/inter_frame.asm
index ef68e4c..28ae28c 100644 (file)
--- a/src/shaders/vme/inter_frame.asm
+++ b/src/shaders/vme/inter_frame.asm
@@ -105,6 +105,8 @@ mov  (8) vme_msg_1<1>:UD        vme_m1.0<8,8,1>:UD {align1};
 mov  (8) vme_msg_2<1>:UD        0x0:UD {align1};
 
 /* m3 */
+mov  (1) INEP_ROW.0<1>:UD       0x0:UD {align1};
+and  (1) INEP_ROW.4<1>:UD       INEP_ROW.4<0,1,0>:UD            0xFF000000:UD {align1};
 mov  (8) vme_msg_3<1>:UD        INEP_ROW.0<8,8,1>:UD {align1};        
 
 /* m4 */

diff --git a/src/shaders/vme/inter_frame.g6b b/src/shaders/vme/inter_frame.g6b
index bef169b..2dc55ab 100644 (file)
--- a/src/shaders/vme/inter_frame.g6b
+++ b/src/shaders/vme/inter_frame.g6b
@@ -46,6 +46,8 @@
    { 0x00010005, 0x247d1e31, 0x0000047d, 0x000000e0 },
    { 0x00600001, 0x20200022, 0x008d0460, 0x00000000 },
    { 0x00600001, 0x20400062, 0x00000000, 0x00000000 },
+   { 0x00000001, 0x22400061, 0x00000000, 0x00000000 },
+   { 0x00000005, 0x22440c21, 0x00000244, 0xff000000 },
    { 0x00600001, 0x20400022, 0x008d0240, 0x00000000 },
    { 0x00600001, 0x206000e2, 0x00000000, 0x00000000 },
    { 0x00800001, 0x20600232, 0x00cf0283, 0x00000000 },
@@ -102,6 +104,6 @@
    { 0x00010040, 0x24423dad, 0x00000442, 0x00100010 },
    { 0x00000040, 0x24882c21, 0x00000488, 0x000a000a },
    { 0x01000040, 0x20a63dad, 0x020000a6, 0xffffffff },
-   { 0x00110020, 0x34001c00, 0x02001400, 0xffffff62 },
+   { 0x00110020, 0x34001c00, 0x02001400, 0xffffff5e },
    { 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 98bf471..7eac26d 100644 (file)
--- a/src/shaders/vme/inter_frame.g7b
+++ b/src/shaders/vme/inter_frame.g7b
@@ -45,6 +45,8 @@
    { 0x00010005, 0x247d1e31, 0x0000047d, 0x000000e0 },
    { 0x00600001, 0x28200021, 0x008d0460, 0x00000000 },
    { 0x00600001, 0x28400061, 0x00000000, 0x00000000 },
+   { 0x00000001, 0x22400061, 0x00000000, 0x00000000 },
+   { 0x00000005, 0x22440c21, 0x00000244, 0xff000000 },
    { 0x00600001, 0x28600021, 0x008d0240, 0x00000000 },
    { 0x00600001, 0x288000e1, 0x00000000, 0x00000000 },
    { 0x00800001, 0x28800231, 0x00cf0283, 0x00000000 },
@@ -90,6 +92,6 @@
    { 0x00010040, 0x244a2d29, 0x0000044a, 0x00100010 },
    { 0x00000040, 0x24882c21, 0x00000488, 0x000a000a },
    { 0x01000040, 0x20a63dad, 0x020000a6, 0xffffffff },
-   { 0x00110020, 0x34001c00, 0x02001400, 0xffffff78 },
+   { 0x00110020, 0x34001c00, 0x02001400, 0xffffff74 },
    { 0x00600001, 0x28000021, 0x008d0000, 0x00000000 },
    { 0x07800031, 0x24001ca8, 0x00000800, 0x82000010 },

diff --git a/src/shaders/vme/intra_frame.asm b/src/shaders/vme/intra_frame.asm
index 23f99be..2cd70cc 100644 (file)
--- a/src/shaders/vme/intra_frame.asm
+++ b/src/shaders/vme/intra_frame.asm
@@ -87,7 +87,9 @@ mov  (8) vme_msg_1<1>:UD        vme_m1.0<8,8,1>:UD {align1};
 /* m2 */        
 mov (8) vme_msg_2<1>:UD         0x0:UD {align1};
         
-/* m3 */        
+/* m3 */
+mov  (1) INEP_ROW.0<1>:UD       0x0:UD {align1};
+and  (1) INEP_ROW.4<1>:UD       INEP_ROW.4<0,1,0>:UD            0xFF000000:UD {align1};
 mov  (8) vme_msg_3<1>:UD         INEP_ROW.0<8,8,1>:UD {align1};
 
 /* m4 */        

diff --git a/src/shaders/vme/intra_frame.g6b b/src/shaders/vme/intra_frame.g6b
index 29ef5cc..9edfef7 100644 (file)
--- a/src/shaders/vme/intra_frame.g6b
+++ b/src/shaders/vme/intra_frame.g6b
@@ -37,6 +37,8 @@
    { 0x00010005, 0x247d1e31, 0x0000047d, 0x000000e0 },
    { 0x00600001, 0x20200022, 0x008d0460, 0x00000000 },
    { 0x00600001, 0x20400062, 0x00000000, 0x00000000 },
+   { 0x00000001, 0x22400061, 0x00000000, 0x00000000 },
+   { 0x00000005, 0x22440c21, 0x00000244, 0xff000000 },
    { 0x00600001, 0x20400022, 0x008d0240, 0x00000000 },
    { 0x00600001, 0x206000e2, 0x00000000, 0x00000000 },
    { 0x00800001, 0x20600232, 0x00cf0283, 0x00000000 },
@@ -63,6 +65,6 @@
    { 0x00010040, 0x244a2d29, 0x0000044a, 0x00100010 },
    { 0x00000040, 0x24882c21, 0x00000488, 0x00010001 },
    { 0x01000040, 0x20a63dad, 0x000000a6, 0xffffffff },
-   { 0x00110020, 0x34001c00, 0x00001400, 0xffffff9e },
+   { 0x00110020, 0x34001c00, 0x00001400, 0xffffff9a },
    { 0x00600001, 0x20000022, 0x008d0000, 0x00000000 },
    { 0x07800031, 0x24001cc8, 0x00000000, 0x82000010 },

diff --git a/src/shaders/vme/intra_frame.g7b b/src/shaders/vme/intra_frame.g7b
index d0b91c2..b257784 100644 (file)
--- a/src/shaders/vme/intra_frame.g7b
+++ b/src/shaders/vme/intra_frame.g7b
@@ -37,6 +37,8 @@
    { 0x00010005, 0x247d1e31, 0x0000047d, 0x000000e0 },
    { 0x00600001, 0x28200021, 0x008d0460, 0x00000000 },
    { 0x00600001, 0x28400061, 0x00000000, 0x00000000 },
+   { 0x00000001, 0x22400061, 0x00000000, 0x00000000 },
+   { 0x00000005, 0x22440c21, 0x00000244, 0xff000000 },
    { 0x00600001, 0x28600021, 0x008d0240, 0x00000000 },
    { 0x00600001, 0x288000e1, 0x00000000, 0x00000000 },
    { 0x00800001, 0x28800231, 0x00cf0283, 0x00000000 },
@@ -63,6 +65,6 @@
    { 0x00010040, 0x244a2d29, 0x0000044a, 0x00100010 },
    { 0x00000040, 0x24882c21, 0x00000488, 0x00010001 },
    { 0x01000040, 0x20a63dad, 0x000000a6, 0xffffffff },
-   { 0x00110020, 0x34001c00, 0x00001400, 0xffffff9e },
+   { 0x00110020, 0x34001c00, 0x00001400, 0xffffff9a },
    { 0x00600001, 0x28000021, 0x008d0000, 0x00000000 },
    { 0x07800031, 0x24001ca8, 0x00000800, 0x82000010 },