From 3d4c36a3bcc51ed441b2667d92291bea30ef7449 Mon Sep 17 00:00:00 2001
From: Sil Vilerino <sivileri@microsoft.com>
Date: Wed, 14 Sep 2022 13:14:47 -0400
Subject: [PATCH] d3d12: d3d12_video_buffer_create_impl make resident after
 checking for resource creation

Reviewed-by: Giancarlo Devich <gdevich@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18328>
---
 src/gallium/drivers/d3d12/d3d12_video_buffer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/d3d12/d3d12_video_buffer.cpp b/src/gallium/drivers/d3d12/d3d12_video_buffer.cpp
index 16e53f1a7ec..3b6d0cb2583 100644
--- a/src/gallium/drivers/d3d12/d3d12_video_buffer.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_video_buffer.cpp
@@ -90,14 +90,14 @@ d3d12_video_buffer_create_impl(struct pipe_context *pipe,
    else
       pD3D12VideoBuffer->texture = (struct d3d12_resource *) pipe->screen->resource_create(pipe->screen, &templ);
 
-   d3d12_promote_to_permanent_residency((struct d3d12_screen*) pipe->screen, pD3D12VideoBuffer->texture);
-
    if (pD3D12VideoBuffer->texture == nullptr) {
       debug_printf("[d3d12_video_buffer] d3d12_video_buffer_create - Call to resource_create() to create "
                       "d3d12_resource failed\n");
       goto failed;
    }
 
+   d3d12_promote_to_permanent_residency((struct d3d12_screen*) pipe->screen, pD3D12VideoBuffer->texture);
+
    pD3D12VideoBuffer->num_planes = util_format_get_num_planes(pD3D12VideoBuffer->texture->overall_format);
    return &pD3D12VideoBuffer->base;