diff options
| author |   Dave Airlie <airlied@redhat.com> | 2019-02-18 13:27:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-02-18 13:27:15 +1000 |
| commit | c06de56121e3ac0f0f1f4a081c041654ffcacd62 (patch) | |
| tree | 3662e7052352b0f1b78e8832b1d3b91ca211b798 /drivers/gpu/drm/i915/gvt/hypercall.h | |
| parent | Merge tag 'drm-misc-next-2019-02-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (diff) | |
| parent | Linux 5.0-rc7 (diff) | |
| download | linux-dev-c06de56121e3ac0f0f1f4a081c041654ffcacd62.tar.xz linux-dev-c06de56121e3ac0f0f1f4a081c041654ffcacd62.zip | |
Merge v5.0-rc7 into drm-next
Backmerging for nouveau and imx that needed some fixes for next pulls.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/hypercall.h')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/hypercall.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gvt/hypercall.h b/drivers/gpu/drm/i915/gvt/hypercall.h index 5e01cc8d9b16..4862fb12778e 100644 --- a/drivers/gpu/drm/i915/gvt/hypercall.h +++ b/drivers/gpu/drm/i915/gvt/hypercall.h @@ -47,7 +47,7 @@ struct intel_gvt_mpt { int (*host_init)(struct device *dev, void *gvt, const void *ops); void (*host_exit)(struct device *dev); int (*attach_vgpu)(void *vgpu, unsigned long *handle); - void (*detach_vgpu)(unsigned long handle); + void (*detach_vgpu)(void *vgpu); int (*inject_msi)(unsigned long handle, u32 addr, u16 data); unsigned long (*from_virt_to_mfn)(void *p); int (*enable_page_track)(unsigned long handle, u64 gfn); |