From: Xiang, Haihao <haihao.xiang@intel.com>
Date: Fri, 16 Sep 2011 07:37:31 +0000 (+0800)
Subject: VPP: update AVS kernel
X-Git-Tag: android-x86-7.1-r1~1566
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8b6788b725db76d9b4988c7c7ed88eb4206c6a9d;p=android-x86%2Fhardware-intel-common-vaapi.git

VPP: update AVS kernel

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

diff --git a/src/shaders/post_processing/gen5_6/nv12_avs_nv12.asm b/src/shaders/post_processing/gen5_6/nv12_avs_nv12.asm
index 80665e0..6e0e1b3 100644
--- a/src/shaders/post_processing/gen5_6/nv12_avs_nv12.asm
+++ b/src/shaders/post_processing/gen5_6/nv12_avs_nv12.asm
@@ -7,6 +7,7 @@
 #include "SetupVPKernel.asm"
 #include "Multiple_Loop_Head.asm"
 #include "PL2_AVS_IEF_16x8.asm"
+#include "PL16x8_PL8x4.asm"        
 #include "PL8x4_Save_NV12.asm"
 #include "Multiple_Loop.asm"
 
diff --git a/src/shaders/post_processing/gen5_6/nv12_avs_nv12.g4b.gen5 b/src/shaders/post_processing/gen5_6/nv12_avs_nv12.g4b.gen5
index 1fa4261..b7cbfb1 100644
--- a/src/shaders/post_processing/gen5_6/nv12_avs_nv12.g4b.gen5
+++ b/src/shaders/post_processing/gen5_6/nv12_avs_nv12.g4b.gen5
@@ -75,6 +75,14 @@
    { 0x00600001, 0x22f00229, 0x00aa0889, 0x00000000 },
    { 0x00600001, 0x23100229, 0x00aa08a1, 0x00000000 },
    { 0x00600001, 0x23300229, 0x00aa08a9, 0x00000000 },
+   { 0x00600001, 0x22400129, 0x00ae0240, 0x00000000 },
+   { 0x00600001, 0x23400129, 0x00ae0340, 0x00000000 },
+   { 0x00600001, 0x22500129, 0x00ae0280, 0x00000000 },
+   { 0x00600001, 0x23500129, 0x00ae0380, 0x00000000 },
+   { 0x00600001, 0x22600129, 0x00ae02c0, 0x00000000 },
+   { 0x00600001, 0x23600129, 0x00ae03c0, 0x00000000 },
+   { 0x00600001, 0x22700129, 0x00ae0300, 0x00000000 },
+   { 0x00600001, 0x23700129, 0x00ae0400, 0x00000000 },
    { 0x00600001, 0x20200022, 0x008d0100, 0x00000000 },
    { 0x00200001, 0x202001a6, 0x004500a0, 0x00000000 },
    { 0x00000001, 0x20280062, 0x00000000, 0x0007000f },
@@ -148,13 +156,13 @@
    { 0x00000041, 0x24407fbd, 0x000000bc, 0x41800000 },
    { 0x00000040, 0x20a477bd, 0x00000440, 0x000000a4 },
    { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00010220, 0x34001c00, 0x02001400, 0xfffffede },
+   { 0x00010220, 0x34001c00, 0x02001400, 0xfffffece },
    { 0x00000001, 0x20a001ad, 0x0000008a, 0x00000000 },
    { 0x00000040, 0x20a23dad, 0x000000a2, 0x00080008 },
    { 0x00000001, 0x20a403bd, 0x00000094, 0x00000000 },
    { 0x00000041, 0x24407fbd, 0x00000038, 0x41000000 },
    { 0x00000040, 0x20a877bd, 0x00000440, 0x000000a8 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffed2 },
+   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffec2 },
    { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
    { 0x00600001, 0x21e00022, 0x008d0000, 0x00000000 },
    { 0x0f000031, 0x20000c04, 0x708d0000, 0x82000000 },
diff --git a/src/shaders/post_processing/gen5_6/nv12_avs_nv12.g6b b/src/shaders/post_processing/gen5_6/nv12_avs_nv12.g6b
index 7e1dfc3..574b079 100644
--- a/src/shaders/post_processing/gen5_6/nv12_avs_nv12.g6b
+++ b/src/shaders/post_processing/gen5_6/nv12_avs_nv12.g6b
@@ -148,6 +148,14 @@
    { 0x00600001, 0x22f00229, 0x00aa0889, 0x00000000 },
    { 0x00600001, 0x23100229, 0x00aa08a1, 0x00000000 },
    { 0x00600001, 0x23300229, 0x00aa08a9, 0x00000000 },
+   { 0x00600001, 0x22400129, 0x00ae0240, 0x00000000 },
+   { 0x00600001, 0x23400129, 0x00ae0340, 0x00000000 },
+   { 0x00600001, 0x22500129, 0x00ae0280, 0x00000000 },
+   { 0x00600001, 0x23500129, 0x00ae0380, 0x00000000 },
+   { 0x00600001, 0x22600129, 0x00ae02c0, 0x00000000 },
+   { 0x00600001, 0x23600129, 0x00ae03c0, 0x00000000 },
+   { 0x00600001, 0x22700129, 0x00ae0300, 0x00000000 },
+   { 0x00600001, 0x23700129, 0x00ae0400, 0x00000000 },
    { 0x00600001, 0x20200022, 0x008d0100, 0x00000000 },
    { 0x00200001, 0x202001a6, 0x004500a0, 0x00000000 },
    { 0x00000001, 0x20280062, 0x00000000, 0x0007000f },
@@ -221,13 +229,13 @@
    { 0x00000041, 0x24407fbd, 0x000000bc, 0x41800000 },
    { 0x00000040, 0x20a477bd, 0x00000440, 0x000000a4 },
    { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00010220, 0x34001c00, 0x02001400, 0xfffffede },
+   { 0x00010220, 0x34001c00, 0x02001400, 0xfffffece },
    { 0x00000001, 0x20a001ad, 0x0000008a, 0x00000000 },
    { 0x00000040, 0x20a23dad, 0x000000a2, 0x00080008 },
    { 0x00000001, 0x20a403bd, 0x00000094, 0x00000000 },
    { 0x00000041, 0x24407fbd, 0x00000038, 0x41000000 },
    { 0x00000040, 0x20a877bd, 0x00000440, 0x000000a8 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffed2 },
+   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffec2 },
    { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
    { 0x00600001, 0x21e00022, 0x008d0000, 0x00000000 },
    { 0x07000031, 0x20001cc4, 0x000001e0, 0x82000010 },