Message ID | 1479993439-28900-1-git-send-email-ander.conselvan.de.oliveira@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
> == Series Details == > > Series: drm/i915: Don't sanitize has_decoupled_mmio if platform is not > broxton (rev2) > URL : https://patchwork.freedesktop.org/series/15902/ > State : warning > > == Summary == > > Series 15902v2 drm/i915: Don't sanitize has_decoupled_mmio if platform > is not broxton > https://patchwork.freedesktop.org/api/1.0/series/15902/revisions/2/mbo > x/ > > Test gem_exec_flush: > Subgroup basic-uc-ro-default: > pass -> DMESG-WARN (fi-snb-2520m) *ERROR* Atomic update failure on pipe B Do we have known bug about this on SNB? > fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15 > fi-bsw-n3050 total:244 pass:204 dwarn:0 dfail:0 fail:0 skip:40 > fi-bxt-t5700 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28 > fi-byt-j1900 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28 > fi-byt-n2820 total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32 > fi-hsw-4770 total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 > fi-hsw-4770r total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 > fi-ilk-650 total:244 pass:191 dwarn:0 dfail:0 fail:0 skip:53 > fi-ivb-3520m total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 > fi-ivb-3770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 > fi-kbl-7200u total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 > fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14 > fi-skl-6700hq total:244 pass:223 dwarn:0 dfail:0 fail:0 skip:21 > fi-skl-6700k total:244 pass:222 dwarn:1 dfail:0 fail:0 skip:21 > fi-skl-6770hq total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14 > fi-snb-2520m total:244 pass:211 dwarn:1 dfail:0 fail:0 skip:32 > fi-snb-2600 total:244 pass:211 dwarn:0 dfail:0 fail:0 skip:33 > > 7afee8699bf15b38f2c2cfde4b41d3e448e32c4e drm-tip: 2016y-11m-24d- > 13h-52m-57s UTC integration manifest > 71e5bb9 drm/i915: Don't sanitize has_decoupled_mmio if platform is not > broxton > > == Logs == > > For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3107/ Jani Saarinen Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
On Thu, Nov 24, 2016 at 03:09:30PM +0000, Saarinen, Jani wrote: > > == Series Details == > > > > Series: drm/i915: Don't sanitize has_decoupled_mmio if platform is not > > broxton (rev2) > > URL : https://patchwork.freedesktop.org/series/15902/ > > State : warning > > > > == Summary == > > > > Series 15902v2 drm/i915: Don't sanitize has_decoupled_mmio if platform > > is not broxton > > https://patchwork.freedesktop.org/api/1.0/series/15902/revisions/2/mbo > > x/ > > > > Test gem_exec_flush: > > Subgroup basic-uc-ro-default: > > pass -> DMESG-WARN (fi-snb-2520m) > *ERROR* Atomic update failure on pipe B > Do we have known bug about this on SNB? The bug is there on all platforms. Whether is has been observed on SNB previously, I don't know. > > > fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15 > > fi-bsw-n3050 total:244 pass:204 dwarn:0 dfail:0 fail:0 skip:40 > > fi-bxt-t5700 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28 > > fi-byt-j1900 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28 > > fi-byt-n2820 total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32 > > fi-hsw-4770 total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 > > fi-hsw-4770r total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 > > fi-ilk-650 total:244 pass:191 dwarn:0 dfail:0 fail:0 skip:53 > > fi-ivb-3520m total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 > > fi-ivb-3770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 > > fi-kbl-7200u total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 > > fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14 > > fi-skl-6700hq total:244 pass:223 dwarn:0 dfail:0 fail:0 skip:21 > > fi-skl-6700k total:244 pass:222 dwarn:1 dfail:0 fail:0 skip:21 > > fi-skl-6770hq total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14 > > fi-snb-2520m total:244 pass:211 dwarn:1 dfail:0 fail:0 skip:32 > > fi-snb-2600 total:244 pass:211 dwarn:0 dfail:0 fail:0 skip:33 > > > > 7afee8699bf15b38f2c2cfde4b41d3e448e32c4e drm-tip: 2016y-11m-24d- > > 13h-52m-57s UTC integration manifest > > 71e5bb9 drm/i915: Don't sanitize has_decoupled_mmio if platform is not > > broxton > > > > == Logs == > > > > For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3107/ > > Jani Saarinen > Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo > > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> == Series Details == > > Series: drm/i915: Don't sanitize has_decoupled_mmio if platform is not > broxton (rev2) > URL : https://patchwork.freedesktop.org/series/15902/ > State : warning > > == Summary == > > Series 15902v2 drm/i915: Don't sanitize has_decoupled_mmio if platform > is not broxton > https://patchwork.freedesktop.org/api/1.0/series/15902/revisions/2/mbo > x/ > > Test gem_exec_flush: > Subgroup basic-uc-ro-default: > pass -> DMESG-WARN (fi-snb-2520m) *ERROR* Atomic update failure on pipe B Do we have known bug about this on SNB? > fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15 > fi-bsw-n3050 total:244 pass:204 dwarn:0 dfail:0 fail:0 skip:40 > fi-bxt-t5700 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28 > fi-byt-j1900 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28 > fi-byt-n2820 total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32 > fi-hsw-4770 total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 > fi-hsw-4770r total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 > fi-ilk-650 total:244 pass:191 dwarn:0 dfail:0 fail:0 skip:53 > fi-ivb-3520m total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 > fi-ivb-3770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 > fi-kbl-7200u total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 > fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14 > fi-skl-6700hq total:244 pass:223 dwarn:0 dfail:0 fail:0 skip:21 > fi-skl-6700k total:244 pass:222 dwarn:1 dfail:0 fail:0 skip:21 > fi-skl-6770hq total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14 > fi-snb-2520m total:244 pass:211 dwarn:1 dfail:0 fail:0 skip:32 > fi-snb-2600 total:244 pass:211 dwarn:0 dfail:0 fail:0 skip:33 > > 7afee8699bf15b38f2c2cfde4b41d3e448e32c4e drm-tip: 2016y-11m-24d- > 13h-52m-57s UTC integration manifest > 71e5bb9 drm/i915: Don't sanitize has_decoupled_mmio if platform is not > broxton > > == Logs == > > For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3107/ Jani Saarinen Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
On to, 2016-11-24 at 15:17 +0200, Ander Conselvan de Oliveira wrote: > The check in __intel_uncore_early_sanitize() to disable decoupled mmio > would disable it for every platform that is not broxton. While that's > not a problem now since only broxton supports that, simply setting > .has_decoupled_mmio in a new platform's device info wouldn't suffice. So > avoid future confusion and change the workaround to only change the > value of has_decoupled_mmio for broxton. > > Cc: Praveen Paneri <praveen.paneri@intel.com> > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > Cc: Imre Deak <imre.deak@intel.com> > Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Imre Deak <imre.deak@intel.com> > --- > drivers/gpu/drm/i915/i915_drv.h | 1 + > drivers/gpu/drm/i915/intel_uncore.c | 3 +-- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 01f5067..5a0b3e2 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -2579,6 +2579,7 @@ intel_info(const struct drm_i915_private *dev_priv) > #define BXT_REVID_A0 0x0 > #define BXT_REVID_A1 0x1 > #define BXT_REVID_B0 0x3 > +#define BXT_REVID_B_LAST 0x8 > #define BXT_REVID_C0 0x9 > > #define IS_BXT_REVID(dev_priv, since, until) \ > diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c > index d7be0d9..c861509 100644 > --- a/drivers/gpu/drm/i915/intel_uncore.c > +++ b/drivers/gpu/drm/i915/intel_uncore.c > @@ -421,8 +421,7 @@ static void __intel_uncore_early_sanitize(struct drm_i915_private *dev_priv, > GT_FIFO_CTL_RC6_POLICY_STALL); > } > > - /* Enable Decoupled MMIO only on BXT C stepping onwards */ > - if (!IS_BXT_REVID(dev_priv, BXT_REVID_C0, REVID_FOREVER)) > + if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_B_LAST) > info->has_decoupled_mmio = false; > > intel_uncore_forcewake_reset(dev_priv, restore_forcewake);
Hi Ander, [auto build test ERROR on drm-intel/for-linux-next] [also build test ERROR on next-20161124] [cannot apply to v4.9-rc6] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Ander-Conselvan-de-Oliveira/drm-i915-Don-t-sanitize-has_decoupled_mmio-if-platform-is-not-broxton/20161125-114633 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: x86_64-randconfig-x012-201647 (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All errors (new ones prefixed by >>): drivers/gpu/drm/i915/intel_uncore.c: In function '__intel_uncore_early_sanitize': >> drivers/gpu/drm/i915/intel_uncore.c:425:3: error: expected ')' before 'info' info->has_decoupled_mmio = false; ^~~~ >> drivers/gpu/drm/i915/intel_uncore.c:428:1: error: expected expression before '}' token } ^ drivers/gpu/drm/i915/intel_uncore.c:405:28: warning: unused variable 'info' [-Wunused-variable] struct intel_device_info *info = mkwrite_device_info(dev_priv); ^~~~ vim +425 drivers/gpu/drm/i915/intel_uncore.c a04f90a33 Deepak S 2015-04-16 419 __raw_i915_read32(dev_priv, GTFIFOCTL) | a04f90a33 Deepak S 2015-04-16 420 GT_FIFO_CTL_BLOCK_ALL_POLICY_STALL | a04f90a33 Deepak S 2015-04-16 421 GT_FIFO_CTL_RC6_POLICY_STALL); a04f90a33 Deepak S 2015-04-16 422 } a04f90a33 Deepak S 2015-04-16 423 484a2eb87 Ander Conselvan de Oliveira 2016-11-24 424 if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_B_LAST) 85ee17ebe Praveen Paneri 2016-11-15 @425 info->has_decoupled_mmio = false; 85ee17ebe Praveen Paneri 2016-11-15 426 dc97997a2 Chris Wilson 2016-05-10 427 intel_uncore_forcewake_reset(dev_priv, restore_forcewake); 521198a2e Mika Kuoppala 2013-08-23 @428 } 521198a2e Mika Kuoppala 2013-08-23 429 dc97997a2 Chris Wilson 2016-05-10 430 void intel_uncore_early_sanitize(struct drm_i915_private *dev_priv, dc97997a2 Chris Wilson 2016-05-10 431 bool restore_forcewake) :::::: The code at line 425 was first introduced by commit :::::: 85ee17ebeedd1af0dccd98f82ab4e644e29d84c0 drm/i915/bxt: Broxton decoupled MMIO :::::: TO: Praveen Paneri <praveen.paneri@intel.com> :::::: CC: Tvrtko Ursulin <tvrtko.ursulin@intel.com> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation
Hi Ander,
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20161124]
[cannot apply to v4.9-rc6]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Ander-Conselvan-de-Oliveira/drm-i915-Don-t-sanitize-has_decoupled_mmio-if-platform-is-not-broxton/20161125-114633
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-randconfig-x000-201647 (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
All errors (new ones prefixed by >>):
drivers/gpu/drm/i915/intel_uncore.c: In function '__intel_uncore_early_sanitize':
drivers/gpu/drm/i915/intel_uncore.c:425:3: error: expected ')' before 'info'
info->has_decoupled_mmio = false;
^~~~
drivers/gpu/drm/i915/intel_uncore.c:428:1: error: expected expression before '}' token
}
^
>> drivers/gpu/drm/i915/intel_uncore.c:405:28: error: unused variable 'info' [-Werror=unused-variable]
struct intel_device_info *info = mkwrite_device_info(dev_priv);
^~~~
cc1: all warnings being treated as errors
vim +/info +405 drivers/gpu/drm/i915/intel_uncore.c
8ac3e1bb7 Mika Kuoppala 2015-12-15 399 return false;
8ac3e1bb7 Mika Kuoppala 2015-12-15 400 }
8ac3e1bb7 Mika Kuoppala 2015-12-15 401
dc97997a2 Chris Wilson 2016-05-10 402 static void __intel_uncore_early_sanitize(struct drm_i915_private *dev_priv,
f9b3927af Mika Kuoppala 2015-01-28 403 bool restore_forcewake)
f9b3927af Mika Kuoppala 2015-01-28 404 {
85ee17ebe Praveen Paneri 2016-11-15 @405 struct intel_device_info *info = mkwrite_device_info(dev_priv);
85ee17ebe Praveen Paneri 2016-11-15 406
8a47eb198 Mika Kuoppala 2015-12-15 407 /* clear out unclaimed reg detection bit */
8a47eb198 Mika Kuoppala 2015-12-15 408 if (check_for_unclaimed_mmio(dev_priv))
8a47eb198 Mika Kuoppala 2015-12-15 409 DRM_DEBUG("unclaimed mmio detected on uncore init, clearing\n");
907b28c56 Chris Wilson 2013-07-19 410
97058870e Ville Syrjälä 2013-12-03 411 /* clear out old GT FIFO errors */
dc97997a2 Chris Wilson 2016-05-10 412 if (IS_GEN6(dev_priv) || IS_GEN7(dev_priv))
97058870e Ville Syrjälä 2013-12-03 413 __raw_i915_write32(dev_priv, GTFIFODBG,
97058870e Ville Syrjälä 2013-12-03 414 __raw_i915_read32(dev_priv, GTFIFODBG));
97058870e Ville Syrjälä 2013-12-03 415
a04f90a33 Deepak S 2015-04-16 416 /* WaDisableShadowRegForCpd:chv */
dc97997a2 Chris Wilson 2016-05-10 417 if (IS_CHERRYVIEW(dev_priv)) {
a04f90a33 Deepak S 2015-04-16 418 __raw_i915_write32(dev_priv, GTFIFOCTL,
a04f90a33 Deepak S 2015-04-16 419 __raw_i915_read32(dev_priv, GTFIFOCTL) |
a04f90a33 Deepak S 2015-04-16 420 GT_FIFO_CTL_BLOCK_ALL_POLICY_STALL |
a04f90a33 Deepak S 2015-04-16 421 GT_FIFO_CTL_RC6_POLICY_STALL);
a04f90a33 Deepak S 2015-04-16 422 }
a04f90a33 Deepak S 2015-04-16 423
484a2eb87 Ander Conselvan de Oliveira 2016-11-24 424 if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_B_LAST)
85ee17ebe Praveen Paneri 2016-11-15 @425 info->has_decoupled_mmio = false;
85ee17ebe Praveen Paneri 2016-11-15 426
dc97997a2 Chris Wilson 2016-05-10 427 intel_uncore_forcewake_reset(dev_priv, restore_forcewake);
521198a2e Mika Kuoppala 2013-08-23 428 }
:::::: The code at line 405 was first introduced by commit
:::::: 85ee17ebeedd1af0dccd98f82ab4e644e29d84c0 drm/i915/bxt: Broxton decoupled MMIO
:::::: TO: Praveen Paneri <praveen.paneri@intel.com>
:::::: CC: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
On Thu, 2016-11-24 at 17:31 +0200, Ville Syrjälä wrote: > On Thu, Nov 24, 2016 at 03:09:30PM +0000, Saarinen, Jani wrote: > > > > > > > > == Series Details == > > > > > > Series: drm/i915: Don't sanitize has_decoupled_mmio if platform is not > > > broxton (rev2) > > > URL : https://patchwork.freedesktop.org/series/15902/ > > > State : warning > > > > > > == Summary == > > > > > > Series 15902v2 drm/i915: Don't sanitize has_decoupled_mmio if platform > > > is not broxton > > > https://patchwork.freedesktop.org/api/1.0/series/15902/revisions/2/mbo > > > x/ > > > > > > Test gem_exec_flush: > > > Subgroup basic-uc-ro-default: > > > pass -> DMESG-WARN (fi-snb-2520m) > > *ERROR* Atomic update failure on pipe B > > Do we have known bug about this on SNB? > The bug is there on all platforms. Whether is has been observed on SNB > previously, I don't know. Pushed, thanks for reviewing. Ander
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 01f5067..5a0b3e2 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2579,6 +2579,7 @@ intel_info(const struct drm_i915_private *dev_priv) #define BXT_REVID_A0 0x0 #define BXT_REVID_A1 0x1 #define BXT_REVID_B0 0x3 +#define BXT_REVID_B_LAST 0x8 #define BXT_REVID_C0 0x9 #define IS_BXT_REVID(dev_priv, since, until) \ diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index d7be0d9..c861509 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -421,8 +421,7 @@ static void __intel_uncore_early_sanitize(struct drm_i915_private *dev_priv, GT_FIFO_CTL_RC6_POLICY_STALL); } - /* Enable Decoupled MMIO only on BXT C stepping onwards */ - if (!IS_BXT_REVID(dev_priv, BXT_REVID_C0, REVID_FOREVER)) + if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_B_LAST) info->has_decoupled_mmio = false; intel_uncore_forcewake_reset(dev_priv, restore_forcewake);
The check in __intel_uncore_early_sanitize() to disable decoupled mmio would disable it for every platform that is not broxton. While that's not a problem now since only broxton supports that, simply setting .has_decoupled_mmio in a new platform's device info wouldn't suffice. So avoid future confusion and change the workaround to only change the value of has_decoupled_mmio for broxton. Cc: Praveen Paneri <praveen.paneri@intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Imre Deak <imre.deak@intel.com> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> --- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_uncore.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-)