diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c index 9405a214760c8301aa79f81b8df418f81ad60aeb..a2b970fb3c6fd9d6e559c66da947cf6af11536cd 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; diff --git a/drivers/gpu/drm/i915/gvt/execlist.c b/drivers/gpu/drm/i915/gvt/execlist.c index f118454d2eabbc5118e6b854ffd0cd7a8a731d02..5e4f35f9e290a23aeae55512618f9b2134f1d20c 100644 --- a/drivers/gpu/drm/i915/gvt/execlist.c +++ b/drivers/gpu/drm/i915/gvt/execlist.c @@ -864,9 +864,9 @@ void intel_vgpu_clean_execlist(struct intel_vgpu *vgpu) clean_workloads(vgpu, ALL_ENGINES); for_each_engine(engine, vgpu->gvt->dev_priv, i) { - kfree(vgpu->reserve_ring_buffer_va[i]); - vgpu->reserve_ring_buffer_va[i] = NULL; - vgpu->reserve_ring_buffer_size[i] = 0; + kfree(vgpu->ring_scan_buffer[i]); + vgpu->ring_scan_buffer[i] = NULL; + vgpu->ring_scan_buffer_size[i] = 0; } } @@ -881,21 +881,21 @@ int intel_vgpu_init_execlist(struct intel_vgpu *vgpu) /* each ring has a shadow ring buffer until vgpu destroyed */ for_each_engine(engine, vgpu->gvt->dev_priv, i) { - vgpu->reserve_ring_buffer_va[i] = + vgpu->ring_scan_buffer[i] = kmalloc(RESERVE_RING_BUFFER_SIZE, GFP_KERNEL); - if (!vgpu->reserve_ring_buffer_va[i]) { - gvt_vgpu_err("fail to alloc reserve ring buffer\n"); + if (!vgpu->ring_scan_buffer[i]) { + gvt_vgpu_err("fail to alloc ring scan buffer\n"); goto out; } - vgpu->reserve_ring_buffer_size[i] = RESERVE_RING_BUFFER_SIZE; + vgpu->ring_scan_buffer_size[i] = RESERVE_RING_BUFFER_SIZE; } return 0; out: for_each_engine(engine, vgpu->gvt->dev_priv, i) { - if (vgpu->reserve_ring_buffer_size[i]) { - kfree(vgpu->reserve_ring_buffer_va[i]); - vgpu->reserve_ring_buffer_va[i] = NULL; - vgpu->reserve_ring_buffer_size[i] = 0; + if (vgpu->ring_scan_buffer_size[i]) { + kfree(vgpu->ring_scan_buffer[i]); + vgpu->ring_scan_buffer[i] = NULL; + vgpu->ring_scan_buffer_size[i] = 0; } } return -ENOMEM; diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h index 93ff530eee3037ef5da9f6905dfd0852fa02e0ae..5b723fa00fcb582dd1f48a646851889f54625c9f 100644 --- a/drivers/gpu/drm/i915/gvt/gvt.h +++ b/drivers/gpu/drm/i915/gvt/gvt.h @@ -172,9 +172,9 @@ struct intel_vgpu { struct intel_vgpu_opregion opregion; struct intel_vgpu_display display; struct intel_vgpu_submission submission; - /* 1/2K for each reserve ring buffer */ - void *reserve_ring_buffer_va[I915_NUM_ENGINES]; - int reserve_ring_buffer_size[I915_NUM_ENGINES]; + /* 1/2K for each engine */ + void *ring_scan_buffer[I915_NUM_ENGINES]; + int ring_scan_buffer_size[I915_NUM_ENGINES]; #if IS_ENABLED(CONFIG_DRM_I915_GVT_KVMGT)