Commit 4bcd2ffd authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-fixes-2018-12-27' of... 

Merge tag 'drm-intel-next-fixes-2018-12-27' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-next

GVT fixes for v4.21-rc1

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87imzfwh73.fsf@intel.com
parents 221b35fe cb6f4c2c

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

+3 −3
Original line number Diff line number Diff line
@@ -1900,11 +1900,11 @@ static struct cmd_info cmd_info[] = { 


	{"MI_URB_CLEAR", OP_MI_URB_CLEAR, F_LEN_VAR, R_RCS, D_ALL, 0, 8, NULL},



	{"ME_SEMAPHORE_SIGNAL", OP_MI_SEMAPHORE_SIGNAL, F_LEN_VAR, R_ALL,

	{"MI_SEMAPHORE_SIGNAL", OP_MI_SEMAPHORE_SIGNAL, F_LEN_VAR, R_ALL,

		D_BDW_PLUS, 0, 8, NULL},



	{"ME_SEMAPHORE_WAIT", OP_MI_SEMAPHORE_WAIT, F_LEN_VAR, R_ALL, D_BDW_PLUS,

		ADDR_FIX_1(2), 8, cmd_handler_mi_semaphore_wait},

	{"MI_SEMAPHORE_WAIT", OP_MI_SEMAPHORE_WAIT, F_LEN_VAR, R_ALL,

		D_BDW_PLUS, ADDR_FIX_1(2), 8, cmd_handler_mi_semaphore_wait},



	{"MI_STORE_DATA_IMM", OP_MI_STORE_DATA_IMM, F_LEN_VAR, R_ALL, D_BDW_PLUS,

		ADDR_FIX_1(1), 10, cmd_handler_mi_store_data_imm},

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

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ int intel_gvt_init_device(struct drm_i915_private *dev_priv) 


	ret = intel_gvt_debugfs_init(gvt);

	if (ret)

		gvt_err("debugfs registeration failed, go on.\n");

		gvt_err("debugfs registration failed, go on.\n");



	gvt_dbg_core("gvt device initialization is done\n");

	dev_priv->gvt = gvt;

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

+4 −0
Original line number Diff line number Diff line
@@ -159,6 +159,10 @@ struct intel_vgpu_submission { 
	struct kmem_cache *workloads;

	atomic_t running_workload_num;

	struct i915_gem_context *shadow_ctx;

	union {

		u64 i915_context_pml4;

		u64 i915_context_pdps[GEN8_3LVL_PDPES];

	};

	DECLARE_BITMAP(shadow_ctx_desc_updated, I915_NUM_ENGINES);

	DECLARE_BITMAP(tlb_handle_pending, I915_NUM_ENGINES);

	void *ring_scan_buffer[I915_NUM_ENGINES];

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

+1 −0
Original line number Diff line number Diff line
@@ -475,6 +475,7 @@ static i915_reg_t force_nonpriv_white_list[] = { 
	_MMIO(0x7704),

	_MMIO(0x7708),

	_MMIO(0x770c),

	_MMIO(0x83a8),

	_MMIO(0xb110),

	GEN8_L3SQCREG4,//_MMIO(0xb118)

	_MMIO(0xe100),

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

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static const char * const irq_name[INTEL_GVT_EVENT_MAX] = { 
	[FDI_RX_INTERRUPTS_TRANSCODER_C] = "FDI RX Interrupts Combined C",

	[AUDIO_CP_CHANGE_TRANSCODER_C] = "Audio CP Change Transcoder C",

	[AUDIO_CP_REQUEST_TRANSCODER_C] = "Audio CP Request Transcoder C",

	[ERR_AND_DBG] = "South Error and Debug Interupts Combined",

	[ERR_AND_DBG] = "South Error and Debug Interrupts Combined",

	[GMBUS] = "Gmbus",

	[SDVO_B_HOTPLUG] = "SDVO B hotplug",

	[CRT_HOTPLUG] = "CRT Hotplug",

CRA Git | Maintained and supported by SUSTech CRA and CCSE