Re: [Intel-gfx] [PATCH] fix interrupt request miss problem in bsd ring for g4x

2011-04-27 Thread Feng, Boqun
I am very sorry for my careless about whitespace. But my patch will not affect gen6+ paths, for gen6+, it use gen6_bsd_ring , bsd_ring is only used by g4x and ironlake. Besides, since bsd_ring_get_irq/bsd_ring_put_irq/ring_get_irq/ring_put_irq are only used by bsd_ring, can we use a patch to

Re: [Intel-gfx] [PATCH 1/7] drm/i915: automatic FDI training support for Ivy Bridge

2011-04-27 Thread Chris Wilson
On Tue, 26 Apr 2011 17:06:01 -0700, Jesse Barnes jbar...@virtuousgeek.org wrote: You can ignore this set; I only sent it because I thought the others wouldn't come through. Before I find the others... Do they treat IS_IVYBRIDGE() vs IS_GEN7 consistently? Do they have sufficient debug and

Re: [Intel-gfx] DisplayPort support

2011-04-27 Thread Chris Wilson
On Wed, 27 Apr 2011 11:42:34 +1000, Paul McGarry p...@paulmcgarry.com wrote: Hi all, Can someone tell me whether the info on: http://www.x.org/wiki/DisplayPort There is a branch of the intel driver that attempts DP setup. It's not clear whether this branch supports DP-DVI connections,

Re: [Intel-gfx] [PATCH 04/16] drm/i915: add Ivy Bridge PCI IDs and flags

2011-04-27 Thread Chris Wilson
On Tue, 26 Apr 2011 16:38:42 -0700, Jesse Barnes jbar...@virtuousgeek.org wrote: Check for IVB desktop, mobile and other SKUs and set flags appropriately. Signed-off-by: Jesse Barnes jbar...@virtuousgeek.org diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h

Re: [Intel-gfx] [PATCH 08/16] drm/i915: Ivy Bridge has split display and pipe control

2011-04-27 Thread Chris Wilson
On Tue, 26 Apr 2011 16:38:46 -0700, Jesse Barnes jbar...@virtuousgeek.org wrote: Ivy Bridge has a similar split display controller to Sandy Bridge, so use HAS_PCH_SPLIT. And gen7 also has the pipe control instruction, so use HAS_PIPE_CONTROL as well. Signed-off-by: Jesse Barnes

Re: [Intel-gfx] [PATCH 04/16] drm/i915: add Ivy Bridge PCI IDs and flags

2011-04-27 Thread Chris Wilson
On Tue, 26 Apr 2011 16:38:42 -0700, Jesse Barnes jbar...@virtuousgeek.org wrote: Check for IVB desktop, mobile and other SKUs and set flags appropriately. Signed-off-by: Jesse Barnes jbar...@virtuousgeek.org --- static const struct pci_device_id pciidlist[] = {/* aka */

Re: [Intel-gfx] [PATCH] fix interrupt request miss problem in bsd ring for g4x

2011-04-27 Thread Chris Wilson
On Wed, 27 Apr 2011 14:08:57 +0800, Feng, Boqun boqun.f...@intel.com wrote: I am very sorry for my careless about whitespace. But my patch will not affect gen6+ paths, for gen6+, it use gen6_bsd_ring , bsd_ring is only used by g4x and ironlake. Reviewer error, sorry. Saw the gen6_* in the

[Intel-gfx] [PATCH 1/2] drm/i915:merge ring_put/get_irq into bsd_ring_put/get_irq

2011-04-27 Thread Feng, Boqun
Remove ring_put_irq/ring_get_irq:drivers/gpu/drm/i915/intel_ringbuffer.c , they are only used by bsd_ring_put_irq/bsd_ring_get_irq. Expand the code in bsd_ring_put_irq/bsd_ring_get_irq. Signed-off-by: Feng, Boqun boqun.f...@intel.com Reviewed-by: Xiang, Haihao haihao.xi...@intel.com ---

[Intel-gfx] [PATCH 2/2] drm/i915:fix irq miss in bsd ring for g4x

2011-04-27 Thread Feng, Boqun
On g4x, user interrupt in bsd ring is missed. g4x and ironlake share the same bsd_ring, but their interrupt control interfaces are different. G4x use I915 while ironlake use GT. The interrupt mask reg address on g4x should be IMR, user interrupt bit in bsd ring on g4x is I915_BSD_USER_INTERRUPT

Re: [Intel-gfx] [PATCH 4/4] drm/i915: re-enable rc6 for ironlake

2011-04-27 Thread Chris Wilson
On Fri, 18 Mar 2011 16:12:48 -0700, Ben Widawsky b...@bwidawsk.net wrote: The previous patches should fix enough of the known issues to try re-enabling rc6 for general consumption Yay, and they bring back the old bugs! :) So upon enabling fbc on a 2560x1440 external panel, it goes blank again.

Re: [Intel-gfx] [PATCH] fix interrupt request miss problem in bsd ring for g4x

2011-04-27 Thread Feng, Boqun
Err...I just send another two patches before read this letter. : ) Ironlake and g4x share the same bsd_ring, so they share the same bsd_ring_put/get_irq functions of the ring. Given this, we can't just change the function name to g4x_ring_put/get_irq. If we do so, we need

Re: [Intel-gfx] DisplayPort support

2011-04-27 Thread Chris Wilson
On Wed, 27 Apr 2011 18:27:51 +1000, Paul McGarry p...@paulmcgarry.com wrote: On Wed, Apr 27, 2011 at 4:49 PM, Chris Wilson ch...@chris-wilson.co.uk wrote: DP has worked for most people the last 18 months or so... There is always to unhappy exception. Can you please append drm.debug=0xe to

Re: [Intel-gfx] [PATCH] fix interrupt request miss problem in bsd ring for g4x

2011-04-27 Thread Chris Wilson
On Wed, 27 Apr 2011 16:23:00 +0800, Feng, Boqun boqun.f...@intel.com wrote: Err...I just send another two patches before read this letter. : ) Ironlake and g4x share the same bsd_ring, so they share the same bsd_ring_put/get_irq functions of the ring. Given this, we can't just change the

Re: [Intel-gfx] [PATCH] fix interrupt request miss problem in bsd ring for g4x

2011-04-27 Thread Daniel Vetter
On Wed, Apr 27, 2011 at 11:15 AM, Chris Wilson ch...@chris-wilson.co.uk wrote: At the moment, I'm more concerned about making sure our functions are consistently named and prefixed with the chipset they first work with. So we have:  intel_ - general functions, used by all  i8xx_ - gen2  

Re: [Intel-gfx] [PATCH 07/16] drm/i915: add PantherPoint PCH ID

2011-04-27 Thread Keith Packard
On Tue, 26 Apr 2011 16:38:45 -0700, Jesse Barnes jbar...@virtuousgeek.org wrote: We can treat PantherPoint as CougarPoint as far as display goes. I'll note in passing that pch_type is never set to PCH_IBX explicitly, which only works because PCH_IBX is zero. -- keith.pack...@intel.com

Re: [Intel-gfx] [PATCH 11/16] drm/i915: manual FDI training for Ivy Bridge

2011-04-27 Thread Keith Packard
On Tue, 26 Apr 2011 16:38:49 -0700, Jesse Barnes jbar...@virtuousgeek.org wrote: A0 stepping chips need to use manual training, but the bits have all moved. So fix things up so we can at least train FDI for VGA links. This patch should be before the auto-train patch so that we don't have a

Re: [Intel-gfx] [PATCH 01/16] drm/i915: make FDI training a display function

2011-04-27 Thread Ben Widawsky
On Tue, Apr 26, 2011 at 04:38:39PM -0700, Jesse Barnes wrote: diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 0296967..c10d7e9 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -209,7 +209,7 @@ struct

Re: [Intel-gfx] [PATCH] fix interrupt request miss problem in bsd ring for g4x

2011-04-27 Thread Ben Widawsky
On Wed, Apr 27, 2011 at 01:07:24PM +0200, Daniel Vetter wrote: On Wed, Apr 27, 2011 at 11:15 AM, Chris Wilson ch...@chris-wilson.co.uk wrote: At the moment, I'm more concerned about making sure our functions are consistently named and prefixed with the chipset they first work with. So

Re: [Intel-gfx] [PATCH 1/2] drm/i915:merge ring_put/get_irq into bsd_ring_put/get_irq

2011-04-27 Thread Keith Packard
On Wed, 27 Apr 2011 15:41:18 +0800, Feng, Boqun boqun.f...@intel.com wrote: Remove ring_put_irq/ring_get_irq:drivers/gpu/drm/i915/intel_ringbuffer.c , they are only used by bsd_ring_put_irq/bsd_ring_get_irq. Expand the code in bsd_ring_put_irq/bsd_ring_get_irq. Why is this change useful? --

Re: [Intel-gfx] [PATCH 08/16] drm/i915: Ivy Bridge has split display and pipe control

2011-04-27 Thread Daniel Vetter
On Wed, Apr 27, 2011 at 08:19:21AM +0100, Chris Wilson wrote: On Tue, 26 Apr 2011 16:38:46 -0700, Jesse Barnes jbar...@virtuousgeek.org wrote: Ivy Bridge has a similar split display controller to Sandy Bridge, so use HAS_PCH_SPLIT. And gen7 also has the pipe control instruction, so use

[Intel-gfx] [PATCH 0/3] a few small cleanups in intel_ringbuffer.c

2011-04-27 Thread Daniel Vetter
Hi all, While mucking around with gfdt to check whether the llc api feels good (it does!) I've once again noticed a few things in intel_ringbuffer.c These patches weed them out. Please review and consider merging for -next. Thanks, Daniel Daniel Vetter (3): drm/i915/ringbuffer: kill snb blt

[Intel-gfx] [PATCH 1/3] drm/i915/ringbuffer: kill snb blt workaround

2011-04-27 Thread Daniel Vetter
This was just to facilitate product enablement with pre-production hw. Allows us to kill quite a bit of cruft. Cc: Eric Anholt e...@anholt.net Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm/i915/intel_ringbuffer.c | 83 +-- 1 files changed,

[Intel-gfx] [PATCH 2/3] drm/i915/ringbuffer: kill pipe_control-gtt_offset

2011-04-27 Thread Daniel Vetter
With the snb blt workaround gone, gen5 pipe_control is the only user of ring-private. It's already tiny, but make it even smaller to prepare for embedding. The added indirection will be killed in the next patch. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch ---

[Intel-gfx] [PATCH 3/3] drm/i915/ringbuffer: embed pipe_control into struct ring_buffer

2011-04-27 Thread Daniel Vetter
Pipecontrol is also required to implement gfdt flushing on gen6+. And if we ever switch to pipecontrol based cache management in the kernel, also required on gen4. I don't see the point in saving that little bit of storge. In the process make cleanup_pipe_control more robust and call it

Re: [Intel-gfx] [PATCH 01/16] drm/i915: make FDI training a display function

2011-04-27 Thread Jesse Barnes
On Wed, 27 Apr 2011 08:58:38 -0700 Ben Widawsky b...@bwidawsk.net wrote: On Tue, Apr 26, 2011 at 04:38:39PM -0700, Jesse Barnes wrote: diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 0296967..c10d7e9 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++

Re: [Intel-gfx] [PATCH 1/7] drm/i915: automatic FDI training support for Ivy Bridge

2011-04-27 Thread Jesse Barnes
On 4/26/2011 11:19 PM, Chris Wilson wrote: On Tue, 26 Apr 2011 17:06:01 -0700, Jesse Barnes jbar...@virtuousgeek.org wrote: You can ignore this set; I only sent it because I thought the others wouldn't come through. Before I find the others... Do they treat IS_IVYBRIDGE() vs IS_GEN7

Re: [Intel-gfx] [PATCH 04/16] drm/i915: add Ivy Bridge PCI IDs and flags

2011-04-27 Thread Jesse Barnes
On Wed, 27 Apr 2011 07:59:17 +0100 Chris Wilson ch...@chris-wilson.co.uk wrote: On Tue, 26 Apr 2011 16:38:42 -0700, Jesse Barnes jbar...@virtuousgeek.org wrote: Check for IVB desktop, mobile and other SKUs and set flags appropriately. Signed-off-by: Jesse Barnes

Re: [Intel-gfx] [PATCH 04/16] drm/i915: add Ivy Bridge PCI IDs and flags

2011-04-27 Thread Jesse Barnes
On Wed, 27 Apr 2011 08:23:33 +0100 Chris Wilson ch...@chris-wilson.co.uk wrote: On Tue, 26 Apr 2011 16:38:42 -0700, Jesse Barnes jbar...@virtuousgeek.org wrote: Check for IVB desktop, mobile and other SKUs and set flags appropriately. Signed-off-by: Jesse Barnes

Re: [Intel-gfx] [PATCH 08/16] drm/i915: Ivy Bridge has split display and pipe control

2011-04-27 Thread Jesse Barnes
On Wed, 27 Apr 2011 08:19:21 +0100 Chris Wilson ch...@chris-wilson.co.uk wrote: On Tue, 26 Apr 2011 16:38:46 -0700, Jesse Barnes jbar...@virtuousgeek.org wrote: Ivy Bridge has a similar split display controller to Sandy Bridge, so use HAS_PCH_SPLIT. And gen7 also has the pipe control

Re: [Intel-gfx] [PATCH 07/16] drm/i915: add PantherPoint PCH ID

2011-04-27 Thread Jesse Barnes
On Wed, 27 Apr 2011 08:05:37 -0700 Keith Packard kei...@keithp.com wrote: On Tue, 26 Apr 2011 16:38:45 -0700, Jesse Barnes jbar...@virtuousgeek.org wrote: We can treat PantherPoint as CougarPoint as far as display goes. I'll note in passing that pch_type is never set to PCH_IBX

Re: [Intel-gfx] [PATCH 11/16] drm/i915: manual FDI training for Ivy Bridge

2011-04-27 Thread Jesse Barnes
On Wed, 27 Apr 2011 08:10:29 -0700 Keith Packard kei...@keithp.com wrote: On Tue, 26 Apr 2011 16:38:49 -0700, Jesse Barnes jbar...@virtuousgeek.org wrote: A0 stepping chips need to use manual training, but the bits have all moved. So fix things up so we can at least train FDI for VGA

Re: [Intel-gfx] [PATCH 4/4] drm/i915: re-enable rc6 for ironlake

2011-04-27 Thread Jesse Barnes
On Wed, 27 Apr 2011 08:49:28 +0100 Chris Wilson ch...@chris-wilson.co.uk wrote: On Fri, 18 Mar 2011 16:12:48 -0700, Ben Widawsky b...@bwidawsk.net wrote: The previous patches should fix enough of the known issues to try re-enabling rc6 for general consumption Yay, and they bring back the

Re: [Intel-gfx] [PATCH 04/16] drm/i915: add Ivy Bridge PCI IDs and flags

2011-04-27 Thread Chris Wilson
On Wed, 27 Apr 2011 14:01:50 -0700, Jesse Barnes jbar...@virtuousgeek.org wrote: On Wed, 27 Apr 2011 07:59:17 +0100 Chris Wilson ch...@chris-wilson.co.uk wrote: So I think we just want IS_GEN7() for IVB code. I'd rather keep them separate since we know we'll have gen7 chips with different

Re: [Intel-gfx] [PATCH 4/4] drm/i915: re-enable rc6 for ironlake

2011-04-27 Thread Jesse Barnes
On Wed, 27 Apr 2011 23:03:14 +0100 Chris Wilson ch...@chris-wilson.co.uk wrote: We should probably just enable fbc on the pipe connected to the internal panel (if any) and keep it disabled otherwise. On Arrandale, fbc is potentially a bigger win than rc6 - but is also a potential loss -

Re: [Intel-gfx] [PATCH 1/2] drm/i915:merge ring_put/get_irq into bsd_ring_put/get_irq

2011-04-27 Thread Feng, Boqun
I have discussed this with Chris in my earlier patch. This change is a clean-up, since ring_put_irq and ring_get_irq are only used by bsd_ring_put_irq and bsd_ring_get_irq. And once this change is made, it is more clear to see the difference between g4x and ironlake BSD interrupt control

Re: [Intel-gfx] [PATCH 1/2] drm/i915:merge ring_put/get_irq into bsd_ring_put/get_irq

2011-04-27 Thread Keith Packard
On Thu, 28 Apr 2011 10:06:51 +0800, Feng, Boqun boqun.f...@intel.com wrote: I have discussed this with Chris in my earlier patch. This change is a clean-up, since ring_put_irq and ring_get_irq are only used by bsd_ring_put_irq and bsd_ring_get_irq. And once this change is made, it is

Re: [Intel-gfx] DisplayPort support

2011-04-27 Thread Paul McGarry
On Wed, Apr 27, 2011 at 7:00 PM, Chris Wilson ch...@chris-wilson.co.uk wrote: The unusual sequence appears to be: [   30.081906] [drm:intel_dp_i2c_init], i2c_init DPDDC-B [   30.082413] [drm:intel_dp_aux_ch], dp_aux_ch timeout status 0x5143003e [   30.082415] [drm:intel_dp_i2c_aux_ch],