Commit 6f4fc18f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'vmwgfx-fixes-5.9' of git://people.freedesktop.org/~sroland/linux into drm-fixes 



One vmwgfx regression fix.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: "Roland Scheidegger (VMware)" <rscheidegger.oss@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200930041000.2423-1-rscheidegger.oss@gmail.com
parents a1b8638b f54c4442

drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static int vmw_gmrid_man_get_node(struct ttm_mem_type_manager *man, 


	id = ida_alloc_max(&gman->gmr_ida, gman->max_gmr_ids - 1, GFP_KERNEL);

	if (id < 0)

		return (id != -ENOMEM ? 0 : id);

		return id;



	spin_lock(&gman->lock);

drivers/gpu/drm/vmwgfx/vmwgfx_thp.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ found_unlock: 
		mem->start = node->start;

	}



	return 0;

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE