Re: [Intel-gfx] [PATCH 01/20] drm/i915: sprite support for ValleyView v2

2013-03-19 Thread Ville Syrjälä
On Fri, Mar 08, 2013 at 10:45:44AM -0800, Jesse Barnes wrote: No constant alpha yet though, that needs a new ioctl and/or property to get/set. v2: use drm_plane_format_cpp (Ville) fix up vlv_disable_plane, remove IVB bits (Ville) remove error path rework (Ville) fix component

Re: [Intel-gfx] [PATCH 10/20] drm/i915: allow force wake at init time on VLV v2

2013-03-19 Thread Ville Syrjälä
On Fri, Mar 08, 2013 at 10:45:53AM -0800, Jesse Barnes wrote: We need to set the 'allow force wake' bit to enable forcewake handling later on. v2: split from clock gating patch (Jani) check for allowwakeack (Ville) Signed-off-by: Jesse Barnes jbar...@virtuousgeek.org Reviewed-by:

Re: [Intel-gfx] [PATCH 6/9] drm/i915: PCH_NOP suspend/resume

2013-03-19 Thread Daniel Vetter
On Tue, Mar 19, 2013 at 1:51 AM, Ben Widawsky b...@bwidawsk.net wrote: On Sun, Mar 17, 2013 at 10:28:55PM +0100, Daniel Vetter wrote: On Wed, Mar 13, 2013 at 11:21:05AM -0700, Ben Widawsky wrote: More registers we can't write. Signed-off-by: Ben Widawsky b...@bwidawsk.net ---

Re: [Intel-gfx] i915 black screen introduced by ACPI changes

2013-03-19 Thread Chris Li
On Fri, Mar 15, 2013 at 12:29 AM, Jani Nikula jani.nik...@linux.intel.com wrote: I've never used the acpi_osi= kernel parameter, but it looks like you could workaround this with acpi_osi=!Windows 2012. Please check that running the bad kernel. I find out that I just can't set the

Re: [Intel-gfx] [PATCH 10/20] drm/i915: allow force wake at init time on VLV v2

2013-03-19 Thread Daniel Vetter
On Tue, Mar 19, 2013 at 08:38:53AM +0200, Ville Syrjälä wrote: On Fri, Mar 08, 2013 at 10:45:53AM -0800, Jesse Barnes wrote: We need to set the 'allow force wake' bit to enable forcewake handling later on. v2: split from clock gating patch (Jani) check for allowwakeack (Ville)

Re: [Intel-gfx] [PATCH 03/20] drm/i915: add constant alpha support to sprite ioctl

2013-03-19 Thread Daniel Vetter
On Fri, Mar 08, 2013 at 10:45:46AM -0800, Jesse Barnes wrote: And implement it on ValleyView. Signed-off-by: Jesse Barnes jbar...@virtuousgeek.org --- drivers/gpu/drm/i915/i915_reg.h |1 + drivers/gpu/drm/i915/intel_sprite.c | 11 ++- include/uapi/drm/i915_drm.h

Re: [Intel-gfx] [PATCH v2 4/4] drm/i915: use for_each_sg_page for setting up the gtt ptes

2013-03-19 Thread Daniel Vetter
On Mon, Feb 18, 2013 at 07:28:04PM +0200, Imre Deak wrote: The existing gtt setup code is correct - and so doesn't need to be fixed to handle compact dma scatter lists similarly to the previous patches. Still, take the for_each_sg_page macro into use, to get somewhat simpler code.

Re: [Intel-gfx] [PATCH v2 0/7] xfree86: Handle drm race condition

2013-03-19 Thread Chris Wilson
On Mon, Mar 18, 2013 at 01:51:44PM -0700, Bryce Harrington wrote: Update: Squashes a couple commits to avoid potential hang if git bisecting. No other changes from v1. I'd probably drop the last EAGAIN patch as that is part of the libdrm API, but other than that it looks to be a reasonably

Re: [Intel-gfx] [PATCH] drm/i915: don't clear pfit at startup any more

2013-03-19 Thread Mika Kuoppala
Daniel Vetter daniel.vet...@ffwll.ch writes: Since commit 24a1f16de97c4cf0029d9acd04be06db32208726 Author: Mika Kuoppala mika.kuopp...@linux.intel.com Date: Fri Feb 8 16:35:37 2013 +0200 drm/i915: disable shared panel fitter for pipe We clear the single panel fitter when disabling

Re: [Intel-gfx] [PATCH v2 0/7] xfree86: Handle drm race condition

2013-03-19 Thread Chris Wilson
On Tue, Mar 19, 2013 at 11:02:14AM +0100, Maarten Lankhorst wrote: Hey, Op 19-03-13 10:21, Chris Wilson schreef: On Mon, Mar 18, 2013 at 01:51:44PM -0700, Bryce Harrington wrote: Update: Squashes a couple commits to avoid potential hang if git bisecting. No other changes from v1. I'd

Re: [Intel-gfx] [PATCH] assembler: Add a regions visualizer tool

2013-03-19 Thread Chris Cummins
Hi Damien, thanks a lot for the review. On Mon, Mar 18, 2013 at 04:04:42PM +, Damien Lespiau wrote: A quick review trying to use the tool: * I think it'd be better if byte 0 is at the right, it seems to be the usual ways to represent registers, lower bits at the right. * there's

Re: [Intel-gfx] [PATCH v2 0/7] xfree86: Handle drm race condition

2013-03-19 Thread Dave Airlie
Because of the delayed fput in recent kernels, it is possible for plymouth to exit and not drop master right away. It's put onto a workqueue to be freed slightly later. Xorg-server starts in the meantime, opens a fd, but because the fd hasn't been closed by plymouth yet, it didn't get

Re: [Intel-gfx] [PATCH 14/20] drm/i915: add media well to VLV force wake routines v2

2013-03-19 Thread Ville Syrjälä
On Fri, Mar 08, 2013 at 10:45:57AM -0800, Jesse Barnes wrote: We could split this out into a separate routine at some point as an optimization. v2: use FORCEWAKE_KERNEL (Ville) Signed-off-by: Jesse Barnes jbar...@virtuousgeek.org Reviewed-by: Ville Syrjälä ville.syrj...@linux.intel.com

Re: [Intel-gfx] [PATCH 17/20] drm/i915: don't use plane pipe select on VLV

2013-03-19 Thread Ville Syrjälä
On Fri, Mar 08, 2013 at 10:46:00AM -0800, Jesse Barnes wrote: Planes are fixed to pipes in VLV. Signed-off-by: Jesse Barnes jbar...@virtuousgeek.org Reviewed-by: Ville Syrjälä ville.syrj...@linux.intel.com --- drivers/gpu/drm/i915/intel_display.c | 12 +++- 1 file changed, 7

[Intel-gfx] [PATCH] drm/i915: don't clear pfit at startup any more

2013-03-19 Thread Daniel Vetter
Since commit 24a1f16de97c4cf0029d9acd04be06db32208726 Author: Mika Kuoppala mika.kuopp...@linux.intel.com Date: Fri Feb 8 16:35:37 2013 +0200 drm/i915: disable shared panel fitter for pipe We clear the single panel fitter when disabling the pipe it's attached to, so no need to

Re: [Intel-gfx] [PATCH v2 16/16] drm/i915: add i915_gem_context_get_reset_status_ioctl

2013-03-19 Thread Mika Kuoppala
Ian Romanick i...@freedesktop.org writes: On 03/14/2013 08:52 AM, Mika Kuoppala wrote: This ioctl returns context reset status for specified context. Signed-off-by: Mika Kuoppala mika.kuopp...@intel.com CC: i...@freedesktop.org --- drivers/gpu/drm/i915/i915_dma.c |1 +

Re: [Intel-gfx] [PATCH 24/26] drm/i915: VLV doesn't have HDMI on port C

2013-03-19 Thread Ville Syrjälä
On Fri, Mar 01, 2013 at 02:08:40PM -0800, Jesse Barnes wrote: Port C is for eDP. Port B is shared between HDMI and DP. My docs are telling me ports B and C should support everything. Is this just a board level restriction? Signed-off-by: Jesse Barnes jbar...@virtuousgeek.org ---

Re: [Intel-gfx] [PATCH 24/26] drm/i915: VLV doesn't have HDMI on port C

2013-03-19 Thread Jesse Barnes
On Tue, 19 Mar 2013 15:00:51 +0200 Ville Syrjälä ville.syrj...@linux.intel.com wrote: On Fri, Mar 01, 2013 at 02:08:40PM -0800, Jesse Barnes wrote: Port C is for eDP. Port B is shared between HDMI and DP. My docs are telling me ports B and C should support everything. Is this just a board

Re: [Intel-gfx] [PATCH v2 0/7] xfree86: Handle drm race condition

2013-03-19 Thread Maarten Lankhorst
Hey, Op 19-03-13 10:21, Chris Wilson schreef: On Mon, Mar 18, 2013 at 01:51:44PM -0700, Bryce Harrington wrote: Update: Squashes a couple commits to avoid potential hang if git bisecting. No other changes from v1. I'd probably drop the last EAGAIN patch as that is part of the libdrm API,

Re: [Intel-gfx] [PATCH v2 0/7] xfree86: Handle drm race condition

2013-03-19 Thread Maarten Lankhorst
Hey, Op 19-03-13 11:27, Chris Wilson schreef: On Tue, Mar 19, 2013 at 11:02:14AM +0100, Maarten Lankhorst wrote: Hey, Op 19-03-13 10:21, Chris Wilson schreef: On Mon, Mar 18, 2013 at 01:51:44PM -0700, Bryce Harrington wrote: Update: Squashes a couple commits to avoid potential hang if git

Re: [Intel-gfx] [PATCH v2 0/7] xfree86: Handle drm race condition

2013-03-19 Thread Maarten Lankhorst
Op 19-03-13 12:10, Dave Airlie schreef: Because of the delayed fput in recent kernels, it is possible for plymouth to exit and not drop master right away. It's put onto a workqueue to be freed slightly later. Xorg-server starts in the meantime, opens a fd, but because the fd hasn't been

Re: [Intel-gfx] [PATCH 4/6] drm/i915: enable VT switchless resume v2

2013-03-19 Thread Jesse Barnes
On Mon, 18 Mar 2013 19:50:37 +0100 Daniel Vetter dan...@ffwll.ch wrote: On Mon, Mar 18, 2013 at 6:42 PM, Jesse Barnes jbar...@virtuousgeek.org wrote: On Mon, 18 Mar 2013 08:49:07 +0100 Daniel Vetter dan...@ffwll.ch wrote: On Tue, Feb 19, 2013 at 12:11:41PM -0800, Jesse Barnes wrote:

Re: [Intel-gfx] [PATCH 4/6] drm/i915: enable VT switchless resume v2

2013-03-19 Thread Daniel Vetter
On Tue, Mar 19, 2013 at 5:56 PM, Jesse Barnes jbar...@virtuousgeek.org wrote: I think it just needs to be a low level call to crtc disable on each pipe, otherwise we'll zap the state we're trying to save. That just reminded me that we also should restore the right dpms state I think. At

Re: [Intel-gfx] [PATCH 6/9] drm/i915: PCH_NOP suspend/resume

2013-03-19 Thread Ben Widawsky
On Tue, Mar 19, 2013 at 08:51:01AM +0100, Daniel Vetter wrote: On Tue, Mar 19, 2013 at 1:51 AM, Ben Widawsky b...@bwidawsk.net wrote: On Sun, Mar 17, 2013 at 10:28:55PM +0100, Daniel Vetter wrote: On Wed, Mar 13, 2013 at 11:21:05AM -0700, Ben Widawsky wrote: More registers we can't write.

Re: [Intel-gfx] [PATCH 01/20] drm/i915: sprite support for ValleyView v2

2013-03-19 Thread Jesse Barnes
On Tue, 19 Mar 2013 08:30:09 +0200 Ville Syrjälä ville.syrj...@linux.intel.com wrote: On Fri, Mar 08, 2013 at 10:45:44AM -0800, Jesse Barnes wrote: No constant alpha yet though, that needs a new ioctl and/or property to get/set. v2: use drm_plane_format_cpp (Ville) fix up

Re: [Intel-gfx] [PATCH 03/20] drm/i915: add constant alpha support to sprite ioctl

2013-03-19 Thread Jesse Barnes
On Tue, 19 Mar 2013 09:42:56 +0100 Daniel Vetter dan...@ffwll.ch wrote: --- a/include/uapi/drm/i915_drm.h +++ b/include/uapi/drm/i915_drm.h @@ -949,6 +949,7 @@ struct drm_intel_overlay_attrs { #define I915_SET_COLORKEY_NONE (10) /* disable color key matching */ #define

Re: [Intel-gfx] [PATCH 10/10] [v2] drm/i915: Add a pipeless ivybridge configuration

2013-03-19 Thread Ben Widawsky
On Sun, Mar 17, 2013 at 10:42:33PM +0100, Daniel Vetter wrote: On Fri, Mar 15, 2013 at 11:17:55AM -0700, Ben Widawsky wrote: FIXME: This is based on some HW being used for a demo. We should probably wait until we have confirmation on the IDs before upstreaming this patch. I don't mind

Re: [Intel-gfx] [PATCH v2 16/16] drm/i915: add i915_gem_context_get_reset_status_ioctl

2013-03-19 Thread Ian Romanick
On 03/19/2013 05:58 AM, Mika Kuoppala wrote: Ian Romanick i...@freedesktop.org writes: On 03/14/2013 08:52 AM, Mika Kuoppala wrote: This ioctl returns context reset status for specified context. Signed-off-by: Mika Kuoppala mika.kuopp...@intel.com CC: i...@freedesktop.org ---

Re: [Intel-gfx] [PATCH 14/20] drm/i915: add media well to VLV force wake routines v2

2013-03-19 Thread Daniel Vetter
On Tue, Mar 19, 2013 at 01:53:33PM +0200, Ville Syrjälä wrote: On Fri, Mar 08, 2013 at 10:45:57AM -0800, Jesse Barnes wrote: We could split this out into a separate routine at some point as an optimization. v2: use FORCEWAKE_KERNEL (Ville) Signed-off-by: Jesse Barnes

Re: [Intel-gfx] [PATCH v2 16/16] drm/i915: add i915_gem_context_get_reset_status_ioctl

2013-03-19 Thread Daniel Vetter
On Tue, Mar 19, 2013 at 12:02:48PM -0700, Ian Romanick wrote: On 03/19/2013 05:58 AM, Mika Kuoppala wrote: Ian Romanick i...@freedesktop.org writes: On 03/14/2013 08:52 AM, Mika Kuoppala wrote: This ioctl returns context reset status for specified context. Signed-off-by: Mika Kuoppala

Re: [Intel-gfx] [PATCH 18/20] drm/i915: use VLV DIP routines on VLV v2

2013-03-19 Thread Daniel Vetter
On Fri, Mar 08, 2013 at 10:46:01AM -0800, Jesse Barnes wrote: v2: clean up init ordering (Daniel) Signed-off-by: Jesse Barnes jbar...@virtuousgeek.org Queued for -next with a pimped commit message, thanks for the patch. -Daniel --- drivers/gpu/drm/i915/intel_hdmi.c |8 1 file

Re: [Intel-gfx] [PATCH 1/9] drm/i915: Move num_pipes to intel info

2013-03-19 Thread Jesse Barnes
On Wed, 13 Mar 2013 11:21:00 -0700 Ben Widawsky b...@bwidawsk.net wrote: Requested by Daniel. static const struct intel_device_info intel_i85x_info = { - .gen = 2, .is_i85x = 1, .is_mobile = 1, + .gen = 2, .is_i85x = 1, .is_mobile = 1, .num_pipes = 1, .cursor_needs_physical =

Re: [Intel-gfx] [PATCH 7/9] drm/i915: Don't wait for PCH on reset

2013-03-19 Thread Jesse Barnes
On Wed, 13 Mar 2013 11:21:06 -0700 Ben Widawsky b...@bwidawsk.net wrote: BIOS should be setting this, but in case it doesn't... Signed-off-by: Ben Widawsky b...@bwidawsk.net --- drivers/gpu/drm/i915/i915_gem.c | 3 +++ drivers/gpu/drm/i915/i915_reg.h | 1 + 2 files changed, 4

Re: [Intel-gfx] [PATCH 3/4] drm/i915: Make eb do more

2013-03-19 Thread Jesse Barnes
On Wed, 13 Mar 2013 17:21:07 -0700 Ben Widawsky b...@bwidawsk.net wrote: I've written a couple of versions of this patch, and it's always in prep for some scheduler work I am doing. Only difference this time is a new maintainer to never merge them. Signed-off-by: Ben Widawsky

Re: [Intel-gfx] [PATCH 3/4] drm/i915: Make eb do more

2013-03-19 Thread Ben Widawsky
On Tue, Mar 19, 2013 at 12:41:51PM -0700, Jesse Barnes wrote: On Wed, 13 Mar 2013 17:21:07 -0700 Ben Widawsky b...@bwidawsk.net wrote: I've written a couple of versions of this patch, and it's always in prep for some scheduler work I am doing. Only difference this time is a new

Re: [Intel-gfx] [PATCH 10/10] [v2] drm/i915: Add a pipeless ivybridge configuration

2013-03-19 Thread Jesse Barnes
On Tue, 19 Mar 2013 11:49:49 -0700 Ben Widawsky b...@bwidawsk.net wrote: On Sun, Mar 17, 2013 at 10:42:33PM +0100, Daniel Vetter wrote: On Fri, Mar 15, 2013 at 11:17:55AM -0700, Ben Widawsky wrote: FIXME: This is based on some HW being used for a demo. We should probably wait until we

Re: [Intel-gfx] [PATCH 06/20] drm/i915: panel power sequencing for VLV eDP v2

2013-03-19 Thread Daniel Vetter
On Fri, Mar 08, 2013 at 10:45:49AM -0800, Jesse Barnes wrote: PPS register offsets have changed in Valleyview. v2: don't clobber port select bits on VLV when fixing up PPS timings don't bother with G4x PPS regs (Jani) Signed-off-by: Jesse Barnes jbar...@virtuousgeek.org Signed-off-by:

Re: [Intel-gfx] [PATCH 20/20] drm/i915: VLV doesn't have HDMI on port C

2013-03-19 Thread Daniel Vetter
On Fri, Mar 08, 2013 at 10:46:03AM -0800, Jesse Barnes wrote: Port C is for eDP. Port B is shared between HDMI and DP. Signed-off-by: Jesse Barnes jbar...@virtuousgeek.org --- drivers/gpu/drm/i915/intel_display.c |4 1 file changed, 4 deletions(-) diff --git

Re: [Intel-gfx] [PATCH v2 0/7] xfree86: Handle drm race condition

2013-03-19 Thread Chris Wilson
On Tue, Mar 19, 2013 at 11:50:47AM +0100, Maarten Lankhorst wrote: The drmSetMaster call is needed, but the spinning is really just waiting for the workqueue to run. bryce's patch never worked, it just caused it to try drmsetinterfaceversion for a few seconds before timing out. That call

Re: [Intel-gfx] [PATCH 15/20] drm/i915: turbo RC6 support for VLV v2

2013-03-19 Thread Ben Widawsky
On Fri, Mar 08, 2013 at 10:45:58AM -0800, Jesse Barnes wrote: From: Ben Widawsky b...@bwidawsk.net Uses slightly different interfaces than other platforms. v2: track actual set freq, not requested (Rohit) fix debug prints in init code (Jesse) Signed-off-by: Jesse Barnes

Re: [Intel-gfx] [PATCH 15/20] drm/i915: turbo RC6 support for VLV v2

2013-03-19 Thread Jesse Barnes
On Tue, 19 Mar 2013 15:27:36 -0700 Ben Widawsky b...@bwidawsk.net wrote: On Fri, Mar 08, 2013 at 10:45:58AM -0800, Jesse Barnes wrote: From: Ben Widawsky b...@bwidawsk.net Uses slightly different interfaces than other platforms. v2: track actual set freq, not requested (Rohit)

[Intel-gfx] [PATCH] drm/i915: fixup pd vs pt confusion in gen6 ppgtt code

2013-03-19 Thread Daniel Vetter
The index variable points at a page table, not a page directory or a pde. Ben Widawsky fix this up correctly in his ppgtt cleanup, but I've botched the job and copypasted the old confusion from the original gen6 ppgtt code in commit def886c3768d24c4e0aa56ff98b5a468c2b5c9bf Author: Daniel Vetter

Re: [Intel-gfx] [PATCH 1/9] drm/i915: Move num_pipes to intel info

2013-03-19 Thread Daniel Vetter
On Tue, Mar 19, 2013 at 12:25:23PM -0700, Jesse Barnes wrote: On Wed, 13 Mar 2013 11:21:00 -0700 Ben Widawsky b...@bwidawsk.net wrote: Requested by Daniel. static const struct intel_device_info intel_i85x_info = { - .gen = 2, .is_i85x = 1, .is_mobile = 1, + .gen = 2, .is_i85x = 1,

Re: [Intel-gfx] [PATCH 09/10] [v2] drm/i915: Introduce GEN7_FEATURES for device info

2013-03-19 Thread Daniel Vetter
On Fri, Mar 15, 2013 at 11:17:54AM -0700, Ben Widawsky wrote: Recommended by Chris. v2: Make it GEN7_FEATURES, and use it for vlv and hsw also (Ben) Cc: Chris Wilson ch...@chris-wilson.co.uk Signed-off-by: Ben Widawsky b...@bwidawsk.net Queued for -next, thanks for the patch. -Daniel --

Re: [Intel-gfx] [PATCH 15/20] drm/i915: turbo RC6 support for VLV v2

2013-03-19 Thread Ben Widawsky
On Tue, Mar 19, 2013 at 03:35:55PM -0700, Jesse Barnes wrote: On Tue, 19 Mar 2013 15:27:36 -0700 Ben Widawsky b...@bwidawsk.net wrote: On Fri, Mar 08, 2013 at 10:45:58AM -0800, Jesse Barnes wrote: From: Ben Widawsky b...@bwidawsk.net Uses slightly different interfaces than other

Re: [Intel-gfx] [PATCH] drm/i915: fixup pd vs pt confusion in gen6 ppgtt code

2013-03-19 Thread Ben Widawsky
On Tue, Mar 19, 2013 at 11:51:21PM +0100, Daniel Vetter wrote: The index variable points at a page table, not a page directory or a pde. Ben Widawsky fix this up correctly in his ppgtt cleanup, but I've botched the job and copypasted the old confusion from the original gen6 ppgtt code in

[Intel-gfx] [PATCH] drm/i915: Correct sandybrige overclocking

2013-03-19 Thread Ben Widawsky
Change the gen6+ max delay if the pcode read was successful (not the inverse). The previous code was all sorts of wrong and has existed since I broke it: commit 42c0526c930523425ff6edc95b7235ce7ab9308d Author: Ben Widawsky b...@bwidawsk.net Date: Wed Sep 26 10:34:00 2012 -0700 drm/i915: