Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e46f72e1 authored by Colin Xu's avatar Colin Xu Committed by Greg Kroah-Hartman
Browse files

drm/i915/gvt: Fix mmio handler break on BXT/APL. 



commit 92010a97098c4c9fd777408cc98064d26b32695b upstream

- Remove dup mmio handler for BXT/APL. Otherwise mmio handler will fail
  to init.
- Add engine GPR with F_CMD_ACCESS since BXT/APL will load them via
  LRI. Otherwise, guest will enter failsafe mode.

V2:
Use RCS/BCS GPR macros instead of offset.
Revise commit message.

V3:
Use GEN8_RING_CS_GPR macros on ring base.

Reviewed-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: default avatarColin Xu <colin.xu@intel.com>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20201016052913.209248-1-colin.xu@intel.com


(cherry picked from commit 92010a97098c4c9fd777408cc98064d26b32695b)
Signed-off-by: default avatarColin Xu <colin.xu@intel.com>
Cc: <stable@vger.kernel.org> # 5.4.y
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8cd68991

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

+7 −1
Original line number Diff line number Diff line
@@ -3132,7 +3132,7 @@ static int init_skl_mmio_info(struct intel_gvt *gvt) 
		 NULL, NULL);



	MMIO_D(GAMT_CHKN_BIT_REG, D_KBL | D_CFL);

	MMIO_D(GEN9_CTX_PREEMPT_REG, D_SKL_PLUS);

	MMIO_D(GEN9_CTX_PREEMPT_REG, D_SKL_PLUS & ~D_BXT);



	return 0;

}
@@ -3306,6 +3306,12 @@ static int init_bxt_mmio_info(struct intel_gvt *gvt) 
	MMIO_D(GEN8_PUSHBUS_SHIFT, D_BXT);

	MMIO_D(GEN6_GFXPAUSE, D_BXT);

	MMIO_DFH(GEN8_L3SQCREG1, D_BXT, F_CMD_ACCESS, NULL, NULL);

	MMIO_DFH(GEN8_L3CNTLREG, D_BXT, F_CMD_ACCESS, NULL, NULL);

	MMIO_DFH(_MMIO(0x20D8), D_BXT, F_CMD_ACCESS, NULL, NULL);

	MMIO_F(HSW_CS_GPR(0), 0x40, F_CMD_ACCESS, 0, 0, D_BXT, NULL, NULL);

	MMIO_F(_MMIO(0x12600), 0x40, F_CMD_ACCESS, 0, 0, D_BXT, NULL, NULL);

	MMIO_F(BCS_GPR(0), 0x40, F_CMD_ACCESS, 0, 0, D_BXT, NULL, NULL);

	MMIO_F(_MMIO(0x1a600), 0x40, F_CMD_ACCESS, 0, 0, D_BXT, NULL, NULL);



	MMIO_DFH(GEN9_CTX_PREEMPT_REG, D_BXT, F_CMD_ACCESS, NULL, NULL);