aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Xu <colin.xu@intel.com>2018-03-17 03:31:02 -0400
committerZhenyu Wang <zhenyuw@linux.intel.com>2018-03-19 02:47:35 -0400
commitb2744f862cf63c557be92ee466c6bcfddc230323 (patch)
tree3393f7b84c6f96de85bcae4ca303a50ac430d0d0
parent22de4e7a531b623962e62ee6d3a39a7e51bdf90e (diff)
drm/i915/gvt: Remove reduntant printing of untracked mmio
Reduntant message prints when: - linux guest creating. - dma-buf win10 guest boot. - xonotic stress testing in linux guest. Add below registers to default MMIO handler: 0xd00, RPM_CONFIG0 0xd40, RC6_LOCATION 0x65010, HSW_AUD_MISC_CTRL 0x6671c, 0x700a0, CUR_FBC_CTL 0x7239c, v2: - Should init i915_reg_t using uint32_t instead of _MMIO macro. (compiling errors) - Use defined offset in i915_reg.h (zhenyu) Signed-off-by: Colin Xu <colin.xu@intel.com> Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
-rw-r--r--drivers/gpu/drm/i915/gvt/handlers.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
index 112f2ec7c25f..8c5d5d005854 100644
--- a/drivers/gpu/drm/i915/gvt/handlers.c
+++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@ -1767,6 +1767,10 @@ static int init_generic_mmio_info(struct intel_gvt *gvt)
1767 MMIO_D(CURBASE(PIPE_B), D_ALL); 1767 MMIO_D(CURBASE(PIPE_B), D_ALL);
1768 MMIO_D(CURBASE(PIPE_C), D_ALL); 1768 MMIO_D(CURBASE(PIPE_C), D_ALL);
1769 1769
1770 MMIO_D(CUR_FBC_CTL(PIPE_A), D_ALL);
1771 MMIO_D(CUR_FBC_CTL(PIPE_B), D_ALL);
1772 MMIO_D(CUR_FBC_CTL(PIPE_C), D_ALL);
1773
1770 MMIO_D(_MMIO(0x700ac), D_ALL); 1774 MMIO_D(_MMIO(0x700ac), D_ALL);
1771 MMIO_D(_MMIO(0x710ac), D_ALL); 1775 MMIO_D(_MMIO(0x710ac), D_ALL);
1772 MMIO_D(_MMIO(0x720ac), D_ALL); 1776 MMIO_D(_MMIO(0x720ac), D_ALL);
@@ -2228,6 +2232,7 @@ static int init_generic_mmio_info(struct intel_gvt *gvt)
2228 2232
2229 MMIO_D(HSW_AUD_CFG(PIPE_A), D_ALL); 2233 MMIO_D(HSW_AUD_CFG(PIPE_A), D_ALL);
2230 MMIO_D(HSW_AUD_PIN_ELD_CP_VLD, D_ALL); 2234 MMIO_D(HSW_AUD_PIN_ELD_CP_VLD, D_ALL);
2235 MMIO_D(HSW_AUD_MISC_CTRL(PIPE_A), D_ALL);
2231 2236
2232 MMIO_DH(_MMIO(_TRANS_DDI_FUNC_CTL_A), D_ALL, NULL, NULL); 2237 MMIO_DH(_MMIO(_TRANS_DDI_FUNC_CTL_A), D_ALL, NULL, NULL);
2233 MMIO_DH(_MMIO(_TRANS_DDI_FUNC_CTL_B), D_ALL, NULL, NULL); 2238 MMIO_DH(_MMIO(_TRANS_DDI_FUNC_CTL_B), D_ALL, NULL, NULL);
@@ -2559,6 +2564,7 @@ static int init_broadwell_mmio_info(struct intel_gvt *gvt)
2559 MMIO_D(WM_MISC, D_BDW); 2564 MMIO_D(WM_MISC, D_BDW);
2560 MMIO_D(_MMIO(BDW_EDP_PSR_BASE), D_BDW); 2565 MMIO_D(_MMIO(BDW_EDP_PSR_BASE), D_BDW);
2561 2566
2567 MMIO_D(_MMIO(0x6671c), D_BDW_PLUS);
2562 MMIO_D(_MMIO(0x66c00), D_BDW_PLUS); 2568 MMIO_D(_MMIO(0x66c00), D_BDW_PLUS);
2563 MMIO_D(_MMIO(0x66c04), D_BDW_PLUS); 2569 MMIO_D(_MMIO(0x66c04), D_BDW_PLUS);
2564 2570
@@ -2787,6 +2793,7 @@ static int init_skl_mmio_info(struct intel_gvt *gvt)
2787 MMIO_D(_MMIO(0x70380), D_SKL_PLUS); 2793 MMIO_D(_MMIO(0x70380), D_SKL_PLUS);
2788 MMIO_D(_MMIO(0x71380), D_SKL_PLUS); 2794 MMIO_D(_MMIO(0x71380), D_SKL_PLUS);
2789 MMIO_D(_MMIO(0x72380), D_SKL_PLUS); 2795 MMIO_D(_MMIO(0x72380), D_SKL_PLUS);
2796 MMIO_D(_MMIO(0x7239c), D_SKL_PLUS);
2790 MMIO_D(_MMIO(0x7039c), D_SKL_PLUS); 2797 MMIO_D(_MMIO(0x7039c), D_SKL_PLUS);
2791 2798
2792 MMIO_D(_MMIO(0x8f074), D_SKL | D_KBL); 2799 MMIO_D(_MMIO(0x8f074), D_SKL | D_KBL);
@@ -2801,7 +2808,9 @@ static int init_skl_mmio_info(struct intel_gvt *gvt)
2801 MMIO_F(_MMIO(0xc800), 0x7f8, F_CMD_ACCESS, 0, 0, D_SKL | D_KBL, NULL, NULL); 2808 MMIO_F(_MMIO(0xc800), 0x7f8, F_CMD_ACCESS, 0, 0, D_SKL | D_KBL, NULL, NULL);
2802 MMIO_F(_MMIO(0xb020), 0x80, F_CMD_ACCESS, 0, 0, D_SKL | D_KBL, NULL, NULL); 2809 MMIO_F(_MMIO(0xb020), 0x80, F_CMD_ACCESS, 0, 0, D_SKL | D_KBL, NULL, NULL);
2803 2810
2811 MMIO_D(RPM_CONFIG0, D_SKL_PLUS);
2804 MMIO_D(_MMIO(0xd08), D_SKL_PLUS); 2812 MMIO_D(_MMIO(0xd08), D_SKL_PLUS);
2813 MMIO_D(RC6_LOCATION, D_SKL_PLUS);
2805 MMIO_DFH(_MMIO(0x20e0), D_SKL_PLUS, F_MODE_MASK, NULL, NULL); 2814 MMIO_DFH(_MMIO(0x20e0), D_SKL_PLUS, F_MODE_MASK, NULL, NULL);
2806 MMIO_DFH(_MMIO(0x20ec), D_SKL_PLUS, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL); 2815 MMIO_DFH(_MMIO(0x20ec), D_SKL_PLUS, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
2807 2816