Skip to content

Commit

Permalink
Merge branch 'intel:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
gitgjogh authored Aug 7, 2023
2 parents 0a67d7b + 7d6c7d4 commit 0fef9b7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/ghpages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 2 additions & 0 deletions va/va_trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 0fef9b7

Please sign in to comment.