Re: [Intel-gfx] [PATCH] drm/i915: Don't count semaphore waits towards a stuck ring

2013-06-09 Thread Ben Widawsky
On Fri, Jun 07, 2013 at 09:55:51AM +0100, Chris Wilson wrote: > If we detect a ring is in a valid wait for another, just let it be. > Eventually it will either begin to progress again, or the entire system > will come grinding to a halt and then hangcheck will fire as soon as the > deadlock is dete

Re: [Intel-gfx] [PATCH] drm/i915: prefer VBT modes for SVDO-LVDS over EDID

2013-06-09 Thread Chris Wilson
On Sun, Jun 09, 2013 at 11:28:12PM +0200, Daniel Vetter wrote: > On Sun, Jun 9, 2013 at 11:16 PM, Chris Wilson > wrote: > > On Sun, Jun 09, 2013 at 10:58:38PM +0200, Daniel Vetter wrote: > >> In > >> > >> commit 53d3b4d7778daf15900867336c85d3f8dd70600c > >> Author: Egbert Eich > >> Date: Tue J

Re: [Intel-gfx] [PATCH] drm/i915: Add a hotplug connector property

2013-06-09 Thread Chris Wilson
On Sat, Jun 08, 2013 at 02:34:20PM +0200, Daniel Vetter wrote: > On Sat, Jun 8, 2013 at 9:08 AM, Chris Wilson wrote: > > On Wed, Jun 05, 2013 at 10:59:23PM +0100, Chris Wilson wrote: > >> It is useful for userspace to know when it may be able to skip a forced > >> detection cycle as the connector

Re: [Intel-gfx] [PATCH 3/3] drm/i915: Fix checking of pixel multiplier on SDVOX

2013-06-09 Thread Daniel Vetter
On Sun, Jun 9, 2013 at 11:18 PM, Daniel Vetter wrote: > On Sun, Jun 9, 2013 at 11:01 PM, Chris Wilson > wrote: >> On Sun, Jun 09, 2013 at 09:48:11PM +0200, Daniel Vetter wrote: >>> On Sun, Jun 9, 2013 at 7:23 PM, Chris Wilson >>> wrote: >>> > The pixel multiplier is only stored in SDVOX on i9

Re: [Intel-gfx] [PATCH] drm/i915: prefer VBT modes for SVDO-LVDS over EDID

2013-06-09 Thread Daniel Vetter
On Sun, Jun 9, 2013 at 11:16 PM, Chris Wilson wrote: > On Sun, Jun 09, 2013 at 10:58:38PM +0200, Daniel Vetter wrote: >> In >> >> commit 53d3b4d7778daf15900867336c85d3f8dd70600c >> Author: Egbert Eich >> Date: Tue Jun 4 17:13:21 2013 +0200 >> >> drm/i915/sdvo: Use &intel_sdvo->ddc instead o

Re: [Intel-gfx] [PATCH 3/3] drm/i915: Fix checking of pixel multiplier on SDVOX

2013-06-09 Thread Daniel Vetter
On Sun, Jun 9, 2013 at 11:01 PM, Chris Wilson wrote: > On Sun, Jun 09, 2013 at 09:48:11PM +0200, Daniel Vetter wrote: >> On Sun, Jun 9, 2013 at 7:23 PM, Chris Wilson >> wrote: >> > The pixel multiplier is only stored in SDVOX on i915g/i915gm, so we need >> > to use the value retreived from the c

Re: [Intel-gfx] [PATCH] drm/i915: prefer VBT modes for SVDO-LVDS over EDID

2013-06-09 Thread Chris Wilson
On Sun, Jun 09, 2013 at 10:58:38PM +0200, Daniel Vetter wrote: > In > > commit 53d3b4d7778daf15900867336c85d3f8dd70600c > Author: Egbert Eich > Date: Tue Jun 4 17:13:21 2013 +0200 > > drm/i915/sdvo: Use &intel_sdvo->ddc instead of intel_sdvo->i2c for DDC > > Ebgert Eich fixed a long-stand

[Intel-gfx] [PATCH] drm/i915: Report failure to re-initialise hw after a GPU reset

2013-06-09 Thread Chris Wilson
In case this happens in the wild, and it does, be diligent in checking for re-initilisation errors and report them back promptly. By catching the errors early, we mark the device as wedged, and so should reduce the likelihood of trying to use the inconsistent state. References: https://bugs.launc

Re: [Intel-gfx] [PATCH 3/3] drm/i915: Fix checking of pixel multiplier on SDVOX

2013-06-09 Thread Chris Wilson
On Sun, Jun 09, 2013 at 09:48:11PM +0200, Daniel Vetter wrote: > On Sun, Jun 9, 2013 at 7:23 PM, Chris Wilson wrote: > > The pixel multiplier is only stored in SDVOX on i915g/i915gm, so we need > > to use the value retreived from the card for pipe_config and restrict > > the cross check to i915g/i

Re: [Intel-gfx] [PATCH 1/3] drm/i915: Show the computed dotclock in the debug logs

2013-06-09 Thread Chris Wilson
On Sun, Jun 09, 2013 at 09:51:28PM +0200, Daniel Vetter wrote: > On Sun, Jun 9, 2013 at 7:23 PM, Chris Wilson wrote: > > Reviewing the dotclock computation from the refclk and dividers is a > > very useful step in manually checking the register configuration. > > > > Signed-off-by: Chris Wilson >

[Intel-gfx] [PATCH] drm/i915: prefer VBT modes for SVDO-LVDS over EDID

2013-06-09 Thread Daniel Vetter
In commit 53d3b4d7778daf15900867336c85d3f8dd70600c Author: Egbert Eich Date: Tue Jun 4 17:13:21 2013 +0200 drm/i915/sdvo: Use &intel_sdvo->ddc instead of intel_sdvo->i2c for DDC Ebgert Eich fixed a long-standing bug where we simply used a non-working i2c controller to read the EDID for SD

Re: [Intel-gfx] [PATCH 1/3] drm/i915: Show the computed dotclock in the debug logs

2013-06-09 Thread Daniel Vetter
On Sun, Jun 9, 2013 at 7:23 PM, Chris Wilson wrote: > Reviewing the dotclock computation from the refclk and dividers is a > very useful step in manually checking the register configuration. > > Signed-off-by: Chris Wilson > --- > drivers/gpu/drm/i915/intel_display.c | 23 +

Re: [Intel-gfx] [PATCH 3/3] drm/i915: Fix checking of pixel multiplier on SDVOX

2013-06-09 Thread Daniel Vetter
On Sun, Jun 9, 2013 at 7:23 PM, Chris Wilson wrote: > The pixel multiplier is only stored in SDVOX on i915g/i915gm, so we need > to use the value retreived from the card for pipe_config and restrict > the cross check to i915g/i915gm. > > Signed-off-by: Chris Wilson Failing this cross check was a

[Intel-gfx] [PATCH 3/3] drm/i915: Fix checking of pixel multiplier on SDVOX

2013-06-09 Thread Chris Wilson
The pixel multiplier is only stored in SDVOX on i915g/i915gm, so we need to use the value retreived from the card for pipe_config and restrict the cross check to i915g/i915gm. Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/intel_sdvo.c | 34 ++ 1 file chan

[Intel-gfx] [PATCH 2/3] drm/i915: Show the preferred input timings for sDVO

2013-06-09 Thread Chris Wilson
The sDVO encoder will ask the card what input timings it wants for a particular mode, and then apply its fudge to generate the adjusted mode. When debugging it is useful to know what the card reported before we derive our own adjusted mode. Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/in

[Intel-gfx] [PATCH 1/3] drm/i915: Show the computed dotclock in the debug logs

2013-06-09 Thread Chris Wilson
Reviewing the dotclock computation from the refclk and dividers is a very useful step in manually checking the register configuration. Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/intel_display.c | 23 +++ 1 file changed, 23 insertions(+) diff --git a/drivers/gpu/d

Re: [Intel-gfx] [PATCH 1/3] drm/i915: Fix hotplug interrupt enabling for SDVOC

2013-06-09 Thread Daniel Vetter
Same regression note: commit 1d843f9de4e6dc6a899b6f07f106c00da09925e6 Author: Egbert Eich Date: Mon Feb 25 12:06:49 2013 -0500 DRM/I915: Add enum hpd_pin to intel_encoder. I can add both when merging the patches. -Daniel On Sun, Jun 9, 2013 at 5:02 PM, Chris Wilson wrote: > A broken co

Re: [Intel-gfx] [PATCH 2/3] drm/i915: Enable hotplug interrupts after querying hw capabilities.

2013-06-09 Thread Daniel Vetter
On Sun, Jun 9, 2013 at 5:02 PM, Chris Wilson wrote: > sdvo->hotplug_active is initialised during intel_sdvo_setup_outputs(), > and so we never enabled the hotplug interrupts on SDVO as we were > checking too early. > > Reported-by: Alex Fiestas > Bugzilla: https://bugs.freedesktop.org/show_bug.c

[Intel-gfx] [PATCH 3/3] drm/i915: Remove dead code from SDVO initialisation

2013-06-09 Thread Chris Wilson
The hotplug_mask is no longer used as the hpd interrupt setup is now handled in the core. Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/intel_sdvo.c | 13 - 1 file changed, 13 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c i

[Intel-gfx] [PATCH 2/3] drm/i915: Enable hotplug interrupts after querying hw capabilities.

2013-06-09 Thread Chris Wilson
sdvo->hotplug_active is initialised during intel_sdvo_setup_outputs(), and so we never enabled the hotplug interrupts on SDVO as we were checking too early. Reported-by: Alex Fiestas Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=58405 Signed-off-by: Chris Wilson --- drivers/gpu/drm/i91

[Intel-gfx] [PATCH 1/3] drm/i915: Fix hotplug interrupt enabling for SDVOC

2013-06-09 Thread Chris Wilson
A broken conditional would lead to SDVOC waiting upon hotplug events on SDVOB - and so miss all activity on its SDVO port. References: https://bugs.freedesktop.org/show_bug.cgi?id=58405 Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/intel_sdvo.c |6 -- 1 file changed, 4 insertions(

[Intel-gfx] Backporting "drm/i915: force full modeset if the connector is in DPMS OFF mode"

2013-06-09 Thread Daniel Vetter
Hi stable maintainers, Please backport commit e3de42b68478a8c95dd27520e9adead2af9477a5 Author: Imre Deak Date: Fri May 3 19:44:07 2013 +0200 drm/i915: force full modeset if the connector is in DPMS OFF mode to all supported stable kernels. Additional bugzilla on top of all the others: B