[Libva] [libva-intel-driver PATCH] Fix the build of H.264 encoding shaders for SKL

[Zhao, Yakui]

On Sun, 2014-12-14 at 21:30 -0700, Xiang, Haihao wrote:

LGTM.

Reviewed-by: Zhao Yakui <yakui.zhao at intel.com>

Thanks
> ---
>  src/shaders/vme/Makefile.am          |  2 +-
>  src/shaders/vme/inter_frame_gen9.g9b | 39 ++++++++++++++++++++++++++++++------
>  2 files changed, 34 insertions(+), 7 deletions(-)
> 
> diff --git a/src/shaders/vme/Makefile.am b/src/shaders/vme/Makefile.am
> index 29e69e4..382c8a5 100644
> --- a/src/shaders/vme/Makefile.am
> +++ b/src/shaders/vme/Makefile.am
> @@ -27,7 +27,7 @@ INTEL_GEN8_ASM	= $(INTEL_G8A:%.g8a=%.gen8.asm)
>  
> 
>  INTEL_G9B	= intra_frame_gen9.g9b inter_frame_gen9.g9b inter_bframe_gen9.g9b mpeg2_inter_gen9.g9b
> -INTEL_G9A	= $(INTEL_G8A)
> +INTEL_G9A	= intra_frame_gen9.g9a inter_frame_gen9.g9a inter_bframe_gen9.g9a mpeg2_inter_gen9.g9a
>  INTEL_GEN9_INC	= $(INTEL_GEN8_INC)
>  INTEL_GEN9_ASM	= $(INTEL_G9A:%.g9a=%.gen9.asm)
>  
> diff --git a/src/shaders/vme/inter_frame_gen9.g9b b/src/shaders/vme/inter_frame_gen9.g9b
> index 5f64f4b..b79042c 100644
> --- a/src/shaders/vme/inter_frame_gen9.g9b
> +++ b/src/shaders/vme/inter_frame_gen9.g9b
> @@ -146,13 +146,13 @@
>     { 0x00000001, 0x2fa41a68, 0x00000b04, 0x00000000 },
>     { 0x00000001, 0x2fa81a68, 0x00000b24, 0x00000000 },
>     { 0x00000040, 0x2fe00008, 0x06001400, 0x00000020 },
> -   { 0x00000020, 0x34000000, 0x0e001400, 0x00000870 },
> +   { 0x00000020, 0x34000000, 0x0e001400, 0x00000a20 },
>     { 0x00000001, 0x2ac01a68, 0x00000fe4, 0x00000000 },
>     { 0x00000001, 0x2fa01a68, 0x00000ae6, 0x00000000 },
>     { 0x00000001, 0x2fa41a68, 0x00000b06, 0x00000000 },
>     { 0x00000001, 0x2fa81a68, 0x00000b26, 0x00000000 },
>     { 0x00000040, 0x2fe00008, 0x06001400, 0x00000020 },
> -   { 0x00000020, 0x34000000, 0x0e001400, 0x00000810 },
> +   { 0x00000020, 0x34000000, 0x0e001400, 0x000009c0 },
>     { 0x00000001, 0x2ac21a68, 0x00000fe4, 0x00000000 },
>     { 0x0020000c, 0x2a801a68, 0x1e450ac0, 0x00020002 },
>     { 0x00200040, 0x2a881a68, 0x1e450a80, 0x00030003 },
> @@ -193,18 +193,45 @@
>     { 0x00000001, 0x28380208, 0x0000019c, 0x00000000 },
>     { 0x00000001, 0x283c0208, 0x00000488, 0x00000000 },
>     { 0x0a800031, 0x20000a60, 0x06000800, 0x040a0203 },
> +   { 0x01000010, 0x20002240, 0x160000a7, 0x00020002 },
> +   { 0x00010020, 0x34000000, 0x0e001400, 0x00000160 },
> +   { 0x00000001, 0x28600608, 0x00000000, 0x01010101 },
> +   { 0x00000001, 0x28640608, 0x00000000, 0x10010101 },
> +   { 0x00000001, 0x28680608, 0x00000000, 0x0f0f0f0f },
> +   { 0x00000001, 0x286c0608, 0x00000000, 0x100f0f0f },
> +   { 0x00000001, 0x28700608, 0x00000000, 0x01010101 },
> +   { 0x00000001, 0x28740608, 0x00000000, 0x10010101 },
> +   { 0x00000001, 0x28780608, 0x00000000, 0x0f0f0f0f },
> +   { 0x00000001, 0x287c0608, 0x00000000, 0x100f0f0f },
> +   { 0x00000001, 0x28800608, 0x00000000, 0x01010101 },
> +   { 0x00000001, 0x28840608, 0x00000000, 0x10010101 },
> +   { 0x00000001, 0x28880608, 0x00000000, 0x0f0f0f0f },
> +   { 0x00000001, 0x288c0608, 0x00000000, 0x000f0f0f },
> +   { 0x00400001, 0x28900608, 0x00000000, 0x00000000 },
>     { 0x00000001, 0x244c0608, 0x00000000, 0x00200000 },
>     { 0x00000001, 0x24561648, 0x10000000, 0x28302830 },
> -   { 0x00000001, 0x24400208, 0x00000448, 0x00000000 },
> -   { 0x00000040, 0x24401a68, 0x1e000440, 0xfff0fff0 },
> -   { 0x00000040, 0x24421a68, 0x1e000442, 0xfff4fff4 },
>     { 0x00000001, 0x24401e68, 0x18000000, 0xfff0fff0 },
>     { 0x00000001, 0x24421e68, 0x18000000, 0xfff4fff4 },
> -   { 0x00000001, 0x24440208, 0x00000440, 0x00000000 },
>     { 0x01000005, 0x20002240, 0x160000a5, 0x00600060 },
>     { 0x00010040, 0x24401a68, 0x1e000440, 0x000c000c },
>     { 0x01000005, 0x20002240, 0x160000a5, 0x00100010 },
>     { 0x00010040, 0x24421a68, 0x1e000442, 0x00080008 },
> +   { 0x00000020, 0x34000000, 0x0e001400, 0x000000e0 },
> +   { 0x00000001, 0x28600608, 0x00000000, 0x10010101 },
> +   { 0x00000001, 0x28640608, 0x00000000, 0x100f0f0f },
> +   { 0x00000001, 0x28680608, 0x00000000, 0x10010101 },
> +   { 0x00000001, 0x286c0608, 0x00000000, 0x000f0f0f },
> +   { 0x00400001, 0x28700608, 0x00000000, 0x00000000 },
> +   { 0x00600001, 0x28900608, 0x00000000, 0x00000000 },
> +   { 0x00000001, 0x244c0608, 0x00000000, 0x00200000 },
> +   { 0x00000001, 0x24561648, 0x10000000, 0x20202020 },
> +   { 0x00000001, 0x24401e68, 0x18000000, 0xfff8fff8 },
> +   { 0x00000001, 0x24421e68, 0x18000000, 0xfff8fff8 },
> +   { 0x01000005, 0x20002240, 0x160000a5, 0x00600060 },
> +   { 0x00010040, 0x24401a68, 0x1e000440, 0x00040004 },
> +   { 0x01000005, 0x20002240, 0x160000a5, 0x00100010 },
> +   { 0x00010040, 0x24421a68, 0x1e000442, 0x00040004 },
> +   { 0x00000001, 0x24440208, 0x00000440, 0x00000000 },
>     { 0x00200040, 0x24401a68, 0x1a450440, 0x00450a90 },
>     { 0x00200040, 0x24441a68, 0x1a450444, 0x00450a90 },
>     { 0x00600001, 0x28000208, 0x008d0440, 0x00000000 },