diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2020-05-11 23:55:25 -0700 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2020-05-11 23:55:26 -0700 |
| commit | 475e8423024d4713c8b791b2fa27b09fbcb7d2ca (patch) | |
| tree | 58f8b4ddaa7e0095697bfb8e1c3e6aec59e161bd /drivers/gpu/drm/i915/gvt/scheduler.c | |
| parent | a9d094dcf7845af85f82adcad9f793e51e4d14c8 (diff) | |
| parent | 72a7a9925e2beea09b109dffb3384c9bf920d9da (diff) | |
Merge tag 'gvt-fixes-2020-05-12' of https://github.com/intel/gvt-linux into drm-intel-fixes
gvt-fixes-2020-05-12
- Correct transcoder and DPLL initial clock to fix recent guest
display probe failure. (Colin)
- Fix kernel oops on older guest using aliasing ppgtt. (Zhenyu)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
From: Zhenyu Wang <zhenyuw@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200512024803.GQ18545@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 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c index 6eb6710b35e9..e92ed96c9b23 100644 --- a/drivers/gpu/drm/i915/gvt/scheduler.c +++ b/drivers/gpu/drm/i915/gvt/scheduler.c @@ -379,7 +379,11 @@ static void set_context_ppgtt_from_shadow(struct intel_vgpu_workload *workload, for (i = 0; i < GVT_RING_CTX_NR_PDPS; i++) { struct i915_page_directory * const pd = i915_pd_entry(ppgtt->pd, i); - + /* skip now as current i915 ppgtt alloc won't allocate + top level pdp for non 4-level table, won't impact + shadow ppgtt. */ + if (!pd) + break; px_dma(pd) = mm->ppgtt_mm.shadow_pdps[i]; } } |