Commit 4bac159e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2021-06-24' of... 

Merge tag 'drm-misc-next-fixes-2021-06-24' of git://anongit.freedesktop.org/drm/drm-misc

 into drm-next

Short summary of fixes pull:

 * amdgpu: Fix test for allocation failures

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YNQxVybBGdjLMUQJ@linux-uq9g
parents b322a50d eed75ce7

drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man, 
	struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);



	*res = kzalloc(sizeof(**res), GFP_KERNEL);

	if (*res)

	if (!*res)

		return -ENOMEM;



	ttm_resource_init(tbo, place, *res);