[PATCH] drm/i915/gvt: remove 2 duplicate mmio definition in gvt emulation

[Li, Weinan Z]

Sure, will refresh these 2 patches soon.

> -----Original Message-----
> From: Zhenyu Wang [mailto:zhenyuw at linux.intel.com]
> Sent: Thursday, February 23, 2017 6:15 PM
> To: Li, Weinan Z <weinan.z.li at intel.com>
> Cc: intel-gvt-dev at lists.freedesktop.org; Zhang, Pei <pei.zhang at intel.com>
> Subject: Re: [PATCH] drm/i915/gvt: remove 2 duplicate mmio definition in gvt
> emulation
> 
> On 2017.02.23 16:32:10 +0800, Weinan Li wrote:
> > 2 duplicate mmio definition 0x20c0 and 0x138124 removed.
> >
> 
> Already dropped previous two commits that caused error.
> Could you refresh against current gvt-staging?
> 
> > Signed-off-by: Weinan Li <weinan.z.li at intel.com>
> > Signed-off-by: Pei Zhang <pei.zhang at intel.com>
> > ---
> >  drivers/gpu/drm/i915/gvt/handlers.c | 6 ++----
> >  1 file changed, 2 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/gvt/handlers.c
> > b/drivers/gpu/drm/i915/gvt/handlers.c
> > index d4c57e2..c630077 100644
> > --- a/drivers/gpu/drm/i915/gvt/handlers.c
> > +++ b/drivers/gpu/drm/i915/gvt/handlers.c
> > @@ -1578,7 +1578,7 @@ static int init_generic_mmio_info(struct
> > intel_gvt *gvt)  #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_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, @@ -2194,7
> > +2194,7 @@ static int init_generic_mmio_info(struct intel_gvt *gvt)
> >
> >  	MMIO_F(0x4f000, 0x90, 0, 0, 0, D_ALL, NULL, NULL);
> >
> > -	MMIO_D(GEN6_PCODE_MAILBOX, D_PRE_SKL);
> > +	MMIO_D(GEN6_PCODE_MAILBOX, D_PRE_BDW);
> >  	MMIO_D(GEN6_PCODE_DATA, D_ALL);
> >  	MMIO_D(0x13812c, D_ALL);
> >  	MMIO_DH(GEN7_ERR_INT, D_ALL, NULL, NULL); @@ -2274,7
> +2274,6 @@
> > static int init_generic_mmio_info(struct intel_gvt *gvt)
> >
> >  	MMIO_D(0x44070, D_ALL);
> >  	MMIO_DFH(0x215c, D_HSW_PLUS, F_CMD_ACCESS, NULL, NULL);
> > -	MMIO_DFH(0x20c0, D_HSW_PLUS, F_CMD_ACCESS, NULL, NULL);
> >  	MMIO_DFH(0x2178, D_ALL, F_CMD_ACCESS, NULL, NULL);
> >  	MMIO_DFH(0x217c, D_ALL, F_CMD_ACCESS, NULL, NULL);
> >  	MMIO_DFH(0x12178, D_ALL, F_CMD_ACCESS, NULL, NULL); @@ -
> 2538,7
> > +2537,6 @@ static int init_skl_mmio_info(struct intel_gvt *gvt)
> >  	MMIO_D(HSW_PWR_WELL_BIOS, D_SKL);
> >  	MMIO_DH(HSW_PWR_WELL_DRIVER, D_SKL, NULL,
> skl_power_well_ctl_write);
> >
> > -	MMIO_DH(GEN6_PCODE_MAILBOX, D_SKL, NULL, mailbox_write);
> 
> This removes mailbox handler for SKL, seems not correct.
> 
> >  	MMIO_D(0xa210, D_SKL_PLUS);
> >  	MMIO_D(GEN9_MEDIA_PG_IDLE_HYSTERESIS, D_SKL_PLUS);
> >  	MMIO_D(GEN9_RENDER_PG_IDLE_HYSTERESIS, D_SKL_PLUS);
> > --
> > 1.9.1
> >
> > _______________________________________________
> > intel-gvt-dev mailing list
> > intel-gvt-dev at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gvt-dev
> 
> --
> Open Source Technology Center, Intel ltd.
> 
> $gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827