diff options
author | Jani Nikula <jani.nikula@intel.com> | 2017-03-27 11:01:16 +0300 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2017-03-27 11:01:30 +0300 |
commit | 69653f626ef31107878c14883a603c1afca5edb9 (patch) | |
tree | c7ef8838a1fa0b40fdf8e52d9aa1691b8364af29 /drivers/gpu/drm/i915/gvt/scheduler.c | |
parent | c02ed2e75ef4c74e41e421acb4ef1494671585e8 (diff) | |
parent | bc2d4b62db67f817b09c782219996630e9c2f5e2 (diff) | |
download | linux-69653f626ef31107878c14883a603c1afca5edb9.tar.xz |
Merge tag 'gvt-fixes-2017-03-23' of https://github.com/01org/gvt-linux into drm-intel-fixes
gvt-fixes-2017-03-23
- KVM reference fix from Alex
- shadow gtt entry partial update fix from Xiaoguang
- gvt context notification check (Changbin)
- other misc fixes.
Signed-off-by: Jani Nikula <jani.nikula@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, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c index c4353ed86d4b..a44782412f2c 100644 --- a/drivers/gpu/drm/i915/gvt/scheduler.c +++ b/drivers/gpu/drm/i915/gvt/scheduler.c @@ -127,6 +127,11 @@ static int populate_shadow_context(struct intel_vgpu_workload *workload) return 0; } +static inline bool is_gvt_request(struct drm_i915_gem_request *req) +{ + return i915_gem_context_force_single_submission(req->ctx); +} + static int shadow_context_status_change(struct notifier_block *nb, unsigned long action, void *data) { @@ -137,7 +142,7 @@ static int shadow_context_status_change(struct notifier_block *nb, struct intel_vgpu_workload *workload = scheduler->current_workload[req->engine->id]; - if (unlikely(!workload)) + if (!is_gvt_request(req) || unlikely(!workload)) return NOTIFY_OK; switch (action) { |