[PATCH] drm/i915: Disable GPU resets for 915g (earliest gen3 desktop)

[PATCH] drm/i915: Disable GPU resets for 915g (earliest gen3 desktop)

[Chris Wilson]

The CI farm reports that trying to write to the PCI config (GDRST: 0xc0)
results in an immediate and silent reboot on Grantsdale (i915g). Until
that is resolved, stop killing the machine!

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101852
Fixes: 59ea90543f57 ("drm/i915: Implement GPU reset for 915/945")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.co
---
 drivers/gpu/drm/i915/intel_uncore.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index deb4430541cf..452ea6cc8111 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -1680,7 +1680,8 @@ static reset_func intel_get_gpu_reset(struct drm_i915_private *dev_priv)
 		return g4x_do_reset;
 	else if (IS_G33(dev_priv) || IS_PINEVIEW(dev_priv))
 		return g33_do_reset;
-	else if (INTEL_INFO(dev_priv)->gen >= 3)
+	else if (INTEL_INFO(dev_priv)->gen >= 3 &&
+		 INTEL_INFO(dev_priv)->platform != INTEL_I915G)
 		return i915_do_reset;
 	else
 		return NULL;
-- 
2.13.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for drm/i915: Disable GPU resets for 915g (earliest gen3 desktop)

[Patchwork]

== Series Details ==

Series: drm/i915: Disable GPU resets for 915g (earliest gen3 desktop)
URL   : https://patchwork.freedesktop.org/series/27785/
State : success

== Summary ==

Series 27785v1 drm/i915: Disable GPU resets for 915g (earliest gen3 desktop)
https://patchwork.freedesktop.org/api/1.0/series/27785/revisions/1/mbox/

Test kms_force_connector_basic:
        Subgroup force-connector-state:
                pass       -> SKIP       (fi-ivb-3520m) fdo#101048 +3
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-b:
                dmesg-warn -> PASS       (fi-byt-j1900) fdo#101705

fdo#101048 https://bugs.freedesktop.org/show_bug.cgi?id=101048
fdo#101705 https://bugs.freedesktop.org/show_bug.cgi?id=101705

fi-bdw-5557u     total:279  pass:268  dwarn:0   dfail:0   fail:0   skip:11  time:440s
fi-bdw-gvtdvm    total:279  pass:265  dwarn:0   dfail:0   fail:0   skip:14  time:439s
fi-blb-e6850     total:279  pass:224  dwarn:1   dfail:0   fail:0   skip:54  time:348s
fi-bsw-n3050     total:279  pass:243  dwarn:0   dfail:0   fail:0   skip:36  time:536s
fi-bxt-j4205     total:279  pass:260  dwarn:0   dfail:0   fail:0   skip:19  time:514s
fi-byt-j1900     total:279  pass:255  dwarn:0   dfail:0   fail:0   skip:24  time:488s
fi-byt-n2820     total:279  pass:250  dwarn:1   dfail:0   fail:0   skip:28  time:484s
fi-glk-2a        total:279  pass:260  dwarn:0   dfail:0   fail:0   skip:19  time:609s
fi-hsw-4770      total:279  pass:263  dwarn:0   dfail:0   fail:0   skip:16  time:438s
fi-hsw-4770r     total:279  pass:263  dwarn:0   dfail:0   fail:0   skip:16  time:413s
fi-ilk-650       total:279  pass:229  dwarn:0   dfail:0   fail:0   skip:50  time:420s
fi-ivb-3520m     total:279  pass:257  dwarn:0   dfail:0   fail:0   skip:22  time:502s
fi-ivb-3770      total:279  pass:261  dwarn:0   dfail:0   fail:0   skip:18  time:473s
fi-kbl-7500u     total:279  pass:261  dwarn:0   dfail:0   fail:0   skip:18  time:462s
fi-kbl-7560u     total:279  pass:269  dwarn:0   dfail:0   fail:0   skip:10  time:572s
fi-kbl-r         total:279  pass:261  dwarn:0   dfail:0   fail:0   skip:18  time:586s
fi-pnv-d510      total:279  pass:222  dwarn:2   dfail:0   fail:0   skip:55  time:572s
fi-skl-6260u     total:279  pass:269  dwarn:0   dfail:0   fail:0   skip:10  time:460s
fi-skl-6700hq    total:279  pass:262  dwarn:0   dfail:0   fail:0   skip:17  time:591s
fi-skl-6700k     total:279  pass:261  dwarn:0   dfail:0   fail:0   skip:18  time:471s
fi-skl-6770hq    total:279  pass:269  dwarn:0   dfail:0   fail:0   skip:10  time:479s
fi-skl-gvtdvm    total:279  pass:266  dwarn:0   dfail:0   fail:0   skip:13  time:437s
fi-skl-x1585l    total:279  pass:268  dwarn:0   dfail:0   fail:0   skip:11  time:475s
fi-snb-2520m     total:279  pass:251  dwarn:0   dfail:0   fail:0   skip:28  time:543s
fi-snb-2600      total:279  pass:249  dwarn:0   dfail:0   fail:1   skip:29  time:406s

2a4f73050a961e1a176d35561e39386da9ea9c67 drm-tip: 2017y-07m-21d-15h-30m-47s UTC integration manifest
e91abaa drm/i915: Disable GPU resets for 915g (earliest gen3 desktop)

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5266/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Disable GPU resets for 915g (earliest gen3 desktop)

[Chris Wilson]

Quoting Chris Wilson (2017-07-24 11:14:13)
> The CI farm reports that trying to write to the PCI config (GDRST: 0xc0)
> results in an immediate and silent reboot on Grantsdale (i915g). Until
> that is resolved, stop killing the machine!
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101852
> Fixes: 59ea90543f57 ("drm/i915: Implement GPU reset for 915/945")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.co

Fwiw, I've booted into an i915gm (i.e. Almador and not Grantsdale), and
reset works there. It may be that the bug is specific to 915g, or it may
be the bug is display configuration dependent, etc. But at the moment,
this issue seems limited to CI's 915g desktop.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Disable GPU resets for 915g (earliest gen3 desktop)

[Daniel Vetter]

On Mon, Jul 24, 2017 at 11:14:13AM +0100, Chris Wilson wrote:
> The CI farm reports that trying to write to the PCI config (GDRST: 0xc0)
> results in an immediate and silent reboot on Grantsdale (i915g). Until
> that is resolved, stop killing the machine!
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101852
> Fixes: 59ea90543f57 ("drm/i915: Implement GPU reset for 915/945")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.co

fwiw Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> ---
>  drivers/gpu/drm/i915/intel_uncore.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
> index deb4430541cf..452ea6cc8111 100644
> --- a/drivers/gpu/drm/i915/intel_uncore.c
> +++ b/drivers/gpu/drm/i915/intel_uncore.c
> @@ -1680,7 +1680,8 @@ static reset_func intel_get_gpu_reset(struct drm_i915_private *dev_priv)
>  		return g4x_do_reset;
>  	else if (IS_G33(dev_priv) || IS_PINEVIEW(dev_priv))
>  		return g33_do_reset;
> -	else if (INTEL_INFO(dev_priv)->gen >= 3)
> +	else if (INTEL_INFO(dev_priv)->gen >= 3 &&
> +		 INTEL_INFO(dev_priv)->platform != INTEL_I915G)
>  		return i915_do_reset;
>  	else
>  		return NULL;
> -- 
> 2.13.3
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Disable GPU resets for 915g (earliest gen3 desktop)

[Chris Wilson]

Quoting Daniel Vetter (2017-07-27 15:36:49)
> On Mon, Jul 24, 2017 at 11:14:13AM +0100, Chris Wilson wrote:
> > The CI farm reports that trying to write to the PCI config (GDRST: 0xc0)
> > results in an immediate and silent reboot on Grantsdale (i915g). Until
> > that is resolved, stop killing the machine!
> > 
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101852
> > Fixes: 59ea90543f57 ("drm/i915: Implement GPU reset for 915/945")
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.co
> 
> fwiw Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

I'll class that as an Ack, I don't think this patch merits anything
other than an Ouch.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Disable GPU resets for 915g (earliest gen3 desktop)

[Chris Wilson]

Quoting Daniel Vetter (2017-07-27 15:36:49)
> On Mon, Jul 24, 2017 at 11:14:13AM +0100, Chris Wilson wrote:
> > The CI farm reports that trying to write to the PCI config (GDRST: 0xc0)
> > results in an immediate and silent reboot on Grantsdale (i915g). Until
> > that is resolved, stop killing the machine!
> > 
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101852
> > Fixes: 59ea90543f57 ("drm/i915: Implement GPU reset for 915/945")
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.co
> 
> fwiw Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

/o\ Put this on hold. Just realised I plugged the wrong machine in.
Let me go find the right tacky white netbook.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Disable GPU resets for 915g (earliest gen3 desktop)

[Chris Wilson]

Quoting Chris Wilson (2017-07-27 17:24:20)
> Quoting Daniel Vetter (2017-07-27 15:36:49)
> > On Mon, Jul 24, 2017 at 11:14:13AM +0100, Chris Wilson wrote:
> > > The CI farm reports that trying to write to the PCI config (GDRST: 0xc0)
> > > results in an immediate and silent reboot on Grantsdale (i915g). Until
> > > that is resolved, stop killing the machine!
> > > 
> > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101852
> > > Fixes: 59ea90543f57 ("drm/i915: Implement GPU reset for 915/945")
> > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.co
> > 
> > fwiw Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> 
> /o\ Put this on hold. Just realised I plugged the wrong machine in.
> Let me go find the right tacky white netbook.

After a night of compiling, 915gm dies. Looking at the chipset spec, the
reset mechanism should work just fine. My guess is that we are failing
to disable the display engine and we get a chipset hang when it tries to
access the disabled mmio block during the reset.

Anyone still have a working 945gm?

Meanwhile time to dig out an old kernel and check if we did get reset
working then.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx