[PATCH v2] have more registers with F_CMD_ACCESS flags set
Zhao, Yan Y
yan.y.zhao at intel.com
Tue Feb 28 02:53:17 UTC 2017
hi zhenyu
Thanks for you comments.
- why not add MMIO_DF() for just applying flag without specific handlers?
this will affect far more registers than render registers.
Suggest to do that as a code refactor in later patches.:-)
On 2/28/2017 10:36 AM, Zhenyu Wang wrote:
> On 2017.02.27 16:33:07 +0800, Zhao Yan wrote:
>> those registers are render registers, should have F_CMD_ACCESS flag set
>>
>> v2:
>> per Kevin's comments, move newly added registers to the tails of lists.
>>
> - pls fix patch title as least "drm/i915/gvt: ..."
>
> - new added register should be on seperate patch
>
> - why not add MMIO_DF() for just applying flag without specific handlers?
>
>> Signed-off-by: Zhao Yan <yan.y.zhao at intel.com>
>> ---
>> drivers/gpu/drm/i915/gvt/handlers.c | 254 +++++++++++++++++++++---------------
>> 1 file changed, 150 insertions(+), 104 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
>> index f6a7b8e..09377d7 100644
>> --- a/drivers/gpu/drm/i915/gvt/handlers.c
>> +++ b/drivers/gpu/drm/i915/gvt/handlers.c
>> @@ -1520,6 +1520,9 @@ static int ring_reset_ctl_write(struct intel_vgpu *vgpu,
>> #define MMIO_GM(reg, d, r, w) \
>> MMIO_F(reg, 4, F_GMADR, 0xFFFFF000, 0, d, r, w)
>>
>> +#define MMIO_GM_RDR(reg, d, r, w) \
>> + MMIO_F(reg, 4, F_GMADR | F_CMD_ACCESS, 0xFFFFF000, 0, d, r, w)
>> +
>> #define MMIO_RO(reg, d, f, rm, r, w) \
>> MMIO_F(reg, 4, F_RO | f, 0, rm, d, r, w)
>>
>> @@ -1539,6 +1542,9 @@ static int ring_reset_ctl_write(struct intel_vgpu *vgpu,
>> #define MMIO_RING_GM(prefix, d, r, w) \
>> MMIO_RING_F(prefix, 4, F_GMADR, 0xFFFF0000, 0, d, r, w)
>>
>> +#define MMIO_RING_GM_RDR(prefix, d, r, w) \
>> + MMIO_RING_F(prefix, 4, F_GMADR | F_CMD_ACCESS, 0xFFFF0000, 0, d, r, w)
>> +
>> #define MMIO_RING_RO(prefix, d, f, rm, r, w) \
>> MMIO_RING_F(prefix, 4, F_RO | f, 0, rm, d, r, w)
>>
>> @@ -1547,73 +1553,79 @@ static int init_generic_mmio_info(struct intel_gvt *gvt)
>> struct drm_i915_private *dev_priv = gvt->dev_priv;
>> int ret;
>>
>> - MMIO_RING_DFH(RING_IMR, D_ALL, 0, NULL, intel_vgpu_reg_imr_handler);
>> + MMIO_RING_DFH(RING_IMR, D_ALL, F_CMD_ACCESS, NULL,
>> + intel_vgpu_reg_imr_handler);
>>
>> MMIO_DFH(SDEIMR, D_ALL, 0, NULL, intel_vgpu_reg_imr_handler);
>> MMIO_DFH(SDEIER, D_ALL, 0, NULL, intel_vgpu_reg_ier_handler);
>> MMIO_DFH(SDEIIR, D_ALL, 0, NULL, intel_vgpu_reg_iir_handler);
>> MMIO_D(SDEISR, D_ALL);
>>
>> - MMIO_RING_D(RING_HWSTAM, D_ALL);
>> + MMIO_RING_DFH(RING_HWSTAM, D_ALL, F_CMD_ACCESS, NULL, NULL);
>>
>> - MMIO_GM(RENDER_HWS_PGA_GEN7, D_ALL, NULL, NULL);
>> - MMIO_GM(BSD_HWS_PGA_GEN7, D_ALL, NULL, NULL);
>> - MMIO_GM(BLT_HWS_PGA_GEN7, D_ALL, NULL, NULL);
>> - MMIO_GM(VEBOX_HWS_PGA_GEN7, D_ALL, NULL, NULL);
>> + MMIO_GM_RDR(RENDER_HWS_PGA_GEN7, D_ALL, NULL, NULL);
>> + MMIO_GM_RDR(BSD_HWS_PGA_GEN7, D_ALL, NULL, NULL);
>> + MMIO_GM_RDR(BLT_HWS_PGA_GEN7, D_ALL, NULL, NULL);
>> + MMIO_GM_RDR(VEBOX_HWS_PGA_GEN7, D_ALL, NULL, NULL);
>>
>> #define RING_REG(base) (base + 0x28)
>> - MMIO_RING_D(RING_REG, D_ALL);
>> + MMIO_RING_DFH(RING_REG, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> #undef RING_REG
>>
>> #define RING_REG(base) (base + 0x134)
>> - MMIO_RING_D(RING_REG, D_ALL);
>> + MMIO_RING_DFH(RING_REG, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> #undef RING_REG
>>
>> - MMIO_GM(0x2148, D_ALL, NULL, NULL);
>> - MMIO_GM(CCID, D_ALL, NULL, NULL);
>> - MMIO_GM(0x12198, D_ALL, NULL, NULL);
>> + MMIO_GM_RDR(0x2148, D_ALL, NULL, NULL);
>> + MMIO_GM_RDR(CCID, D_ALL, NULL, NULL);
>> + MMIO_GM_RDR(0x12198, D_ALL, NULL, NULL);
>> MMIO_D(GEN7_CXT_SIZE, D_ALL);
>>
>> - MMIO_RING_D(RING_TAIL, D_ALL);
>> - MMIO_RING_D(RING_HEAD, D_ALL);
>> - MMIO_RING_D(RING_CTL, D_ALL);
>> - MMIO_RING_D(RING_ACTHD, D_ALL);
>> - MMIO_RING_GM(RING_START, D_ALL, NULL, NULL);
>> + MMIO_RING_DFH(RING_TAIL, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_RING_DFH(RING_HEAD, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_RING_DFH(RING_CTL, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_RING_DFH(RING_ACTHD, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_RING_GM_RDR(RING_START, D_ALL, NULL, NULL);
>>
>> /* RING MODE */
>> #define RING_REG(base) (base + 0x29c)
>> - MMIO_RING_DFH(RING_REG, D_ALL, F_MODE_MASK, NULL, ring_mode_mmio_write);
>> + MMIO_RING_DFH(RING_REG, D_ALL, F_MODE_MASK | F_CMD_ACCESS, NULL,
>> + ring_mode_mmio_write);
>> #undef RING_REG
>>
>> - MMIO_RING_DFH(RING_MI_MODE, D_ALL, F_MODE_MASK, NULL, NULL);
>> - MMIO_RING_DFH(RING_INSTPM, D_ALL, F_MODE_MASK, NULL, NULL);
>> + MMIO_RING_DFH(RING_MI_MODE, D_ALL, F_MODE_MASK | F_CMD_ACCESS,
>> + NULL, NULL);
>> + MMIO_RING_DFH(RING_INSTPM, D_ALL, F_MODE_MASK | F_CMD_ACCESS,
>> + NULL, NULL);
>> MMIO_RING_DFH(RING_TIMESTAMP, D_ALL, F_CMD_ACCESS,
>> ring_timestamp_mmio_read, NULL);
>> MMIO_RING_DFH(RING_TIMESTAMP_UDW, D_ALL, F_CMD_ACCESS,
>> ring_timestamp_mmio_read, NULL);
>>
>> - MMIO_DFH(GEN7_GT_MODE, D_ALL, F_MODE_MASK, NULL, NULL);
>> - MMIO_DFH(CACHE_MODE_0_GEN7, D_ALL, F_MODE_MASK, NULL, NULL);
>> + MMIO_DFH(GEN7_GT_MODE, D_ALL, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(CACHE_MODE_0_GEN7, D_ALL, F_MODE_MASK | F_CMD_ACCESS,
>> + NULL, NULL);
>> MMIO_DFH(CACHE_MODE_1, D_ALL, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>> - MMIO_DFH(CACHE_MODE_0, D_ALL, F_MODE_MASK, NULL, NULL);
>> - MMIO_DFH(0x2124, D_ALL, F_MODE_MASK, NULL, NULL);
>> -
>> - MMIO_DFH(0x20dc, D_ALL, F_MODE_MASK, NULL, NULL);
>> - MMIO_DFH(_3D_CHICKEN3, D_ALL, F_MODE_MASK, NULL, NULL);
>> - MMIO_DFH(0x2088, D_ALL, F_MODE_MASK, NULL, NULL);
>> - MMIO_DFH(0x20e4, D_ALL, F_MODE_MASK, NULL, NULL);
>> - MMIO_DFH(0x2470, D_ALL, F_MODE_MASK, NULL, NULL);
>> - MMIO_D(GAM_ECOCHK, D_ALL);
>> - MMIO_DFH(GEN7_COMMON_SLICE_CHICKEN1, D_ALL, F_MODE_MASK, NULL, NULL);
>> + MMIO_DFH(CACHE_MODE_0, D_ALL, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x2124, D_ALL, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>> +
>> + MMIO_DFH(0x20dc, D_ALL, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(_3D_CHICKEN3, D_ALL, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x2088, D_ALL, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x20e4, D_ALL, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x2470, D_ALL, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(GAM_ECOCHK, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(GEN7_COMMON_SLICE_CHICKEN1, D_ALL, F_MODE_MASK | F_CMD_ACCESS,
>> + NULL, NULL);
>> MMIO_DFH(COMMON_SLICE_CHICKEN2, D_ALL, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>> - MMIO_D(0x9030, D_ALL);
>> - MMIO_D(0x20a0, D_ALL);
>> - MMIO_D(0x2420, D_ALL);
>> - MMIO_D(0x2430, D_ALL);
>> - MMIO_D(0x2434, D_ALL);
>> - MMIO_D(0x2438, D_ALL);
>> - MMIO_D(0x243c, D_ALL);
>> - MMIO_DFH(0x7018, D_ALL, F_MODE_MASK, NULL, NULL);
>> + MMIO_DFH(0x9030, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x20a0, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x2420, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x2430, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x2434, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x2438, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x243c, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x7018, D_ALL, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>> MMIO_DFH(HALF_SLICE_CHICKEN3, D_ALL, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>> MMIO_DFH(GEN7_HALF_SLICE_CHICKEN1, D_ALL, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>>
>> @@ -2144,8 +2156,8 @@ static int init_generic_mmio_info(struct intel_gvt *gvt)
>> MMIO_D(FORCEWAKE_ACK, D_ALL);
>> MMIO_D(GEN6_GT_CORE_STATUS, D_ALL);
>> MMIO_D(GEN6_GT_THREAD_STATUS_REG, D_ALL);
>> - MMIO_D(GTFIFODBG, D_ALL);
>> - MMIO_D(GTFIFOCTL, D_ALL);
>> + MMIO_DFH(GTFIFODBG, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(GTFIFOCTL, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> MMIO_DH(FORCEWAKE_MT, D_PRE_SKL, NULL, mul_force_wake_write);
>> MMIO_DH(FORCEWAKE_ACK_HSW, D_HSW | D_BDW, NULL, NULL);
>> MMIO_D(ECOBUS, D_ALL);
>> @@ -2288,29 +2300,29 @@ static int init_generic_mmio_info(struct intel_gvt *gvt)
>> MMIO_DFH(0x12178, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> MMIO_DFH(0x1217c, D_ALL, F_CMD_ACCESS, NULL, NULL);
>>
>> - MMIO_F(0x2290, 8, 0, 0, 0, D_HSW_PLUS, NULL, NULL);
>> - MMIO_D(OACONTROL, D_HSW);
>> + MMIO_F(0x2290, 8, F_CMD_ACCESS, 0, 0, D_HSW_PLUS, NULL, NULL);
>> + MMIO_DFH(OACONTROL, D_HSW, F_CMD_ACCESS, NULL, NULL);
>> MMIO_D(0x2b00, D_BDW_PLUS);
>> MMIO_D(0x2360, D_BDW_PLUS);
>> - MMIO_F(0x5200, 32, 0, 0, 0, D_ALL, NULL, NULL);
>> - MMIO_F(0x5240, 32, 0, 0, 0, D_ALL, NULL, NULL);
>> - MMIO_F(0x5280, 16, 0, 0, 0, D_ALL, NULL, NULL);
>> + MMIO_F(0x5200, 32, F_CMD_ACCESS, 0, 0, D_ALL, NULL, NULL);
>> + MMIO_F(0x5240, 32, F_CMD_ACCESS, 0, 0, D_ALL, NULL, NULL);
>> + MMIO_F(0x5280, 16, F_CMD_ACCESS, 0, 0, D_ALL, NULL, NULL);
>>
>> MMIO_DFH(0x1c17c, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>> MMIO_DFH(0x1c178, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>> - MMIO_D(BCS_SWCTRL, D_ALL);
>> -
>> - MMIO_F(HS_INVOCATION_COUNT, 8, 0, 0, 0, D_ALL, NULL, NULL);
>> - MMIO_F(DS_INVOCATION_COUNT, 8, 0, 0, 0, D_ALL, NULL, NULL);
>> - MMIO_F(IA_VERTICES_COUNT, 8, 0, 0, 0, D_ALL, NULL, NULL);
>> - MMIO_F(IA_PRIMITIVES_COUNT, 8, 0, 0, 0, D_ALL, NULL, NULL);
>> - MMIO_F(VS_INVOCATION_COUNT, 8, 0, 0, 0, D_ALL, NULL, NULL);
>> - MMIO_F(GS_INVOCATION_COUNT, 8, 0, 0, 0, D_ALL, NULL, NULL);
>> - MMIO_F(GS_PRIMITIVES_COUNT, 8, 0, 0, 0, D_ALL, NULL, NULL);
>> - MMIO_F(CL_INVOCATION_COUNT, 8, 0, 0, 0, D_ALL, NULL, NULL);
>> - MMIO_F(CL_PRIMITIVES_COUNT, 8, 0, 0, 0, D_ALL, NULL, NULL);
>> - MMIO_F(PS_INVOCATION_COUNT, 8, 0, 0, 0, D_ALL, NULL, NULL);
>> - MMIO_F(PS_DEPTH_COUNT, 8, 0, 0, 0, D_ALL, NULL, NULL);
>> + MMIO_DFH(BCS_SWCTRL, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> +
>> + MMIO_F(HS_INVOCATION_COUNT, 8, F_CMD_ACCESS, 0, 0, D_ALL, NULL, NULL);
>> + MMIO_F(DS_INVOCATION_COUNT, 8, F_CMD_ACCESS, 0, 0, D_ALL, NULL, NULL);
>> + MMIO_F(IA_VERTICES_COUNT, 8, F_CMD_ACCESS, 0, 0, D_ALL, NULL, NULL);
>> + MMIO_F(IA_PRIMITIVES_COUNT, 8, F_CMD_ACCESS, 0, 0, D_ALL, NULL, NULL);
>> + MMIO_F(VS_INVOCATION_COUNT, 8, F_CMD_ACCESS, 0, 0, D_ALL, NULL, NULL);
>> + MMIO_F(GS_INVOCATION_COUNT, 8, F_CMD_ACCESS, 0, 0, D_ALL, NULL, NULL);
>> + MMIO_F(GS_PRIMITIVES_COUNT, 8, F_CMD_ACCESS, 0, 0, D_ALL, NULL, NULL);
>> + MMIO_F(CL_INVOCATION_COUNT, 8, F_CMD_ACCESS, 0, 0, D_ALL, NULL, NULL);
>> + MMIO_F(CL_PRIMITIVES_COUNT, 8, F_CMD_ACCESS, 0, 0, D_ALL, NULL, NULL);
>> + MMIO_F(PS_INVOCATION_COUNT, 8, F_CMD_ACCESS, 0, 0, D_ALL, NULL, NULL);
>> + MMIO_F(PS_DEPTH_COUNT, 8, F_CMD_ACCESS, 0, 0, D_ALL, NULL, NULL);
>> MMIO_DH(0x4260, D_BDW_PLUS, NULL, gvt_reg_tlb_control_handler);
>> MMIO_DH(0x4264, D_BDW_PLUS, NULL, gvt_reg_tlb_control_handler);
>> MMIO_DH(0x4268, D_BDW_PLUS, NULL, gvt_reg_tlb_control_handler);
>> @@ -2318,6 +2330,17 @@ static int init_generic_mmio_info(struct intel_gvt *gvt)
>> MMIO_DH(0x4270, D_BDW_PLUS, NULL, gvt_reg_tlb_control_handler);
>> MMIO_DFH(0x4094, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>>
>> + MMIO_DFH(ARB_MODE, D_ALL, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>> + MMIO_RING_GM_RDR(RING_BBADDR, D_ALL, NULL, NULL);
>> + MMIO_DFH(0x2220, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x12220, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x22220, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_RING_DFH(RING_SYNC_1, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_RING_DFH(RING_SYNC_0, D_ALL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x22178, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x1a178, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x1a17c, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x2217c, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>> return 0;
>> }
>>
>> @@ -2326,7 +2349,7 @@ static int init_broadwell_mmio_info(struct intel_gvt *gvt)
>> struct drm_i915_private *dev_priv = gvt->dev_priv;
>> int ret;
>>
>> - MMIO_DH(RING_IMR(GEN8_BSD2_RING_BASE), D_BDW_PLUS, NULL,
>> + MMIO_DFH(RING_IMR(GEN8_BSD2_RING_BASE), D_BDW_PLUS, F_CMD_ACCESS, NULL,
>> intel_vgpu_reg_imr_handler);
>>
>> MMIO_DH(GEN8_GT_IMR(0), D_BDW_PLUS, NULL, intel_vgpu_reg_imr_handler);
>> @@ -2391,24 +2414,31 @@ static int init_broadwell_mmio_info(struct intel_gvt *gvt)
>> MMIO_DH(GEN8_MASTER_IRQ, D_BDW_PLUS, NULL,
>> intel_vgpu_reg_master_irq_handler);
>>
>> - MMIO_D(RING_HWSTAM(GEN8_BSD2_RING_BASE), D_BDW_PLUS);
>> - MMIO_D(0x1c134, D_BDW_PLUS);
>> -
>> - MMIO_D(RING_TAIL(GEN8_BSD2_RING_BASE), D_BDW_PLUS);
>> - MMIO_D(RING_HEAD(GEN8_BSD2_RING_BASE), D_BDW_PLUS);
>> - MMIO_GM(RING_START(GEN8_BSD2_RING_BASE), D_BDW_PLUS, NULL, NULL);
>> - MMIO_D(RING_CTL(GEN8_BSD2_RING_BASE), D_BDW_PLUS);
>> - MMIO_D(RING_ACTHD(GEN8_BSD2_RING_BASE), D_BDW_PLUS);
>> - MMIO_D(RING_ACTHD_UDW(GEN8_BSD2_RING_BASE), D_BDW_PLUS);
>> - MMIO_DFH(0x1c29c, D_BDW_PLUS, F_MODE_MASK, NULL, ring_mode_mmio_write);
>> - MMIO_DFH(RING_MI_MODE(GEN8_BSD2_RING_BASE), D_BDW_PLUS, F_MODE_MASK,
>> - NULL, NULL);
>> - MMIO_DFH(RING_INSTPM(GEN8_BSD2_RING_BASE), D_BDW_PLUS, F_MODE_MASK,
>> - NULL, NULL);
>> + MMIO_DFH(RING_HWSTAM(GEN8_BSD2_RING_BASE), D_BDW_PLUS,
>> + F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x1c134, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>> +
>> + MMIO_DFH(RING_TAIL(GEN8_BSD2_RING_BASE), D_BDW_PLUS, F_CMD_ACCESS,
>> + NULL, NULL);
>> + MMIO_DFH(RING_HEAD(GEN8_BSD2_RING_BASE), D_BDW_PLUS,
>> + F_CMD_ACCESS, NULL, NULL);
>> + MMIO_GM_RDR(RING_START(GEN8_BSD2_RING_BASE), D_BDW_PLUS, NULL, NULL);
>> + MMIO_DFH(RING_CTL(GEN8_BSD2_RING_BASE), D_BDW_PLUS, F_CMD_ACCESS,
>> + NULL, NULL);
>> + MMIO_DFH(RING_ACTHD(GEN8_BSD2_RING_BASE), D_BDW_PLUS,
>> + F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(RING_ACTHD_UDW(GEN8_BSD2_RING_BASE), D_BDW_PLUS,
>> + F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x1c29c, D_BDW_PLUS, F_MODE_MASK | F_CMD_ACCESS, NULL,
>> + ring_mode_mmio_write);
>> + MMIO_DFH(RING_MI_MODE(GEN8_BSD2_RING_BASE), D_BDW_PLUS,
>> + F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(RING_INSTPM(GEN8_BSD2_RING_BASE), D_BDW_PLUS,
>> + F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>> MMIO_DFH(RING_TIMESTAMP(GEN8_BSD2_RING_BASE), D_BDW_PLUS, F_CMD_ACCESS,
>> ring_timestamp_mmio_read, NULL);
>>
>> - MMIO_RING_D(RING_ACTHD_UDW, D_BDW_PLUS);
>> + MMIO_RING_DFH(RING_ACTHD_UDW, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>>
>> #define RING_REG(base) (base + 0xd0)
>> MMIO_RING_F(RING_REG, 4, F_RO, 0,
>> @@ -2425,13 +2455,16 @@ static int init_broadwell_mmio_info(struct intel_gvt *gvt)
>> #undef RING_REG
>>
>> #define RING_REG(base) (base + 0x234)
>> - MMIO_RING_F(RING_REG, 8, F_RO, 0, ~0, D_BDW_PLUS, NULL, NULL);
>> - MMIO_F(RING_REG(GEN8_BSD2_RING_BASE), 4, F_RO, 0, ~0LL, D_BDW_PLUS, NULL, NULL);
>> + MMIO_RING_F(RING_REG, 8, F_RO | F_CMD_ACCESS, 0, ~0, D_BDW_PLUS,
>> + NULL, NULL);
>> + MMIO_F(RING_REG(GEN8_BSD2_RING_BASE), 4, F_RO | F_CMD_ACCESS, 0,
>> + ~0LL, D_BDW_PLUS, NULL, NULL);
>> #undef RING_REG
>>
>> #define RING_REG(base) (base + 0x244)
>> - MMIO_RING_D(RING_REG, D_BDW_PLUS);
>> - MMIO_D(RING_REG(GEN8_BSD2_RING_BASE), D_BDW_PLUS);
>> + MMIO_RING_DFH(RING_REG, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(RING_REG(GEN8_BSD2_RING_BASE), D_BDW_PLUS, F_CMD_ACCESS,
>> + NULL, NULL);
>> #undef RING_REG
>>
>> #define RING_REG(base) (base + 0x370)
>> @@ -2465,8 +2498,8 @@ static int init_broadwell_mmio_info(struct intel_gvt *gvt)
>> MMIO_F(RING_REG(GEN8_BSD2_RING_BASE), 32, 0, 0, 0, D_BDW_PLUS, NULL, NULL);
>> #undef RING_REG
>>
>> - MMIO_RING_GM(RING_HWS_PGA, D_BDW_PLUS, NULL, NULL);
>> - MMIO_GM(0x1c080, D_BDW_PLUS, NULL, NULL);
>> + MMIO_RING_GM_RDR(RING_HWS_PGA, D_BDW_PLUS, NULL, NULL);
>> + MMIO_GM_RDR(RING_HWS_PGA(GEN8_BSD2_RING_BASE), D_BDW_PLUS, NULL, NULL);
>>
>> MMIO_DFH(HDC_CHICKEN0, D_BDW_PLUS, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>>
>> @@ -2487,15 +2520,17 @@ static int init_broadwell_mmio_info(struct intel_gvt *gvt)
>> MMIO_D(GEN8_EU_DISABLE2, D_BDW_PLUS);
>>
>> MMIO_D(0xfdc, D_BDW_PLUS);
>> - MMIO_DFH(GEN8_ROW_CHICKEN, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>> - MMIO_D(GEN7_ROW_CHICKEN2, D_BDW_PLUS);
>> - MMIO_D(GEN8_UCGCTL6, D_BDW_PLUS);
>> + MMIO_DFH(GEN8_ROW_CHICKEN, D_BDW_PLUS, F_MODE_MASK | F_CMD_ACCESS,
>> + NULL, NULL);
>> + MMIO_DFH(GEN7_ROW_CHICKEN2, D_BDW_PLUS, F_MODE_MASK | F_CMD_ACCESS,
>> + NULL, NULL);
>> + MMIO_DFH(GEN8_UCGCTL6, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>>
>> - MMIO_D(0xb1f0, D_BDW);
>> - MMIO_D(0xb1c0, D_BDW);
>> + MMIO_DFH(0xb1f0, D_BDW, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0xb1c0, D_BDW, F_CMD_ACCESS, NULL, NULL);
>> MMIO_DFH(GEN8_L3SQCREG4, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>> - MMIO_D(0xb100, D_BDW);
>> - MMIO_D(0xb10c, D_BDW);
>> + MMIO_DFH(0xb100, D_BDW, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0xb10c, D_BDW, F_CMD_ACCESS, NULL, NULL);
>> MMIO_D(0xb110, D_BDW);
>>
>> MMIO_F(0x24d0, 48, F_CMD_ACCESS, 0, 0, D_BDW_PLUS,
>> @@ -2505,10 +2540,10 @@ static int init_broadwell_mmio_info(struct intel_gvt *gvt)
>> MMIO_D(0x44484, D_BDW_PLUS);
>> MMIO_D(0x4448c, D_BDW_PLUS);
>>
>> - MMIO_D(0x83a4, D_BDW);
>> + MMIO_DFH(0x83a4, D_BDW, F_CMD_ACCESS, NULL, NULL);
>> MMIO_D(GEN8_L3_LRA_1_GPGPU, D_BDW_PLUS);
>>
>> - MMIO_D(0x8430, D_BDW);
>> + MMIO_DFH(0x8430, D_BDW, F_CMD_ACCESS, NULL, NULL);
>>
>> MMIO_D(0x110000, D_BDW_PLUS);
>>
>> @@ -2520,10 +2555,19 @@ static int init_broadwell_mmio_info(struct intel_gvt *gvt)
>> MMIO_DFH(0xe194, D_BDW_PLUS, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>> MMIO_DFH(0xe188, D_BDW_PLUS, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>> MMIO_DFH(HALF_SLICE_CHICKEN2, D_BDW_PLUS, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>> - MMIO_DFH(0x2580, D_BDW_PLUS, F_MODE_MASK, NULL, NULL);
>> -
>> - MMIO_D(0x2248, D_BDW);
>> -
>> + MMIO_DFH(0x2580, D_BDW_PLUS, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>> +
>> + MMIO_DFH(0x2248, D_BDW, F_CMD_ACCESS, NULL, NULL);
>> +
>> + MMIO_DFH(0xe220, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0xe230, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0xe240, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0xe260, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0xe270, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0xe280, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0xe2a0, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0xe2b0, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0xe2c0, D_BDW_PLUS, F_CMD_ACCESS, NULL, NULL);
>> return 0;
>> }
>>
>> @@ -2704,16 +2748,16 @@ static int init_skl_mmio_info(struct intel_gvt *gvt)
>> MMIO_F(0xb020, 0x80, F_CMD_ACCESS, 0, 0, D_SKL, NULL, NULL);
>>
>> MMIO_D(0xd08, D_SKL);
>> - MMIO_D(0x20e0, D_SKL);
>> - MMIO_D(0x20ec, D_SKL);
>> + MMIO_DFH(0x20e0, D_SKL, F_MODE_MASK, NULL, NULL);
>> + MMIO_DFH(0x20ec, D_SKL, F_MODE_MASK | F_CMD_ACCESS, NULL, NULL);
>>
>> /* TRTT */
>> - MMIO_D(0x4de0, D_SKL);
>> - MMIO_D(0x4de4, D_SKL);
>> - MMIO_D(0x4de8, D_SKL);
>> - MMIO_D(0x4dec, D_SKL);
>> - MMIO_D(0x4df0, D_SKL);
>> - MMIO_DH(0x4df4, D_SKL, NULL, gen9_trtte_write);
>> + MMIO_DFH(0x4de0, D_SKL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x4de4, D_SKL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x4de8, D_SKL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x4dec, D_SKL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x4df0, D_SKL, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(0x4df4, D_SKL, F_CMD_ACCESS, NULL, gen9_trtte_write);
>> MMIO_DH(0x4dfc, D_SKL, NULL, gen9_trtt_chicken_write);
>>
>> MMIO_D(0x45008, D_SKL);
>> @@ -2737,7 +2781,7 @@ static int init_skl_mmio_info(struct intel_gvt *gvt)
>> MMIO_D(0x65f08, D_SKL);
>> MMIO_D(0x320f0, D_SKL);
>>
>> - MMIO_D(_REG_VCS2_EXCC, D_SKL);
>> + MMIO_DFH(_REG_VCS2_EXCC, D_SKL, F_CMD_ACCESS, NULL, NULL);
>> MMIO_D(0x70034, D_SKL);
>> MMIO_D(0x71034, D_SKL);
>> MMIO_D(0x72034, D_SKL);
>> @@ -2750,7 +2794,9 @@ static int init_skl_mmio_info(struct intel_gvt *gvt)
>> MMIO_D(_PLANE_KEYMSK_1(PIPE_C), D_SKL);
>>
>> MMIO_D(0x44500, D_SKL);
>> - MMIO_D(GEN9_CSFE_CHICKEN1_RCS, D_SKL_PLUS);
>> + MMIO_DFH(GEN9_CSFE_CHICKEN1_RCS, D_SKL_PLUS, F_CMD_ACCESS, NULL, NULL);
>> + MMIO_DFH(GEN8_HDC_CHICKEN1, D_SKL, F_MODE_MASK | F_CMD_ACCESS,
>> + NULL, NULL);
>> return 0;
>> }
>>
>> --
>> 1.9.1
>>
>> _______________________________________________
>> intel-gvt-dev mailing list
>> intel-gvt-dev at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gvt-dev
More information about the intel-gvt-dev
mailing list