diff options
| author |   Dave Airlie <airlied@redhat.com> | 2022-02-28 14:57:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-02-28 14:57:14 +1000 |
| commit | 6c64ae228f0826859c56711ce133aff037d6205f (patch) | |
| tree | 831f7b3c5a4eb3a5ab932edb6ca27780a316e714 /drivers/gpu/drm/i915/gvt | |
| parent | Merge tag 'mediatek-drm-next-5.18' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next (diff) | |
| parent | Linux 5.17-rc6 (diff) | |
| download | linux-dev-6c64ae228f0826859c56711ce133aff037d6205f.tar.xz linux-dev-6c64ae228f0826859c56711ce133aff037d6205f.zip | |
Backmerge tag 'v5.17-rc6' into drm-next
This backmerges v5.17-rc6 so I can merge some amdgpu and some tegra changes on top.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/gvt')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/gtt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c index 28a94c3dc991..d4082f4b9be1 100644 --- a/drivers/gpu/drm/i915/gvt/gtt.c +++ b/drivers/gpu/drm/i915/gvt/gtt.c @@ -1150,7 +1150,7 @@ static inline void ppgtt_generate_shadow_entry(struct intel_gvt_gtt_entry *se, ops->set_pfn(se, s->shadow_page.mfn); } -/** +/* * Check if can do 2M page * @vgpu: target vgpu * @entry: target pfn's gtt entry @@ -2195,7 +2195,7 @@ static int emulate_ggtt_mmio_read(struct intel_vgpu *vgpu, } /** - * intel_vgpu_emulate_gtt_mmio_read - emulate GTT MMIO register read + * intel_vgpu_emulate_ggtt_mmio_read - emulate GTT MMIO register read * @vgpu: a vGPU * @off: register offset * @p_data: data will be returned to guest |