コミット: 8e8d5487b09cd1d8f421e3147d671c4c35fdb039 - hardware-intel-intel-driver (git)

hardware/intel/intel-driver

コミットメタ情報

• リビジョン: 8e8d5487b09cd1d8f421e3147d671c4c35fdb039 (tree)
• 日時: 2015-09-06 16:13:57
• 作者: Xiang, Haihao <haihao.xiang@inte...>
• コミッター: Xiang, Haihao

ログメッセージ

encode/hevc: fix HEVC encode on SKL GT3

GT3 has 2 BSD rings, but HEVC commands can be only dispatched to BSD ring 0.

Signed-off-by: Xiang, Haihao <[e-mail]>
Reviewed-by: Zhao Yakui <[e-mail]>
(cherry picked from commit 611d8ea9d75dc026c203e3ebe53b434769d4587c)

変更サマリ

• modified: src/gen9_mfc_hevc.c

差分

--- a/src/gen9_mfc_hevc.c
+++ b/src/gen9_mfc_hevc.c
@@ -1783,6 +1783,7 @@ gen9_hcpe_hevc_pipeline_programing(VADriverContextP ctx,
                                    struct encode_state *encode_state,
                                    struct intel_encoder_context *encoder_context)
 {
+    struct i965_driver_data *i965 = i965_driver_data(ctx);
     struct intel_batchbuffer *batch = encoder_context->base.batch;
     dri_bo *slice_batch_bo;
 
@@ -1793,7 +1794,10 @@ gen9_hcpe_hevc_pipeline_programing(VADriverContextP ctx,
 #endif
 
     // begin programing
-    intel_batchbuffer_start_atomic_bcs(batch, 0x4000);
+    if (i965->intel.has_bsd2)
+        intel_batchbuffer_start_atomic_bcs_override(batch, 0x4000, BSD_RING0);
+    else
+        intel_batchbuffer_start_atomic_bcs(batch, 0x4000);
     intel_batchbuffer_emit_mi_flush(batch);
 
     // picture level programing