diff options
| author | Xiang, Haihao <haihao.xiang@intel.com> | 2012-06-29 14:33:44 +0800 |
|---|---|---|
| committer | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2012-07-07 07:10:50 +0200 |
| commit | 560ab2c9b116ddaddd90c24f520c4dc66310c9e7 (patch) | |
| tree | 0a077fa6d4a224cddd77d1ccef88476ca22b7fe2 | |
| parent | ac254ae493b15fdf041bbc55030b68124b138292 (diff) | |
| download | libva-intel-driver-560ab2c9b116ddaddd90c24f520c4dc66310c9e7.tar.gz libva-intel-driver-560ab2c9b116ddaddd90c24f520c4dc66310c9e7.tar.bz2 libva-intel-driver-560ab2c9b116ddaddd90c24f520c4dc66310c9e7.zip | |
Adjust the search path and LUT_MV table in VME
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Tested-by: Zhang, Ouping <ouping.zhang@intel.com>
| -rw-r--r-- | src/gen6_vme.c | 18 | ||||
| -rw-r--r-- | src/shaders/vme/inter_frame.asm | 2 | ||||
| -rw-r--r-- | src/shaders/vme/inter_frame.g6b | 4 | ||||
| -rw-r--r-- | src/shaders/vme/inter_frame.g7b | 4 | ||||
| -rw-r--r-- | src/shaders/vme/vme.inc | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/src/gen6_vme.c b/src/gen6_vme.c index e74b235..4504d5a 100644 --- a/src/gen6_vme.c +++ b/src/gen6_vme.c @@ -420,13 +420,13 @@ static VAStatus gen6_vme_vme_state_setup(VADriverContextP ctx, vme_state_message[2] = 0x0F0F0F0F; vme_state_message[3] = 0x100F0F0F; vme_state_message[4] = 0x01010101; - vme_state_message[5] = 0x00010101; - vme_state_message[6] = 0x01010101; - vme_state_message[7] = 0x10010101; - vme_state_message[8] = 0x0F0F0F0F; - vme_state_message[9] = 0x100F0F0F; - vme_state_message[10] = 0x01010101; - vme_state_message[11] = 0x00010101; + vme_state_message[5] = 0x10010101; + vme_state_message[6] = 0x0F0F0F0F; + vme_state_message[7] = 0x100F0F0F; + vme_state_message[8] = 0x01010101; + vme_state_message[9] = 0x10010101; + vme_state_message[10] = 0x0F0F0F0F; + vme_state_message[11] = 0x000F0F0F; vme_state_message[12] = 0x00; vme_state_message[13] = 0x00; @@ -434,8 +434,8 @@ static VAStatus gen6_vme_vme_state_setup(VADriverContextP ctx, vme_state_message[15] = 0x0; vme_state_message[16] = 0x4a4a4a4a; vme_state_message[17] = 0x4a4a4a4a; - vme_state_message[18] = 0x22120200; - vme_state_message[19] = 0x62524232; + vme_state_message[18] = 0x21110100; + vme_state_message[19] = 0x61514131; for(i = 20; i < 32; i++) { vme_state_message[i] = 0; diff --git a/src/shaders/vme/inter_frame.asm b/src/shaders/vme/inter_frame.asm index 28ae28c..24387cd 100644 --- a/src/shaders/vme/inter_frame.asm +++ b/src/shaders/vme/inter_frame.asm @@ -45,7 +45,7 @@ mov (1) vme_m0.0<1>:W -16:W {align1} ; /* Reference = ( mov (1) vme_m0.2<1>:W -12:W {align1} ; #endif -mov (1) vme_m0.12<1>:UD SEARCH_CTRL_DUAL_START + INTER_PART_MASK + INTER_SAD_HAAR + SUB_PEL_MODE_QUARTER:UD {align1}; /* 16x16 Source, 1/4 pixel, harr */ +mov (1) vme_m0.12<1>:UD SEARCH_CTRL_SINGLE + INTER_PART_MASK + INTER_SAD_HAAR + SUB_PEL_MODE_QUARTER:UD {align1}; /* 16x16 Source, 1/4 pixel, harr */ mov (1) vme_m0.20<1>:UB thread_id_ub {align1}; /* dispatch id */ mov (1) vme_m0.22<1>:UW REF_REGION_SIZE {align1}; /* Reference Width&Height, 32x32 */ diff --git a/src/shaders/vme/inter_frame.g6b b/src/shaders/vme/inter_frame.g6b index 2dc55ab..c63f7d7 100644 --- a/src/shaders/vme/inter_frame.g6b +++ b/src/shaders/vme/inter_frame.g6b @@ -14,12 +14,12 @@ { 0x00200009, 0x24402e29, 0x004500a0, 0x00040004 }, { 0x00000040, 0x24403dad, 0x00000440, 0xfff0fff0 }, { 0x00000040, 0x24423dad, 0x00000442, 0xfff4fff4 }, - { 0x00000001, 0x244c0061, 0x00000000, 0x00203100 }, + { 0x00000001, 0x244c0061, 0x00000000, 0x00203000 }, { 0x00000001, 0x24540231, 0x00000014, 0x00000000 }, { 0x00000001, 0x24560169, 0x00000000, 0x28302830 }, { 0x00000001, 0x24600061, 0x00000000, 0x00000002 }, { 0x00000001, 0x24640061, 0x00000000, 0x40000020 }, - { 0x00000001, 0x24680061, 0x00000000, 0x30003f0c }, + { 0x00000001, 0x24680061, 0x00000000, 0x30003030 }, { 0x00000041, 0x24884521, 0x000000a2, 0x000000a1 }, { 0x00000040, 0x24884421, 0x00000488, 0x000000a0 }, { 0x00000041, 0x24880c21, 0x00000488, 0x0000000a }, diff --git a/src/shaders/vme/inter_frame.g7b b/src/shaders/vme/inter_frame.g7b index 7eac26d..5e738ca 100644 --- a/src/shaders/vme/inter_frame.g7b +++ b/src/shaders/vme/inter_frame.g7b @@ -13,12 +13,12 @@ { 0x00200009, 0x24482e29, 0x004500a0, 0x00040004 }, { 0x00000001, 0x244001ed, 0x00000000, 0xfff0fff0 }, { 0x00000001, 0x244201ed, 0x00000000, 0xfff4fff4 }, - { 0x00000001, 0x244c0061, 0x00000000, 0x00203100 }, + { 0x00000001, 0x244c0061, 0x00000000, 0x00203000 }, { 0x00000001, 0x24540231, 0x00000014, 0x00000000 }, { 0x00000001, 0x24560169, 0x00000000, 0x28302830 }, { 0x00000001, 0x24600061, 0x00000000, 0x00000002 }, { 0x00000001, 0x24640061, 0x00000000, 0x40000020 }, - { 0x00000001, 0x24680061, 0x00000000, 0x30003f0c }, + { 0x00000001, 0x24680061, 0x00000000, 0x30003030 }, { 0x00000041, 0x24884521, 0x000000a2, 0x000000a1 }, { 0x00000040, 0x24884421, 0x00000488, 0x000000a0 }, { 0x00000041, 0x24880c21, 0x00000488, 0x0000000a }, diff --git a/src/shaders/vme/vme.inc b/src/shaders/vme/vme.inc index 31561de..dd7e1bb 100644 --- a/src/shaders/vme/vme.inc +++ b/src/shaders/vme/vme.inc @@ -59,7 +59,7 @@ define(`BI_SUB_MB_PART_MASK', `0x0c000000') define(`MAX_NUM_MV', `0x00000020') define(`FB_PRUNING_ENABLE', `0x40000000') -define(`SEARCH_PATH_LEN', `0x00003F0C') +define(`SEARCH_PATH_LEN', `0x00003030') define(`START_CENTER', `0x30000000') define(`ADAPTIVE_SEARCH_ENABLE', `0x00000002') |