| Message ID | 1479373363-16528-1-git-send-email-tvrtko.ursulin@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Nov 17, 2016 at 09:02:43AM +0000, Tvrtko Ursulin wrote: > From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > > Commit 0dd356bb6ff5 ("drm/i915: Eliminate Gen9 special case") > accidentaly dropped a MMIO range between 0xc000 to 0xcfff out > of the blitter forcewake domain. Fix it. > > Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > Fixes: 0dd356bb6ff5 ("drm/i915: Eliminate Gen9 special case") > Reported-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > --- > drivers/gpu/drm/i915/intel_uncore.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c > index e953303bff54..a0944dde7c41 100644 > --- a/drivers/gpu/drm/i915/intel_uncore.c > +++ b/drivers/gpu/drm/i915/intel_uncore.c > @@ -789,7 +789,7 @@ static const struct intel_forcewake_range __gen9_fw_ranges[] = { > GEN_FW_RANGE(0x9400, 0x97ff, FORCEWAKE_RENDER | FORCEWAKE_MEDIA), > GEN_FW_RANGE(0x9800, 0xafff, FORCEWAKE_BLITTER), > GEN_FW_RANGE(0xb000, 0xb47f, FORCEWAKE_RENDER), > - GEN_FW_RANGE(0xb480, 0xbfff, FORCEWAKE_BLITTER), > + GEN_FW_RANGE(0xb480, 0xcfff, FORCEWAKE_BLITTER), > GEN_FW_RANGE(0xd000, 0xd7ff, FORCEWAKE_MEDIA), The table should be watertight... Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> So, possible to test in intel_fw_table_check()? -Chris
On 17/11/2016 10:16, Patchwork wrote: > == Series Details == > > Series: drm/i915: Fix gen9 forcewake range table > URL : https://patchwork.freedesktop.org/series/15474/ > State : success > > == Summary == > > Series 15474v1 drm/i915: Fix gen9 forcewake range table > https://patchwork.freedesktop.org/api/1.0/series/15474/revisions/1/mbox/ > > Test drv_module_reload_basic: > dmesg-warn -> PASS (fi-skl-6770hq) > Test kms_flip: > Subgroup basic-flip-vs-wf_vblank: > fail -> PASS (fi-ivb-3770) > > 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-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:212 dwarn:0 dfail:0 fail:0 skip:32 > fi-snb-2600 total:244 pass:211 dwarn:0 dfail:0 fail:0 skip:33 > > ca255285dca0f265f25214078650b7948b03fe21 drm-intel-nightly: 2016y-11m-17d-08h-59m-51s UTC integration manifest > 0aead1d drm/i915: Fix gen9 forcewake range table Merged to dinq, thanks for the review! Regards, Tvrtko
On 17/11/2016 12:50, Chris Wilson wrote: > On Thu, Nov 17, 2016 at 09:02:43AM +0000, Tvrtko Ursulin wrote: >> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> >> >> Commit 0dd356bb6ff5 ("drm/i915: Eliminate Gen9 special case") >> accidentaly dropped a MMIO range between 0xc000 to 0xcfff out >> of the blitter forcewake domain. Fix it. >> >> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> >> Fixes: 0dd356bb6ff5 ("drm/i915: Eliminate Gen9 special case") >> Reported-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> >> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> >> Cc: Chris Wilson <chris@chris-wilson.co.uk> >> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> >> --- >> drivers/gpu/drm/i915/intel_uncore.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c >> index e953303bff54..a0944dde7c41 100644 >> --- a/drivers/gpu/drm/i915/intel_uncore.c >> +++ b/drivers/gpu/drm/i915/intel_uncore.c >> @@ -789,7 +789,7 @@ static const struct intel_forcewake_range __gen9_fw_ranges[] = { >> GEN_FW_RANGE(0x9400, 0x97ff, FORCEWAKE_RENDER | FORCEWAKE_MEDIA), >> GEN_FW_RANGE(0x9800, 0xafff, FORCEWAKE_BLITTER), >> GEN_FW_RANGE(0xb000, 0xb47f, FORCEWAKE_RENDER), >> - GEN_FW_RANGE(0xb480, 0xbfff, FORCEWAKE_BLITTER), >> + GEN_FW_RANGE(0xb480, 0xcfff, FORCEWAKE_BLITTER), >> GEN_FW_RANGE(0xd000, 0xd7ff, FORCEWAKE_MEDIA), > > The table should be watertight... > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> > > So, possible to test in intel_fw_table_check()? Yep, a good idea, essential even. I've sent a separate patch for that. Regards, Tvrtko
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index e953303bff54..a0944dde7c41 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -789,7 +789,7 @@ static const struct intel_forcewake_range __gen9_fw_ranges[] = { GEN_FW_RANGE(0x9400, 0x97ff, FORCEWAKE_RENDER | FORCEWAKE_MEDIA), GEN_FW_RANGE(0x9800, 0xafff, FORCEWAKE_BLITTER), GEN_FW_RANGE(0xb000, 0xb47f, FORCEWAKE_RENDER), - GEN_FW_RANGE(0xb480, 0xbfff, FORCEWAKE_BLITTER), + GEN_FW_RANGE(0xb480, 0xcfff, FORCEWAKE_BLITTER), GEN_FW_RANGE(0xd000, 0xd7ff, FORCEWAKE_MEDIA), GEN_FW_RANGE(0xd800, 0xdfff, FORCEWAKE_BLITTER), GEN_FW_RANGE(0xe000, 0xe8ff, FORCEWAKE_RENDER),