diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-04-09 18:24:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-04-09 18:24:58 +0200 |
| commit | ee1400dda31814d0a61c964ad87da6880edec0e2 (patch) | |
| tree | efa8774a97234cf93b22877a51a54f71f9e979cb /drivers/gpu/drm/i915/gvt/gvt.c | |
| parent | 071ccc966ba5db1ac8f5c24b0faebb37698f68db (diff) | |
| parent | bc16d4052f1ae99996f3475b5a73d29c86e7ba81 (diff) | |
| download | linux-ee1400dda31814d0a61c964ad87da6880edec0e2.tar.gz | |
Merge branch 'linus' into x86/pti to pick up upstream changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/gvt.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/gvt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gvt/gvt.c b/drivers/gpu/drm/i915/gvt/gvt.c index fac54f32d33f..61bd14fcb649 100644 --- a/drivers/gpu/drm/i915/gvt/gvt.c +++ b/drivers/gpu/drm/i915/gvt/gvt.c @@ -183,7 +183,7 @@ static const struct intel_gvt_ops intel_gvt_ops = { .get_gvt_attrs = intel_get_gvt_attrs, .vgpu_query_plane = intel_vgpu_query_plane, .vgpu_get_dmabuf = intel_vgpu_get_dmabuf, - .write_protect_handler = intel_vgpu_write_protect_handler, + .write_protect_handler = intel_vgpu_page_track_handler, }; /** |