Commit aa4d01a4 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

Merge tag 'gvt-fixes-2022-01-13' of https://github.com/intel/gvt-linux into drm-intel-fixes 



gvt-fixes-2022-01-13

- Make DRM_I915_GVT depend on X86 (Siva Mullati)
- Clean kernel doc in gtt.c (Randy Dunlap)

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
From: Zhi Wang <zhi.wang.linux@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1f619581-e3da-3899-09ac-f714d954a580@gmail.com
parents 754e0b0e d72d69ab

drivers/gpu/drm/i915/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ config DRM_I915_USERPTR 
config DRM_I915_GVT

	bool "Enable Intel GVT-g graphics virtualization host support"

	depends on DRM_I915

	depends on X86

	depends on 64BIT

	default n

	help

drivers/gpu/drm/i915/gvt/gtt.c

+2 −2
Original line number Diff line number Diff line
@@ -1148,7 +1148,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
@@ -2193,7 +2193,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