Commit 164312df authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

Merge tag 'gvt-next-2022-11-17' of https://github.com/intel/gvt-linux into drm-intel-next 



gvt-next-2022-11-17

- kernel doc fixes
- remove vgpu->released sanity check
- small clean up

Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
From: Zhenyu Wang <zhenyuw@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221117064106.GT30028@zhen-hp.sh.intel.com
parents 36d35716 04ec334e

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

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ static void emulate_pci_bar_write(struct intel_vgpu *vgpu, unsigned int offset, 
}



/**

 * intel_vgpu_emulate_cfg_read - emulate vGPU configuration space write

 * intel_vgpu_emulate_cfg_write - emulate vGPU configuration space write

 * @vgpu: target vgpu

 * @offset: offset

 * @p_data: write data ptr

drivers/gpu/drm/i915/gvt/dmabuf.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct intel_vgpu_fb_info { 
	struct intel_vgpu_dmabuf_obj *obj;

};



/**

/*

 * struct intel_vgpu_dmabuf_obj- Intel vGPU device buffer object

 */

struct intel_vgpu_dmabuf_obj {

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

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static int expose_firmware_sysfs(struct intel_gvt *gvt) 


	memcpy(p, gvt->firmware.mmio, info->mmio_size);



	crc32_start = offsetof(struct gvt_firmware_header, crc32) + 4;

	crc32_start = offsetof(struct gvt_firmware_header, version);

	h->crc32 = crc32_le(0, firmware + crc32_start, size - crc32_start);



	firmware_attr.size = size;

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

+1 −6
Original line number Diff line number Diff line
@@ -282,11 +282,6 @@ static inline int get_next_pt_type(int type) 
	return gtt_type_table[type].next_pt_type;

}



static inline int get_pt_type(int type)

{

	return gtt_type_table[type].pt_type;

}



static inline int get_entry_type(int type)

{

	return gtt_type_table[type].entry_type;
@@ -2785,7 +2780,7 @@ int intel_gvt_init_gtt(struct intel_gvt *gvt) 
 * intel_gvt_clean_gtt - clean up mm components of a GVT device

 * @gvt: GVT device

 *

 * This function is called at the driver unloading stage, to clean up the

 * This function is called at the driver unloading stage, to clean up

 * the mm components of a GVT device.

 *

 */

drivers/gpu/drm/i915/gvt/gvt.h

+0 −2
Original line number Diff line number Diff line
@@ -227,8 +227,6 @@ struct intel_vgpu { 
	unsigned long nr_cache_entries;

	struct mutex cache_lock;



	atomic_t released;



	struct kvm_page_track_notifier_node track_node;

#define NR_BKT (1 << 18)

	struct hlist_head ptable[NR_BKT];