summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDu, Changbin2016-11-11 03:31:37 +0100
committerZhenyu Wang2016-11-14 11:06:43 +0100
commitf4b0c2860b530e06ddaa5b5df31ab4171ac6e9eb (patch)
treee531b0b485e1e41013bf8486ce480797cec0ad0c /drivers
parentdrm/i915/gvt: fix crash in vgpu_reset_execlist (diff)
downloadkernel-qcow2-linux-f4b0c2860b530e06ddaa5b5df31ab4171ac6e9eb.tar.gz
kernel-qcow2-linux-f4b0c2860b530e06ddaa5b5df31ab4171ac6e9eb.tar.xz
kernel-qcow2-linux-f4b0c2860b530e06ddaa5b5df31ab4171ac6e9eb.zip
drm/i915/gvt: fix mem leakage in setup_vgpu_mmio for vgpu reset
Gvt gdrst handler handle_device_reset() invoke function setup_vgpu_mmio() to reset mmio status. In this case, the virtual mmio memory has been allocated already. The new allocation just cause old mmio memory leakage. Signed-off-by: Du, Changbin <changbin.du@intel.com> Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/gvt/vgpu.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/gvt/vgpu.c b/drivers/gpu/drm/i915/gvt/vgpu.c
index 3a15feadc1df..044125c0f407 100644
--- a/drivers/gpu/drm/i915/gvt/vgpu.c
+++ b/drivers/gpu/drm/i915/gvt/vgpu.c
@@ -46,9 +46,13 @@ int setup_vgpu_mmio(struct intel_vgpu *vgpu)
struct intel_gvt *gvt = vgpu->gvt;
const struct intel_gvt_device_info *info = &gvt->device_info;
- vgpu->mmio.vreg = vzalloc(info->mmio_size * 2);
- if (!vgpu->mmio.vreg)
- return -ENOMEM;
+ if (vgpu->mmio.vreg)
+ memset(vgpu->mmio.vreg, 0, info->mmio_size * 2);
+ else {
+ vgpu->mmio.vreg = vzalloc(info->mmio_size * 2);
+ if (!vgpu->mmio.vreg)
+ return -ENOMEM;
+ }
vgpu->mmio.sreg = vgpu->mmio.vreg + info->mmio_size;