diff options
| author | Rodrigo Vivi <vivijim@rdvivi-cozumel.jf.intel.com> | 2019-01-24 14:50:02 -0800 |
|---|---|---|
| committer | Rodrigo Vivi <vivijim@rdvivi-cozumel.jf.intel.com> | 2019-01-24 14:50:04 -0800 |
| commit | ff00d85b4df97bf9cc7082b3d0dc2c317b946aa2 (patch) | |
| tree | 7dae9d0338e0d894dd0cb80c16fff18d28918f58 /drivers/gpu/drm/i915/gvt/scheduler.c | |
| parent | 0cdc1d07b4616f164978e8f1b3a5fe8b0a3ac835 (diff) | |
| parent | 2e679d48f38c378650db403b4ba2248adf0691b2 (diff) | |
| download | linux-ff00d85b4df97bf9cc7082b3d0dc2c317b946aa2.tar.bz2 | |
Merge tag 'gvt-next-2019-01-24' of https://github.com/intel/gvt-linux into drm-intel-next-queued
gvt-next-2019-01-24
- split kvmgt as seperate module (Zhenyu)
- Coffeelake GVT support (Fred)
- const treatment and change for kernel type (Jani)
Signed-off-by: Rodrigo Vivi <vivijim@rdvivi-cozumel.jf.intel.com>
From: Zhenyu Wang <zhenyuw@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190124054048.GO7203@zhen-hp.sh.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/scheduler.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/scheduler.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c index 3816dcae2185..b7957eefb976 100644 --- a/drivers/gpu/drm/i915/gvt/scheduler.c +++ b/drivers/gpu/drm/i915/gvt/scheduler.c @@ -299,7 +299,8 @@ static int copy_workload_to_ring_buffer(struct intel_vgpu_workload *workload) void *shadow_ring_buffer_va; u32 *cs; - if ((IS_KABYLAKE(req->i915) || IS_BROXTON(req->i915)) + if ((IS_KABYLAKE(req->i915) || IS_BROXTON(req->i915) + || IS_COFFEELAKE(req->i915)) && is_inhibit_context(req->hw_context)) intel_vgpu_restore_inhibit_context(vgpu, req); @@ -939,9 +940,7 @@ static int workload_thread(void *priv) struct intel_vgpu_workload *workload = NULL; struct intel_vgpu *vgpu = NULL; int ret; - bool need_force_wake = IS_SKYLAKE(gvt->dev_priv) - || IS_KABYLAKE(gvt->dev_priv) - || IS_BROXTON(gvt->dev_priv); + bool need_force_wake = (INTEL_GEN(gvt->dev_priv) >= 9); DEFINE_WAIT_FUNC(wait, woken_wake_function); kfree(p); |