Merge branch 'intel:master' into master

gitgjogh · web-flow · commit 0fef9b7e01c7 · 2023-08-07T15:58:43.000+08:00
diff --git a/.github/workflows/ghpages.yml b/.github/workflows/ghpages.yml
@@ -47,7 +47,7 @@ jobs:
 
     - name: 'Upload the artifacts'
       if: github.ref_name == env.GIT_LATEST_TAG
-      uses: actions/upload-pages-artifact@v1
+      uses: actions/upload-pages-artifact@v2
       with:
         path: "_build/doc/html-out"
 
diff --git a/va/va_trace.c b/va/va_trace.c
@@ -6389,12 +6389,14 @@ void va_TraceExportSurfaceHandle(
     va_TraceMsg(trace_ctx, "\tflags     = 0x%08x\n", flags);
 
     if (memType != VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2) {
+        DPY2TRACE_VIRCTX_EXIT(pva_trace);
         return;
     }
 
     VADRMPRIMESurfaceDescriptor *desc = (VADRMPRIMESurfaceDescriptor *)descriptor;
 
     if (!desc) {
+        DPY2TRACE_VIRCTX_EXIT(pva_trace);
         return;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -6389,12 +6389,14 @@ void va_TraceExportSurfaceHandle(`
`6389`	`6389`	`va_TraceMsg(trace_ctx, "\tflags = 0x%08x\n", flags);`
`6390`	`6390`
`6391`	`6391`	`if (memType != VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2) {`
	`6392`	`+ DPY2TRACE_VIRCTX_EXIT(pva_trace);`
`6392`	`6393`	`return;`
`6393`	`6394`	`}`
`6394`	`6395`
`6395`	`6396`	`VADRMPRIMESurfaceDescriptor desc = (VADRMPRIMESurfaceDescriptor )descriptor;`
`6396`	`6397`
`6397`	`6398`	`if (!desc) {`
	`6399`	`+ DPY2TRACE_VIRCTX_EXIT(pva_trace);`
`6398`	`6400`	`return;`
`6399`	`6401`	`}`
`6400`	`6402`