Commit: a5893c06d26d8e4435813ba0fd0e0c5f046c328e - hardware-intel-intel-driver (git)

hardware/intel/intel-driver

Commit MetaInfo

• Revisión: a5893c06d26d8e4435813ba0fd0e0c5f046c328e (tree)
• Tiempo: 2014-12-14 01:26:32
• Autor: Zhao Yakui <yakui.zhao@inte...>
• Commiter: Xiang, Haihao

Log Message

Media/Skl: Add the gen9_gpe_pipeline_setup to configure the media pipeline

As some media commands related with media pipeline are updated for SKL,
one new function is used to config the media pipeline on SKL.

Signed-off-by: Zhao Yakui <[e-mail]>
(cherry picked from commit 4f895ea354ddc1717c1a6a9d905f5a02ac4287b7)

Cambiar Resumen

• modified: src/gen9_vme.c
• modified: src/i965_gpe_utils.c
• modified: src/i965_gpe_utils.h

Diferencia incremental

--- a/src/gen9_vme.c
+++ b/src/gen9_vme.c
@@ -638,7 +638,7 @@ static void gen9_vme_pipeline_programing(VADriverContextP ctx,
                                       encoder_context);
 
     intel_batchbuffer_start_atomic(batch, 0x1000);
-    gen8_gpe_pipeline_setup(ctx, &vme_context->gpe_context, batch);
+    gen9_gpe_pipeline_setup(ctx, &vme_context->gpe_context, batch);
     BEGIN_BATCH(batch, 3);
     OUT_BATCH(batch, MI_BATCH_BUFFER_START | (1 << 8) | (1 << 0));
     OUT_RELOC(batch,
@@ -1065,7 +1065,7 @@ gen9_vme_mpeg2_pipeline_programing(VADriverContextP ctx,
                                             encoder_context);
 
     intel_batchbuffer_start_atomic(batch, 0x1000);
-    gen8_gpe_pipeline_setup(ctx, &vme_context->gpe_context, batch);
+    gen9_gpe_pipeline_setup(ctx, &vme_context->gpe_context, batch);
     BEGIN_BATCH(batch, 4);
     OUT_BATCH(batch, MI_BATCH_BUFFER_START | (1 << 8) | (1 << 0));
     OUT_RELOC(batch,

--- a/src/i965_gpe_utils.c
+++ b/src/i965_gpe_utils.c
@@ -1207,3 +1207,16 @@ gen8_gpe_load_kernels(VADriverContextP ctx,
     return;
 }
 
+void
+gen9_gpe_pipeline_setup(VADriverContextP ctx,
+                        struct i965_gpe_context *gpe_context,
+                        struct intel_batchbuffer *batch)
+{
+    intel_batchbuffer_emit_mi_flush(batch);
+
+    i965_gpe_select(ctx, gpe_context, batch);
+    gen8_gpe_state_base_address(ctx, gpe_context, batch);
+    gen8_gpe_vfe_state(ctx, gpe_context, batch);
+    gen8_gpe_curbe_load(ctx, gpe_context, batch);
+    gen8_gpe_idrt(ctx, gpe_context, batch);
+}

--- a/src/i965_gpe_utils.h
+++ b/src/i965_gpe_utils.h
@@ -219,4 +219,8 @@ void gen8_gpe_load_kernels(VADriverContextP ctx,
                            struct i965_gpe_context *gpe_context,
                            struct i965_kernel *kernel_list,
                            unsigned int num_kernels);
+
+void gen9_gpe_pipeline_setup(VADriverContextP ctx,
+                             struct i965_gpe_context *gpe_context,
+                             struct intel_batchbuffer *batch);
 #endif /* _I965_GPE_UTILS_H_ */