2019-08-26 15:09:31 +08:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Zhao Yakui <yakui.zhao@intel.com>
|
|
|
|
|
Date: Wed, 21 Aug 2019 11:43:50 +0800
|
|
|
|
|
Subject: [PATCH] Revert "Reduce the unnecessary interrupt injection for small
|
|
|
|
|
time interval"
|
|
|
|
|
|
|
|
|
|
This reverts commit bbb891728d82834ec450f6a61792f715f4ec3013.
|
|
|
|
|
|
|
|
|
|
Tracked-On: PKT-2559
|
|
|
|
|
---
|
|
|
|
|
drivers/gpu/drm/i915/gvt/gvt.h | 1 -
|
|
|
|
|
drivers/gpu/drm/i915/gvt/mpt.h | 14 --------------
|
|
|
|
|
drivers/gpu/drm/i915/gvt/vgpu.c | 1 -
|
|
|
|
|
3 files changed, 16 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
|
2020-10-27 02:14:06 +08:00
|
|
|
index b0073edbe4a4..cf689150dbf7 100644
|
2019-08-26 15:09:31 +08:00
|
|
|
--- a/drivers/gpu/drm/i915/gvt/gvt.h
|
|
|
|
|
+++ b/drivers/gpu/drm/i915/gvt/gvt.h
|
|
|
|
|
@@ -240,7 +240,6 @@ struct intel_vgpu {
|
|
|
|
|
unsigned long long *cached_guest_entry;
|
|
|
|
|
bool ge_cache_enable;
|
|
|
|
|
bool entire_nonctxmmio_checked;
|
|
|
|
|
- ktime_t vgpu_msi_time;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* validating GM healthy status*/
|
|
|
|
|
diff --git a/drivers/gpu/drm/i915/gvt/mpt.h b/drivers/gpu/drm/i915/gvt/mpt.h
|
2020-10-27 02:14:06 +08:00
|
|
|
index 6030e41cc6bb..14fa2ea047fa 100644
|
2019-08-26 15:09:31 +08:00
|
|
|
--- a/drivers/gpu/drm/i915/gvt/mpt.h
|
|
|
|
|
+++ b/drivers/gpu/drm/i915/gvt/mpt.h
|
|
|
|
|
@@ -129,21 +129,7 @@ static inline int intel_gvt_hypervisor_inject_msi(struct intel_vgpu *vgpu)
|
|
|
|
|
u16 control, data;
|
|
|
|
|
u32 addr;
|
|
|
|
|
int ret;
|
|
|
|
|
- ktime_t time_current;
|
|
|
|
|
|
|
|
|
|
- time_current = ktime_get_raw();
|
|
|
|
|
-
|
|
|
|
|
- if (ktime_before(time_current,
|
|
|
|
|
- ktime_add_ns(vgpu->vgpu_msi_time, 10000))) {
|
|
|
|
|
- /*
|
|
|
|
|
- * vgpu->vpgu_msi_time records the time of last interrupt
|
|
|
|
|
- * injection. when the time interval is too small,
|
|
|
|
|
- * the interrupt injection will be skipped.
|
|
|
|
|
- */
|
|
|
|
|
- return 0;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- vgpu->vgpu_msi_time = time_current;
|
|
|
|
|
control = *(u16 *)(vgpu_cfg_space(vgpu) + MSI_CAP_CONTROL(offset));
|
|
|
|
|
addr = *(u32 *)(vgpu_cfg_space(vgpu) + MSI_CAP_ADDRESS(offset));
|
|
|
|
|
data = *(u16 *)(vgpu_cfg_space(vgpu) + MSI_CAP_DATA(offset));
|
|
|
|
|
diff --git a/drivers/gpu/drm/i915/gvt/vgpu.c b/drivers/gpu/drm/i915/gvt/vgpu.c
|
2020-10-27 02:14:06 +08:00
|
|
|
index b28bc3af3eaf..08e99dd14344 100644
|
2019-08-26 15:09:31 +08:00
|
|
|
--- a/drivers/gpu/drm/i915/gvt/vgpu.c
|
|
|
|
|
+++ b/drivers/gpu/drm/i915/gvt/vgpu.c
|
2020-04-02 08:26:12 +08:00
|
|
|
@@ -511,7 +511,6 @@ struct intel_vgpu *intel_gvt_create_vgpu(struct intel_gvt *gvt,
|
2019-08-26 15:09:31 +08:00
|
|
|
/* calculate left instance change for types */
|
|
|
|
|
intel_gvt_update_vgpu_types(gvt);
|
|
|
|
|
mutex_unlock(&gvt->lock);
|
|
|
|
|
- vgpu->vgpu_msi_time = ktime_get_raw();
|
|
|
|
|
|
|
|
|
|
return vgpu;
|
|
|
|
|
}
|
|
|
|
|
--
|
|
|
|
|
https://clearlinux.org
|
|
|
|
|
|
