Skip to contentSkip to conversation

drm/i915/gvt: Remove one duplicated MMIO

PATCH Zhenyu Wang 2 participants 2 messages Aug 23, 2017 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 6 lines · Jian Jun Chen

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")

---

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

Quoted 22 lines
 drivers/gpu/drm/i915/gvt/handlers.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/i915/gvt/handlers.c +0 -1
index 3502a59166ff..2294466dd415 100644
@@ -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);
 
 	MMIO_D(0xa210, D_SKL_PLUS);
 	MMIO_D(GEN9_MEDIA_PG_IDLE_HYSTERESIS, D_SKL_PLUS);
Signature · 6 lines
2.13.0

_______________________________________________
intel-gvt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gvt-dev
Signature · 3 lines
Open Source Technology Center, Intel ltd.

$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Acked-by
#2 lore raw
Quoted 17 lines · Zhenyu Wang
Quoted 6 lines · Jian Jun Chen

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")

---

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

Quoted 3 lines
 drivers/gpu/drm/i915/gvt/handlers.c | 1 -
 1 file changed, 1 deletion(-)
Quoted 9 lines

drivers/gpu/drm/i915/gvt/handlers.c static int init_skl_mmio_info(struct intel_gvt *gvt) · line 2662

Quoted 9 lines
drivers/gpu/drm/i915/gvt/handlers.c +0 -1
index 3502a59166ff..2294466dd415 100644
@@ -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:

Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/i915/gvt/handlers.c +0 -0
 	MMIO_D(0xa210, D_SKL_PLUS);
 	MMIO_D(GEN9_MEDIA_PG_IDLE_HYSTERESIS, D_SKL_PLUS);
Signature · 1 line
2.13.0
Quoted 9 lines
Quoted 4 lines

_______________________________________________
intel-gvt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gvt-dev

Signature · 3 lines
Open Source Technology Center, Intel ltd.

$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx