From 7eaa1bb96cc8a3a47a4af1de6da80c87cbdfc8cc Mon Sep 17 00:00:00 2001
From: Gurchetan Singh <gurchetansingh@google.com>
Date: Wed, 11 Mar 2026 17:07:25 -0700
Subject: [PATCH] gfxstream: explicitly assign INVALID_DESCRIPTOR

Sometimes, it's used with fds (int32_t), sometimes with
gem_handle (uint32_t).  Be consistent and explicitly cast
when needed.

Reviewed-by: David Gilhooley <djgilhooley@gmail.com>
Reviewed-by: Aaron Ruby <aruby@qnx.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40442>
---
 src/gfxstream/guest/platform/drm/DrmVirtGpuBlob.cpp | 2 +-
 src/gfxstream/guest/platform/include/VirtGpu.h      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gfxstream/guest/platform/drm/DrmVirtGpuBlob.cpp b/src/gfxstream/guest/platform/drm/DrmVirtGpuBlob.cpp
index eb62bc9cf15..f99c90f0287 100644
--- a/src/gfxstream/guest/platform/drm/DrmVirtGpuBlob.cpp
+++ b/src/gfxstream/guest/platform/drm/DrmVirtGpuBlob.cpp
@@ -43,7 +43,7 @@ DrmVirtGpuResource::DrmVirtGpuResource(int64_t deviceHandle, uint32_t blobHandle
 }
 
 DrmVirtGpuResource::~DrmVirtGpuResource() {
-    if (mBlobHandle == INVALID_DESCRIPTOR) {
+    if (mBlobHandle == static_cast<uint32_t>(INVALID_DESCRIPTOR)) {
         return;
     }
 
diff --git a/src/gfxstream/guest/platform/include/VirtGpu.h b/src/gfxstream/guest/platform/include/VirtGpu.h
index 528665e0ac1..aea25346db7 100644
--- a/src/gfxstream/guest/platform/include/VirtGpu.h
+++ b/src/gfxstream/guest/platform/include/VirtGpu.h
@@ -129,7 +129,7 @@ struct VirtGpuPciBusInfo {
     uint8_t function;
 };
 
-#define INVALID_DESCRIPTOR 0xFFFFFFFFU
+constexpr int32_t INVALID_DESCRIPTOR = 0xFFFFFFFF;
 
 class VirtGpuResourceMapping;
 class VirtGpuResource;