Merge tag 'drm-intel-next-2022-05-20' of git://anongit.freedesktop.org/drm/drm-intel...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / gvt / cmd_parser.c

diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c
index efad8552d6e6c27fac9ac3d4b9b68ba46051f5d4..0ba2a3455d99327f7a551b800e4c84e19dfe880b 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/cmd_parser.c
+++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c
@@ -1011,7 +1011,7 @@ static int cmd_reg_handler(struct parser_exec_state *s,
        if (GRAPHICS_VER(s->engine->i915) == 9 &&
            intel_gvt_mmio_is_sr_in_ctx(gvt, offset) &&
            !strncmp(cmd, "lri", 3)) {
-               intel_gvt_hypervisor_read_gpa(s->vgpu,
+               intel_gvt_read_gpa(s->vgpu,
                        s->workload->ring_context_gpa + 12, &ctx_sr_ctl, 4);
                /* check inhibit context */
                if (ctx_sr_ctl & 1) {
@@ -1775,7 +1775,7 @@ static int copy_gma_to_hva(struct intel_vgpu *vgpu, struct intel_vgpu_mm *mm,
                copy_len = (end_gma - gma) >= (I915_GTT_PAGE_SIZE - offset) ?
                        I915_GTT_PAGE_SIZE - offset : end_gma - gma;
 
-               intel_gvt_hypervisor_read_gpa(vgpu, gpa, va + len, copy_len);
+               intel_gvt_read_gpa(vgpu, gpa, va + len, copy_len);
 
                len += copy_len;
                gma += copy_len;