Commit 5cb87427 authored by Jani Nikula's avatar Jani Nikula
Browse files

Merge tag 'gvt-fixes-2021-09-18' of https://github.com/intel/gvt-linux into drm-intel-fixes 



gvt-fixes-2021-09-18

- ww locking fix from Zhi

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
From: Zhenyu Wang <zhenyuw@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210918071105.GY14689@zhen-hp.sh.intel.com
parents 5816b3e6 d168cd79

drivers/gpu/drm/i915/gvt/scheduler.c

+2 −2
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ static int prepare_shadow_batch_buffer(struct intel_vgpu_workload *workload) 


			/* No one is going to touch shadow bb from now on. */

			i915_gem_object_flush_map(bb->obj);

			i915_gem_object_unlock(bb->obj);

			i915_gem_ww_ctx_fini(&ww);

		}

	}

	return 0;
@@ -630,7 +630,7 @@ static int prepare_shadow_wa_ctx(struct intel_shadow_wa_ctx *wa_ctx) 
		return ret;

	}



	i915_gem_object_unlock(wa_ctx->indirect_ctx.obj);

	i915_gem_ww_ctx_fini(&ww);



	/* FIXME: we are not tracking our pinned VMA leaving it

	 * up to the core to fix up the stray pin_count upon