Merge tag 'gvt-next-2018-09-04' of https://github.com/intel/gvt-linux into drm-intel-next-queued (5781cf82) · Commits · 戴 / test

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,10 @@ static const u8 pci_cfg_space_rw_bmp[PCI_INTERRUPT_LINE + 4] = {

		/**
		* vgpu_pci_cfg_mem_write - write virtual cfg space memory
		* @vgpu: target vgpu
		* @off: offset
		* @src: src ptr to write
		* @bytes: number of bytes
		*
		* Use this function to write virtual cfg space memory.
		* For standard cfg space, only RW bits can be changed,
		@@ -91,6 +95,10 @@ static void vgpu_pci_cfg_mem_write(struct intel_vgpu *vgpu, unsigned int off,

		/**
		* intel_vgpu_emulate_cfg_read - emulate vGPU configuration space read
		* @vgpu: target vgpu
		* @offset: offset
		* @p_data: return data ptr
		* @bytes: number of bytes to read
		*
		* Returns:
		* Zero on success, negative error code if failed.
		@@ -278,6 +286,10 @@ static int emulate_pci_bar_write(struct intel_vgpu *vgpu, unsigned int offset,

		/**
		* intel_vgpu_emulate_cfg_read - emulate vGPU configuration space write
		* @vgpu: target vgpu
		* @offset: offset
		* @p_data: write data ptr
		* @bytes: number of bytes to write
		*
		* Returns:
		* Zero on success, negative error code if failed.

+10 −1

Original line number	Diff line number	Diff line
		@@ -1817,6 +1817,8 @@ static int cmd_handler_mi_batch_buffer_start(struct parser_exec_state *s)
		return ret;
		}

		static int mi_noop_index;

		static struct cmd_info cmd_info[] = {
		{"MI_NOOP", OP_MI_NOOP, F_LEN_CONST, R_ALL, D_ALL, 0, 1, NULL},

		@@ -2502,7 +2504,12 @@ static int cmd_parser_exec(struct parser_exec_state *s)

		cmd = cmd_val(s, 0);

		/* fastpath for MI_NOOP */
		if (cmd == MI_NOOP)
		info = &cmd_info[mi_noop_index];
		else
		info = get_cmd_info(s->vgpu->gvt, cmd, s->ring_id);

		if (info == NULL) {
		gvt_vgpu_err("unknown cmd 0x%x, opcode=0x%x, addr_type=%s, ring %d, workload=%p\n",
		cmd, get_opcode(cmd, s->ring_id),
		@@ -2905,6 +2912,8 @@ static int init_cmd_table(struct intel_gvt *gvt)
		kfree(e);
		return -EEXIST;
		}
		if (cmd_info[i].opcode == OP_MI_NOOP)
		mi_noop_index = i;

		INIT_HLIST_NODE(&e->hlist);
		add_cmd_entry(gvt, e);

+1 −0

Original line number	Diff line number	Diff line
		@@ -462,6 +462,7 @@ void intel_vgpu_clean_display(struct intel_vgpu *vgpu)
		/**
		* intel_vgpu_init_display- initialize vGPU virtual display emulation
		* @vgpu: a vGPU
		* @resolution: resolution index for intel_vgpu_edid
		*
		* This function is used to initialize vGPU virtual display emulation stuffs
		*

+9 −0

Original line number	Diff line number	Diff line
		@@ -340,6 +340,9 @@ static int gmbus2_mmio_write(struct intel_vgpu *vgpu, unsigned int offset,
		/**
		* intel_gvt_i2c_handle_gmbus_read - emulate gmbus register mmio read
		* @vgpu: a vGPU
		* @offset: reg offset
		* @p_data: data return buffer
		* @bytes: access data length
		*
		* This function is used to emulate gmbus register mmio read
		*
		@@ -365,6 +368,9 @@ int intel_gvt_i2c_handle_gmbus_read(struct intel_vgpu *vgpu,
		/**
		* intel_gvt_i2c_handle_gmbus_write - emulate gmbus register mmio write
		* @vgpu: a vGPU
		* @offset: reg offset
		* @p_data: data return buffer
		* @bytes: access data length
		*
		* This function is used to emulate gmbus register mmio write
		*
		@@ -437,6 +443,9 @@ static inline int get_aux_ch_reg(unsigned int offset)
		/**
		* intel_gvt_i2c_handle_aux_ch_write - emulate AUX channel register write
		* @vgpu: a vGPU
		* @port_idx: port index
		* @offset: reg offset
		* @p_data: write ptr
		*
		* This function is used to emulate AUX channel register write
		*

+6 −3

Original line number	Diff line number	Diff line
		@@ -1113,6 +1113,10 @@ static inline void ppgtt_generate_shadow_entry(struct intel_gvt_gtt_entry *se,
		}

		/**
		* Check if can do 2M page
		* @vgpu: target vgpu
		* @entry: target pfn's gtt entry
		*
		* Return 1 if 2MB huge gtt shadowing is possilbe, 0 if miscondition,
		* negtive if found err.
		*/
		@@ -1943,7 +1947,7 @@ void intel_vgpu_unpin_mm(struct intel_vgpu_mm *mm)

		/**
		* intel_vgpu_pin_mm - increase the pin count of a vGPU mm object
		* @vgpu: a vGPU
		* @mm: target vgpu mm
		*
		* This function is called when user wants to use a vGPU mm object. If this
		* mm object hasn't been shadowed yet, the shadow will be populated at this
		@@ -2463,8 +2467,7 @@ fail:
		/**
		* intel_vgpu_find_ppgtt_mm - find a PPGTT mm object
		* @vgpu: a vGPU
		* @page_table_level: PPGTT page table level
		* @root_entry: PPGTT page table root pointers
		* @pdps: pdp root array
		*
		* This function is used to find a PPGTT mm object from mm object pool
		*