diff options
author | Rodrigo Vivi | 2017-12-14 19:57:39 +0100 |
---|---|---|
committer | Rodrigo Vivi | 2017-12-14 19:57:41 +0100 |
commit | 07825e4b9311b11df02365a35cdf997d69426b29 (patch) | |
tree | 457f4c465cd55d187683934750b281efdb4c9c25 /drivers/gpu/drm/i915/gvt/gvt.h | |
parent | drm/i915: properly init lockdep class (diff) | |
parent | drm/i915/gvt/fb_decoder: Fix out-of-bounds read (diff) | |
download | kernel-qcow2-linux-07825e4b9311b11df02365a35cdf997d69426b29.tar.gz kernel-qcow2-linux-07825e4b9311b11df02365a35cdf997d69426b29.tar.xz kernel-qcow2-linux-07825e4b9311b11df02365a35cdf997d69426b29.zip |
Merge tag 'gvt-next-2017-12-14' of https://github.com/intel/gvt-linux into drm-intel-next-queued
gvt-next-2017-12-14:
- fixes for two coverity scan errors (Colin)
- mmio switch code refine (Changbin)
- more virtual display dmabuf fixes (Tina/Gustavo)
- misc cleanups (Pei)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171214033434.jlppjlyal5d67ya7@zhen-hp.sh.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/gvt.h')
-rw-r--r-- | drivers/gpu/drm/i915/gvt/gvt.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h index 103910a24e4b..1e9f11c8b7bb 100644 --- a/drivers/gpu/drm/i915/gvt/gvt.h +++ b/drivers/gpu/drm/i915/gvt/gvt.h @@ -44,7 +44,7 @@ #include "execlist.h" #include "scheduler.h" #include "sched_policy.h" -#include "render.h" +#include "mmio_context.h" #include "cmd_parser.h" #include "fb_decoder.h" #include "dmabuf.h" @@ -310,6 +310,8 @@ struct intel_gvt { wait_queue_head_t service_thread_wq; unsigned long service_request; + struct engine_mmio *engine_mmio_list; + struct dentry *debugfs_root; }; |