clear-pkgs-linux-iot-lts2018/1232-Revert-drm-i915-gvt-En...

47 lines
1.7 KiB
Diff

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Liu Xinyun <xinyun.liu@intel.com>
Date: Wed, 18 Sep 2019 01:25:46 +0800
Subject: [PATCH] Revert "drm/i915/gvt: Enable guest conformance detection"
The conformace check is some kind of debug feature and has limited
usage scenario. So drop this feature for WaaG
This reverts commit a9ed934cf655927b7e945b62dd32ad6716312aec.
Tracked-On: projectacrn/acrn-hypervisor#3830
Signed-off-by: Liu Xinyun <xinyun.liu@intel.com>
Reviewed-by: Zhao Yakui <yakui.zhao@intel.com>
---
drivers/gpu/drm/i915/gvt/mmio_context.h | 1 -
drivers/gpu/drm/i915/gvt/scheduler.c | 4 ----
2 files changed, 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/gvt/mmio_context.h b/drivers/gpu/drm/i915/gvt/mmio_context.h
index b5059de42af9..5c3b9ff9f96a 100644
--- a/drivers/gpu/drm/i915/gvt/mmio_context.h
+++ b/drivers/gpu/drm/i915/gvt/mmio_context.h
@@ -54,5 +54,4 @@ bool is_inhibit_context(struct intel_context *ce);
int intel_vgpu_restore_inhibit_context(struct intel_vgpu *vgpu,
struct i915_request *req);
-int intel_gvt_vgpu_conformance_check(struct intel_vgpu *vgpu, int ring_id);
#endif
diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c
index 11cbb93e53f5..975c75f243d6 100644
--- a/drivers/gpu/drm/i915/gvt/scheduler.c
+++ b/drivers/gpu/drm/i915/gvt/scheduler.c
@@ -739,10 +739,6 @@ static int dispatch_workload(struct intel_vgpu_workload *workload)
mutex_lock(&dev_priv->drm.struct_mutex);
ret = intel_gvt_scan_and_shadow_workload(workload);
-
- if (intel_gvt_vgpu_conformance_check(vgpu, ring_id))
- gvt_err("vgpu%d unconformance guest detected\n", vgpu->id);
-
if (ret)
goto out;
--
https://clearlinux.org