| Message ID | 1469008825-19442-1-git-send-email-tim.gore@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Reviewed-by: Sagar Arun Kamble <sagar.a.kamble@intel.com> On 7/20/2016 3:30 PM, tim.gore@intel.com wrote: > From: Tim Gore <tim.gore@intel.com> > > WaC6DisallowByGfxPause is currently applied unconditionally > but is not required in all revisions. > > v2: extend application of workaround to agree with w/a > database, which differs from the HSD. > > References: HSD#2133391 > Signed-off-by: Tim Gore <tim.gore@intel.com> > --- > drivers/gpu/drm/i915/intel_guc_loader.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c > index 605c696..96b0259 100644 > --- a/drivers/gpu/drm/i915/intel_guc_loader.c > +++ b/drivers/gpu/drm/i915/intel_guc_loader.c > @@ -349,7 +349,9 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv) > } > > /* WaC6DisallowByGfxPause*/ > - I915_WRITE(GEN6_GFXPAUSE, 0x30FFF); > + if (IS_SKL_REVID(dev, 0, SKL_REVID_C0) || > + IS_BXT_REVID(dev, 0, BXT_REVID_B0)) > + I915_WRITE(GEN6_GFXPAUSE, 0x30FFF); > > if (IS_BROXTON(dev)) > I915_WRITE(GEN9LP_GT_PM_CONFIG, GT_DOORBELL_ENABLE);
Tim Gore Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ > -----Original Message----- > From: Patchwork [mailto:patchwork@emeril.freedesktop.org] > Sent: Wednesday, July 20, 2016 11:38 AM > To: Gore, Tim > Cc: intel-gfx@lists.freedesktop.org > Subject: ✗ Ro.CI.BAT: failure for drm/i915:gen9: restrict > WaC6DisallowByGfxPause (rev2) > > == Series Details == > > Series: drm/i915:gen9: restrict WaC6DisallowByGfxPause (rev2) > URL : https://patchwork.freedesktop.org/series/9930/ > State : failure > > == Summary == > > Series 9930v2 drm/i915:gen9: restrict WaC6DisallowByGfxPause > http://patchwork.freedesktop.org/api/1.0/series/9930/revisions/2/mbox > > Test gem_sync: > Subgroup basic-store-each: > pass -> DMESG-FAIL (ro-bdw-i7-5600u) See https://bugs.freedesktop.org/show_bug.cgi?id=96974 > > fi-hsw-i7-4770k total:244 pass:216 dwarn:0 dfail:0 fail:8 skip:20 > fi-kbl-qkkr total:244 pass:179 dwarn:25 dfail:0 fail:12 skip:28 > fi-skl-i5-6260u total:244 pass:224 dwarn:0 dfail:0 fail:8 skip:12 > fi-skl-i7-6700k total:107 pass:84 dwarn:0 dfail:0 fail:0 skip:22 > ro-bdw-i5-5250u total:244 pass:219 dwarn:4 dfail:0 fail:8 skip:13 > ro-bdw-i7-5600u total:244 pass:203 dwarn:0 dfail:1 fail:8 skip:32 > ro-bsw-n3050 total:218 pass:173 dwarn:0 dfail:0 fail:2 skip:42 > ro-byt-n2820 total:244 pass:197 dwarn:0 dfail:0 fail:9 skip:38 > ro-hsw-i3-4010u total:244 pass:212 dwarn:0 dfail:0 fail:8 skip:24 > ro-hsw-i7-4770r total:244 pass:212 dwarn:0 dfail:0 fail:8 skip:24 > ro-ilk-i7-620lm total:244 pass:172 dwarn:0 dfail:0 fail:9 skip:63 > ro-ilk1-i5-650 total:239 pass:172 dwarn:0 dfail:0 fail:9 skip:58 > ro-ivb-i7-3770 total:244 pass:203 dwarn:0 dfail:0 fail:8 skip:33 > ro-skl3-i5-6260u total:244 pass:224 dwarn:0 dfail:0 fail:8 skip:12 > ro-snb-i7-2620M total:244 pass:193 dwarn:0 dfail:0 fail:9 skip:42 > ro-bdw-i7-5557U failed to connect after reboot > > Results at /archive/results/CI_IGT_test/RO_Patchwork_1540/ > > cafe8a2 drm-intel-nightly: 2016y-07m-20d-08h-45m-03s UTC integration > manifest > ea8eae3 drm/i915:gen9: restrict WaC6DisallowByGfxPause
On 21/07/16 13:31, Gore, Tim wrote: >> -----Original Message----- >> From: Patchwork [mailto:patchwork@emeril.freedesktop.org] >> Sent: Wednesday, July 20, 2016 11:38 AM >> To: Gore, Tim >> Cc: intel-gfx@lists.freedesktop.org >> Subject: ✗ Ro.CI.BAT: failure for drm/i915:gen9: restrict >> WaC6DisallowByGfxPause (rev2) >> >> == Series Details == >> >> Series: drm/i915:gen9: restrict WaC6DisallowByGfxPause (rev2) >> URL : https://patchwork.freedesktop.org/series/9930/ >> State : failure >> >> == Summary == >> >> Series 9930v2 drm/i915:gen9: restrict WaC6DisallowByGfxPause >> http://patchwork.freedesktop.org/api/1.0/series/9930/revisions/2/mbox >> >> Test gem_sync: >> Subgroup basic-store-each: >> pass -> DMESG-FAIL (ro-bdw-i7-5600u) > > See https://bugs.freedesktop.org/show_bug.cgi?id=96974 >> >> fi-hsw-i7-4770k total:244 pass:216 dwarn:0 dfail:0 fail:8 skip:20 >> fi-kbl-qkkr total:244 pass:179 dwarn:25 dfail:0 fail:12 skip:28 >> fi-skl-i5-6260u total:244 pass:224 dwarn:0 dfail:0 fail:8 skip:12 >> fi-skl-i7-6700k total:107 pass:84 dwarn:0 dfail:0 fail:0 skip:22 >> ro-bdw-i5-5250u total:244 pass:219 dwarn:4 dfail:0 fail:8 skip:13 >> ro-bdw-i7-5600u total:244 pass:203 dwarn:0 dfail:1 fail:8 skip:32 >> ro-bsw-n3050 total:218 pass:173 dwarn:0 dfail:0 fail:2 skip:42 >> ro-byt-n2820 total:244 pass:197 dwarn:0 dfail:0 fail:9 skip:38 >> ro-hsw-i3-4010u total:244 pass:212 dwarn:0 dfail:0 fail:8 skip:24 >> ro-hsw-i7-4770r total:244 pass:212 dwarn:0 dfail:0 fail:8 skip:24 >> ro-ilk-i7-620lm total:244 pass:172 dwarn:0 dfail:0 fail:9 skip:63 >> ro-ilk1-i5-650 total:239 pass:172 dwarn:0 dfail:0 fail:9 skip:58 >> ro-ivb-i7-3770 total:244 pass:203 dwarn:0 dfail:0 fail:8 skip:33 >> ro-skl3-i5-6260u total:244 pass:224 dwarn:0 dfail:0 fail:8 skip:12 >> ro-snb-i7-2620M total:244 pass:193 dwarn:0 dfail:0 fail:9 skip:42 >> ro-bdw-i7-5557U failed to connect after reboot >> >> Results at /archive/results/CI_IGT_test/RO_Patchwork_1540/ >> >> cafe8a2 drm-intel-nightly: 2016y-07m-20d-08h-45m-03s UTC integration >> manifest >> ea8eae3 drm/i915:gen9: restrict WaC6DisallowByGfxPause Merged to dinq, thanks for the patch and review. Regards, Tvrtko
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c index 605c696..96b0259 100644 --- a/drivers/gpu/drm/i915/intel_guc_loader.c +++ b/drivers/gpu/drm/i915/intel_guc_loader.c @@ -349,7 +349,9 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv) } /* WaC6DisallowByGfxPause*/ - I915_WRITE(GEN6_GFXPAUSE, 0x30FFF); + if (IS_SKL_REVID(dev, 0, SKL_REVID_C0) || + IS_BXT_REVID(dev, 0, BXT_REVID_B0)) + I915_WRITE(GEN6_GFXPAUSE, 0x30FFF); if (IS_BROXTON(dev)) I915_WRITE(GEN9LP_GT_PM_CONFIG, GT_DOORBELL_ENABLE);