]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/xe: Fix an IS_ERR() vs NULL bug in xe_tile_alloc_vram()
authorDan Carpenter <dan.carpenter@linaro.org>
Fri, 18 Jul 2025 21:23:05 +0000 (16:23 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Oct 2025 14:24:41 +0000 (16:24 +0200)
commit 6c9e64e83b22405622d1f47417cdb0d20d49ca35 upstream.

The xe_vram_region_alloc() function returns NULL on error.  It never
returns error pointers.  Update the error checking to match.

Fixes: 4b0a5f5ce784 ("drm/xe: Unify the initialization of VRAM regions")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/r/5449065e-9758-4711-b706-78771c0753c4@sabinyo.mountain
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/xe/xe_tile.c

index 68b84111f26b3e00971ba55398e147f1e97dfb9f..e34edff0eaa105a5400f24a42b9fe5fba2fa8523 100644 (file)
@@ -116,8 +116,8 @@ int xe_tile_alloc_vram(struct xe_tile *tile)
                return 0;
 
        vram = xe_vram_region_alloc(xe, tile->id, XE_PL_VRAM0 + tile->id);
-       if (IS_ERR(vram))
-               return PTR_ERR(vram);
+       if (!vram)
+               return -ENOMEM;
        tile->mem.vram = vram;
 
        return 0;