Commit d70c6ae5 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2025-02-13' of... 

Merge tag 'drm-intel-fixes-2025-02-13' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-fixes

- Selftest fix: avoid using uninitialized context

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

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Z64qg13R_72iN3_X@intel.com
parents 981724b4 53139b3f

drivers/gpu/drm/i915/selftests/i915_gem_gtt.c

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int igt_ppgtt_alloc(void *arg) 
		return PTR_ERR(ppgtt);



	if (!ppgtt->vm.allocate_va_range)

		goto err_ppgtt_cleanup;

		goto ppgtt_vm_put;



	/*

	 * While we only allocate the page tables here and so we could
@@ -236,7 +236,7 @@ static int igt_ppgtt_alloc(void *arg) 
			goto retry;

	}

	i915_gem_ww_ctx_fini(&ww);



ppgtt_vm_put:

	i915_vm_put(&ppgtt->vm);

	return err;

}