diff options
| author | Zhi Wang | 2017-09-10 15:46:06 +0200 |
|---|---|---|
| committer | Zhenyu Wang | 2017-11-16 04:46:50 +0100 |
| commit | 8cf80a2e4b313d1aba7d10ce6ebfbb44a119c66c (patch) | |
| tree | b64b6477a32a7af1057a7d40d6089f3231d1f616 /drivers/gpu/drm/i915/gvt/cmd_parser.c | |
| parent | drm/i915/gvt: Fix a memory leak in cmd_parser.c (diff) | |
| download | kernel-qcow2-linux-8cf80a2e4b313d1aba7d10ce6ebfbb44a119c66c.tar.gz kernel-qcow2-linux-8cf80a2e4b313d1aba7d10ce6ebfbb44a119c66c.tar.xz kernel-qcow2-linux-8cf80a2e4b313d1aba7d10ce6ebfbb44a119c66c.zip | |
drm/i915/gvt: Rename reserved ring buffer
"reserved" means reserve something from somewhere. Actually they are
buffers used by command scanner. Rename it to ring_scan_buffer.
v2:
- Remove the usage of an extra variable. (Zhenyu)
Fixes: 0a53bc07f044 ("drm/i915/gvt: Separate cmd scan from request allocation")
Signed-off-by: Zhi Wang <zhi.a.wang@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/cmd_parser.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/cmd_parser.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c index 9405a214760c..a2b970fb3c6f 100644 --- a/drivers/gpu/drm/i915/gvt/cmd_parser.c +++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c @@ -2619,21 +2619,21 @@ static int shadow_workload_ring_buffer(struct intel_vgpu_workload *workload) gma_tail = workload->rb_start + workload->rb_tail; gma_top = workload->rb_start + guest_rb_size; - if (workload->rb_len > vgpu->reserve_ring_buffer_size[ring_id]) { - void *va, *p; + if (workload->rb_len > vgpu->ring_scan_buffer_size[ring_id]) { + void *p; /* realloc the new ring buffer if needed */ - va = vgpu->reserve_ring_buffer_va[ring_id]; - p = krealloc(va, workload->rb_len, GFP_KERNEL); + p = krealloc(vgpu->ring_scan_buffer[ring_id], workload->rb_len, + GFP_KERNEL); if (!p) { - gvt_vgpu_err("fail to alloc reserve ring buffer\n"); + gvt_vgpu_err("fail to re-alloc ring scan buffer\n"); return -ENOMEM; } - vgpu->reserve_ring_buffer_va[ring_id] = p; - vgpu->reserve_ring_buffer_size[ring_id] = workload->rb_len; + vgpu->ring_scan_buffer[ring_id] = p; + vgpu->ring_scan_buffer_size[ring_id] = workload->rb_len; } - shadow_ring_buffer_va = vgpu->reserve_ring_buffer_va[ring_id]; + shadow_ring_buffer_va = vgpu->ring_scan_buffer[ring_id]; /* get shadow ring buffer va */ workload->shadow_ring_buffer_va = shadow_ring_buffer_va; |