[Libva] [Libva-intel-driver][PATCH v2 07/17] Rename gen8p_gpe_context_map_curbe()/gen8p_gpe_context_unmap_curbe() to i965_gpe_context_map_curbe()/i965_gpe_context_unmap_curbe()
Zhao Yakui
yakui.zhao at intel.com
Fri Nov 18 06:28:40 UTC 2016
On 11/18/2016 01:43 PM, Xiang, Haihao wrote:
> gpe_context->curbe.bo always points to the curbe buffer now, and the two functions
> can be used on all platforms
This looks good to me.
Thanks
Yakui
>
> Signed-off-by: Xiang, Haihao<haihao.xiang at intel.com>
> ---
> src/gen9_post_processing.c | 4 ++--
> src/gen9_vp9_encoder.c | 20 ++++++++++----------
> src/i965_gpe_utils.c | 4 ++--
> src/i965_gpe_utils.h | 4 ++--
> 4 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/src/gen9_post_processing.c b/src/gen9_post_processing.c
> index c0ae791..862a26a 100644
> --- a/src/gen9_post_processing.c
> +++ b/src/gen9_post_processing.c
> @@ -653,7 +653,7 @@ gen9_gpe_context_p010_scaling_curbe(VADriverContextP ctx,
> (dst_rect == NULL) || (dst_surface == NULL))
> return;
>
> - scaling_curbe = gen8p_gpe_context_map_curbe(gpe_context);
> + scaling_curbe = i965_gpe_context_map_curbe(gpe_context);
>
> if (!scaling_curbe)
> return;
> @@ -696,7 +696,7 @@ gen9_gpe_context_p010_scaling_curbe(VADriverContextP ctx,
> }
> /* I010 will use LSB */
>
> - gen8p_gpe_context_unmap_curbe(gpe_context);
> + i965_gpe_context_unmap_curbe(gpe_context);
> }
>
> static bool
> diff --git a/src/gen9_vp9_encoder.c b/src/gen9_vp9_encoder.c
> index 1badd88..a933c15 100644
> --- a/src/gen9_vp9_encoder.c
> +++ b/src/gen9_vp9_encoder.c
> @@ -1159,7 +1159,7 @@ void gen9_vp9_set_curbe_brc(VADriverContextP ctx,
> seq_param = param->pseq_param;
> segment_param = param->psegment_param;
>
> - cmd = gen8p_gpe_context_map_curbe(gpe_context);
> + cmd = i965_gpe_context_map_curbe(gpe_context);
>
> if (!cmd)
> return;
> @@ -1347,7 +1347,7 @@ void gen9_vp9_set_curbe_brc(VADriverContextP ctx,
> cmd->dw60.brc_bitstream_size_data_bti = VP9_BTI_BRC_BITSTREAM_SIZE_G9;
> cmd->dw61.brc_hfw_data_output_bti = VP9_BTI_BRC_HFW_DATA_G9;
>
> - gen8p_gpe_context_unmap_curbe(gpe_context);
> + i965_gpe_context_unmap_curbe(gpe_context);
> return;
> }
>
> @@ -2057,7 +2057,7 @@ void gen9_vp9_set_curbe_me(VADriverContextP ctx,
> else
> enc_media_state = VP9_MEDIA_STATE_4X_ME;
>
> - me_cmd = gen8p_gpe_context_map_curbe(gpe_context);
> + me_cmd = i965_gpe_context_map_curbe(gpe_context);
>
> if (!me_cmd)
> return;
> @@ -2117,7 +2117,7 @@ void gen9_vp9_set_curbe_me(VADriverContextP ctx,
> me_cmd->dw36.vme_fwd_inter_pred_surf_index = VP9_BTI_ME_CURR_PIC_L0;
> me_cmd->dw37.vme_bdw_inter_pred_surf_index = VP9_BTI_ME_CURR_PIC_L1;
>
> - gen8p_gpe_context_unmap_curbe(gpe_context);
> + i965_gpe_context_unmap_curbe(gpe_context);
> }
>
> static void
> @@ -2398,7 +2398,7 @@ gen9_vp9_set_curbe_scaling_cm(VADriverContextP ctx,
> {
> vp9_scaling4x_curbe_data_cm *curbe_cmd;
>
> - curbe_cmd = gen8p_gpe_context_map_curbe(gpe_context);
> + curbe_cmd = i965_gpe_context_map_curbe(gpe_context);
>
> if (!curbe_cmd)
> return;
> @@ -2422,7 +2422,7 @@ gen9_vp9_set_curbe_scaling_cm(VADriverContextP ctx,
> curbe_cmd->dw10.mbv_proc_stat_bti = VP9_BTI_SCALING_FRAME_MBVPROCSTATS_DST_CM;
> }
>
> - gen8p_gpe_context_unmap_curbe(gpe_context);
> + i965_gpe_context_unmap_curbe(gpe_context);
> return;
> }
>
> @@ -2670,7 +2670,7 @@ gen9_vp9_set_curbe_dys(VADriverContextP ctx,
> {
> vp9_dys_curbe_data *curbe_cmd;
>
> - curbe_cmd = gen8p_gpe_context_map_curbe(gpe_context);
> + curbe_cmd = i965_gpe_context_map_curbe(gpe_context);
>
> if (!curbe_cmd)
> return;
> @@ -2690,7 +2690,7 @@ gen9_vp9_set_curbe_dys(VADriverContextP ctx,
> curbe_cmd->dw17.output_frame_y_bti = VP9_BTI_DYS_OUTPUT_Y;
> curbe_cmd->dw18.avs_sample_idx = 0;
>
> - gen8p_gpe_context_unmap_curbe(gpe_context);
> + i965_gpe_context_unmap_curbe(gpe_context);
> }
>
> static void
> @@ -3023,7 +3023,7 @@ gen9_vp9_set_curbe_mbenc(VADriverContextP ctx,
> seg_param =&tmp_seg_param;
> }
>
> - curbe_cmd = gen8p_gpe_context_map_curbe(gpe_context);
> + curbe_cmd = i965_gpe_context_map_curbe(gpe_context);
>
> if (!curbe_cmd)
> return;
> @@ -3167,7 +3167,7 @@ gen9_vp9_set_curbe_mbenc(VADriverContextP ctx,
> curbe_cmd->dw174.cu_record_bti = VP9_BTI_MBENC_CU_RECORDS_G9;
> curbe_cmd->dw175.pak_data_bti = VP9_BTI_MBENC_PAK_DATA_G9;
>
> - gen8p_gpe_context_unmap_curbe(gpe_context);
> + i965_gpe_context_unmap_curbe(gpe_context);
> return;
> }
>
> diff --git a/src/i965_gpe_utils.c b/src/i965_gpe_utils.c
> index a6d539b..66609c0 100644
> --- a/src/i965_gpe_utils.c
> +++ b/src/i965_gpe_utils.c
> @@ -1660,7 +1660,7 @@ gen8_gpe_context_set_dynamic_buffer(VADriverContextP ctx,
> }
>
> void *
> -gen8p_gpe_context_map_curbe(struct i965_gpe_context *gpe_context)
> +i965_gpe_context_map_curbe(struct i965_gpe_context *gpe_context)
> {
> dri_bo_map(gpe_context->curbe.bo, 1);
>
> @@ -1668,7 +1668,7 @@ gen8p_gpe_context_map_curbe(struct i965_gpe_context *gpe_context)
> }
>
> void
> -gen8p_gpe_context_unmap_curbe(struct i965_gpe_context *gpe_context)
> +i965_gpe_context_unmap_curbe(struct i965_gpe_context *gpe_context)
> {
> dri_bo_unmap(gpe_context->curbe.bo);
> }
> diff --git a/src/i965_gpe_utils.h b/src/i965_gpe_utils.h
> index e19e107..66be748 100644
> --- a/src/i965_gpe_utils.h
> +++ b/src/i965_gpe_utils.h
> @@ -437,10 +437,10 @@ extern void
> gen9_gpe_reset_binding_table(VADriverContextP ctx,
> struct i965_gpe_context *gpe_context);
> extern
> -void *gen8p_gpe_context_map_curbe(struct i965_gpe_context *gpe_context);
> +void *i965_gpe_context_map_curbe(struct i965_gpe_context *gpe_context);
>
> extern
> -void gen8p_gpe_context_unmap_curbe(struct i965_gpe_context *gpe_context);
> +void i965_gpe_context_unmap_curbe(struct i965_gpe_context *gpe_context);
>
> extern
> void gen8_gpe_setup_interface_data(VADriverContextP ctx,
More information about the Libva
mailing list