[Intel-gfx] [PATCH] drm/i915/gvt: Remove one duplicated MMIO

[Imre Deak]

On Wed, Aug 23, 2017 at 03:12:01PM +0800, Zhenyu Wang wrote:
> On 2017.08.23 13:23:10 +0800, Jian Jun Chen wrote:
> > Remove one duplicated MMIO GEN6_PCODE_MAILBOX. Duplicated MMIO will
> > cause host GVT-g initialization failure.
> > 
> > Fixes: 9c3a16c887f0 ("drm/i915/hsw+: Add support for multiple power well regs")
> > Signed-off-by: Jian Jun Chen <jian.jun.chen at intel.com>
> > ---
> 
> oh, as this is a regression that cause gvt init fail, cc Imre, looks
> that extra line was not in original patch but might be added during
> push. As this is pushed for 4.14, I will send this fix later.
> 
> thanks
> 
> >  drivers/gpu/drm/i915/gvt/handlers.c | 1 -
> >  1 file changed, 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
> > index 3502a59166ff..2294466dd415 100644
> > --- a/drivers/gpu/drm/i915/gvt/handlers.c
> > +++ b/drivers/gpu/drm/i915/gvt/handlers.c
> > @@ -2659,7 +2659,6 @@ static int init_skl_mmio_info(struct intel_gvt *gvt)
> >  	MMIO_D(HSW_PWR_WELL_CTL_BIOS(SKL_DISP_PW_MISC_IO), D_SKL_PLUS);
> >  	MMIO_DH(HSW_PWR_WELL_CTL_DRIVER(SKL_DISP_PW_MISC_IO), D_SKL_PLUS, NULL,
> >  		skl_power_well_ctl_write);
> > -	MMIO_DH(GEN6_PCODE_MAILBOX, D_SKL_PLUS, NULL, mailbox_write);

Oops, not sure how this happened. This line was part of the context but
was removed by the time the patch was actually pushed. Maybe git am -3
resolved it in this way?

Thanks for catching it:
Acked-by: Imre Deak <imre.deak at intel.com>

> >  
> >  	MMIO_D(0xa210, D_SKL_PLUS);
> >  	MMIO_D(GEN9_MEDIA_PG_IDLE_HYSTERESIS, D_SKL_PLUS);
> > -- 
> > 2.13.0
> > 
> > _______________________________________________
> > 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