Commit: 01941a2ae08a69512b708d91efd9191edeb7e723 - hardware-intel-intel-driver (git)

hardware/intel/intel-driver

Commit MetaInfo

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

Log Message

Media/SKL: Follow the spec to add the FORCE_MEDIA_AWAKE for media pipeline

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

Cambiar Resumen

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

Diferencia incremental

--- a/src/gen9_vme.c
+++ b/src/gen9_vme.c
@@ -648,6 +648,8 @@ static void gen9_vme_pipeline_programing(VADriverContextP ctx,
     OUT_BATCH(batch, 0);
     ADVANCE_BATCH(batch);
 
+    gen9_gpe_pipeline_end(ctx, &vme_context->gpe_context, batch);
+
     intel_batchbuffer_end_atomic(batch);
 }
 
@@ -1076,6 +1078,8 @@ gen9_vme_mpeg2_pipeline_programing(VADriverContextP ctx,
     OUT_BATCH(batch, 0);
     ADVANCE_BATCH(batch);
 
+    gen9_gpe_pipeline_end(ctx, &vme_context->gpe_context, batch);
+
     intel_batchbuffer_end_atomic(batch);
 }
 

--- a/src/i965_defines.h
+++ b/src/i965_defines.h
@@ -851,5 +851,8 @@
 
 
 #define GEN9_PIPELINE_SELECTION_MASK        (0x3 << 8)
+#define GEN9_FORCE_MEDIA_AWAKE_MASK         (1 << 13)
+#define GEN9_FORCE_MEDIA_AWAKE_ON           (1 << 5)
+#define GEN9_FORCE_MEDIA_AWAKE_OFF          (0 << 5)
 
 #endif /* _I965_DEFINES_H_ */

--- a/src/i965_gpe_utils.c
+++ b/src/i965_gpe_utils.c
@@ -1275,7 +1275,9 @@ gen9_gpe_select(VADriverContextP ctx,
 {
     BEGIN_BATCH(batch, 1);
     OUT_BATCH(batch, CMD_PIPELINE_SELECT | PIPELINE_SELECT_MEDIA |
-                     GEN9_PIPELINE_SELECTION_MASK);
+                     GEN9_PIPELINE_SELECTION_MASK |
+                     GEN9_FORCE_MEDIA_AWAKE_ON |
+                     GEN9_FORCE_MEDIA_AWAKE_MASK);
     ADVANCE_BATCH(batch);
 }
 
@@ -1292,3 +1294,16 @@ gen9_gpe_pipeline_setup(VADriverContextP ctx,
     gen8_gpe_curbe_load(ctx, gpe_context, batch);
     gen8_gpe_idrt(ctx, gpe_context, batch);
 }
+
+void
+gen9_gpe_pipeline_end(VADriverContextP ctx,
+                      struct i965_gpe_context *gpe_context,
+                      struct intel_batchbuffer *batch)
+{
+    BEGIN_BATCH(batch, 1);
+    OUT_BATCH(batch, CMD_PIPELINE_SELECT | PIPELINE_SELECT_MEDIA |
+              GEN9_PIPELINE_SELECTION_MASK |
+              GEN9_FORCE_MEDIA_AWAKE_OFF |
+              GEN9_FORCE_MEDIA_AWAKE_MASK);
+    ADVANCE_BATCH(batch);
+}

--- a/src/i965_gpe_utils.h
+++ b/src/i965_gpe_utils.h
@@ -223,4 +223,9 @@ void gen8_gpe_load_kernels(VADriverContextP ctx,
 void gen9_gpe_pipeline_setup(VADriverContextP ctx,
                              struct i965_gpe_context *gpe_context,
                              struct intel_batchbuffer *batch);
+
+void gen9_gpe_pipeline_end(VADriverContextP ctx,
+                             struct i965_gpe_context *gpe_context,
+                             struct intel_batchbuffer *batch);
+
 #endif /* _I965_GPE_UTILS_H_ */