[Libva] [Libva-intel-driver PATCH 04/25] Skl: Export the surface attribute like that on Gen8

[Xiang, Haihao]

From: Zhao Yakui <yakui.zhao at intel.com>

Signed-off-by: Zhao Yakui <yakui.zhao at intel.com>
Signed-off-by: Xiang, Haihao <haihao.xiang at intel.com>
---
 src/i965_drv_video.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
index d087bb1..24abae8 100644
--- a/src/i965_drv_video.c
+++ b/src/i965_drv_video.c
@@ -1422,7 +1422,8 @@ i965_guess_surface_format(VADriverContextP ctx,
 
     if (IS_GEN6(i965->intel.device_info) ||
         IS_GEN7(i965->intel.device_info) ||
-        IS_GEN8(i965->intel.device_info)) {
+        IS_GEN8(i965->intel.device_info) ||
+        IS_GEN9(i965->intel.device_info)) {
         *fourcc = VA_FOURCC_NV12;
         *is_tiled = 1;
         return;
@@ -1839,7 +1840,7 @@ i965_CreateContext(VADriverContextP ctx,
         break;
     }        
     default:
-        render_state->interleaved_uv = !!(IS_GEN6(i965->intel.device_info) || IS_GEN7(i965->intel.device_info) || IS_GEN8(i965->intel.device_info));
+        render_state->interleaved_uv = !!(IS_GEN6(i965->intel.device_info) || IS_GEN7(i965->intel.device_info) || IS_GEN8(i965->intel.device_info) || IS_GEN9(i965->intel.device_info));
         break;
     }
 
@@ -4658,7 +4659,8 @@ i965_GetSurfaceAttributes(
                 } else if (IS_GEN6(i965->intel.device_info)) {
                     attrib_list[i].value.value.i = VA_FOURCC_NV12;
                 } else if (IS_GEN7(i965->intel.device_info) ||
-                           IS_GEN8(i965->intel.device_info)) {
+                           IS_GEN8(i965->intel.device_info) ||
+                           IS_GEN9(i965->intel.device_info)) {
                     if (obj_config->profile == VAProfileJPEGBaseline)
                         attrib_list[i].value.value.i = 0; /* internal format */
                     else
@@ -4735,7 +4737,8 @@ i965_GetSurfaceAttributes(
                         }
                     }
                 } else if (IS_GEN7(i965->intel.device_info) ||
-                           IS_GEN8(i965->intel.device_info)) {
+                           IS_GEN8(i965->intel.device_info) ||
+                           IS_GEN9(i965->intel.device_info)) {
                     if (obj_config->entrypoint == VAEntrypointEncSlice ||
                         obj_config->entrypoint == VAEntrypointVideoProc) {
                         switch (attrib_list[i].value.value.i) {
@@ -5028,7 +5031,8 @@ i965_QuerySurfaceAttributes(VADriverContextP ctx,
                 i++;
             }
         }
-    } else if (IS_GEN8(i965->intel.device_info)) {
+    } else if (IS_GEN8(i965->intel.device_info) ||
+               IS_GEN9(i965->intel.device_info)) {
         if (obj_config->entrypoint == VAEntrypointVLD) { /* decode */
             if (obj_config->profile == VAProfileJPEGBaseline) {
                 attribs[i].type = VASurfaceAttribPixelFormat;
-- 
1.9.1