Merge remote-tracking branch 'origin/gvt-fixes' into gvt-staging

zhenyw · zhenyw · commit 741ed3620573 · 2021-09-13T22:14:22.000+08:00
diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -576,7 +576,7 @@ static int prepare_shadow_batch_buffer(struct intel_vgpu_workload *workload)`
`576`	`576`
`577`	`577`	`/* No one is going to touch shadow bb from now on. */`
`578`	`578`	`i915_gem_object_flush_map(bb->obj);`
`579`		`- i915_gem_object_unlock(bb->obj);`
	`579`	`+ i915_gem_ww_ctx_fini(&ww);`
`580`	`580`	`}`
`581`	`581`	`}`
`582`	`582`	`return 0;`
`@@ -630,7 +630,7 @@ static int prepare_shadow_wa_ctx(struct intel_shadow_wa_ctx *wa_ctx)`
`630`	`630`	`return ret;`
`631`	`631`	`}`
`632`	`632`
`633`		`- i915_gem_object_unlock(wa_ctx->indirect_ctx.obj);`
	`633`	`+ i915_gem_ww_ctx_fini(&ww);`
`634`	`634`
`635`	`635`	`/* FIXME: we are not tracking our pinned VMA leaving it`
`636`	`636`	`* up to the core to fix up the stray pin_count upon`