Revert "HEVC10bit ENC: work around gpu hang when p010->nv12"

Commit 302cf63 fixes the GPU hang issue.

This reverts commit 53bfe9ab7fcaf2ae5c1e1ba0087831a59dbfe249.

Cc: peng.chen <peng.c.chen@intel.com>
Cc: Qu, Pengfei <pengfei.qu@intel.com>
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit f20148ef755670c5ecaa1c9460cc546229fa76c1)

diff --git a/src/gen9_vme.c b/src/gen9_vme.c
index d7262cd..421af5a 100644 (file)
--- a/src/gen9_vme.c
+++ b/src/gen9_vme.c
@@ -1840,7 +1840,6 @@ static VAStatus gen9_intel_init_hevc_surface(VADriverContextP ctx,
             &rect);
         assert(status == VA_STATUS_SUCCESS);
         hevc_encoder_surface->has_p010_to_nv12_done = 1;
-        i965_SyncSurface(ctx,hevc_encoder_surface->nv12_surface_id);
     }
     return VA_STATUS_SUCCESS;
 }

diff --git a/src/i965_drv_video.h b/src/i965_drv_video.h
index 2288300..5ef6d27 100644 (file)
--- a/src/i965_drv_video.h
+++ b/src/i965_drv_video.h
@@ -627,8 +627,6 @@ extern VAStatus i965_CreateSurfaces(VADriverContextP ctx,
                     int format,
                     int num_surfaces,
                     VASurfaceID *surfaces);
-extern VAStatus i965_SyncSurface(VADriverContextP ctx,
-                    VASurfaceID render_target);
 
 #define I965_SURFACE_MEM_NATIVE             0
 #define I965_SURFACE_MEM_GEM_FLINK          1