Re: [Intel-gfx] [PATCH] drm/i915: Android sync points for i915

2014-08-01 Thread Maarten Lankhorst
Hey, On 31-07-14 20:58, Jesse Barnes wrote: Expose an ioctl to create Android fences based on the Android sync point infrastructure (which in turn is based on DMA-buf fences). Just a sketch at this point, no testing has been done. There are a couple of goals here: 1) allow applications

Re: [Intel-gfx] [PATCH] drm/i915: Android sync points for i915 v2

2014-08-05 Thread Maarten Lankhorst
op 05-08-14 01:18, Jesse Barnes schreef: Expose an ioctl to create Android fences based on the Android sync point infrastructure (which in turn is based on DMA-buf fences). Just a sketch at this point, no testing has been done. There are a couple of goals here: 1) allow applications and

Re: [Intel-gfx] [PATCH] drm/i915: Android sync points for i915 v2

2014-08-05 Thread Maarten Lankhorst
op 05-08-14 16:59, Jesse Barnes schreef: On Tue, 5 Aug 2014 09:44:00 +0200 Daniel Vetter dan...@ffwll.ch wrote: On Tue, Aug 5, 2014 at 1:18 AM, Jesse Barnes jbar...@virtuousgeek.org wrote: +#define DRM_IOCTL_I915_GEM_FENCE DRM_IOWR (DRM_COMMAND_BASE +

Re: [Intel-gfx] gpu outputs slave and cache flushing

2013-07-30 Thread Maarten Lankhorst
Op 30-07-13 10:13, Chris Wilson schreef: On Tue, Jul 30, 2013 at 03:04:22PM +1000, Dave Airlie wrote: Hey, so I put a patch into intel driver a while ago to avoid doing a bo flush using map/unmap for output slave device if the kernel has vmap flushing However on reflection I realised this

Re: [Intel-gfx] [PATCH 1/2] drm/i915: unpin backing storage in dmabuf_unmap

2013-08-07 Thread Maarten Lankhorst
with the duct-tape approach for now. Cc: Chris Wilson ch...@chris-wilson.co.uk Reported-by: Maarten Lankhorst maarten.lankho...@canonical.com Cc: Maarten Lankhorst maarten.lankho...@canonical.com Tested-by: Armin K. kre...@email.com (v1) Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch Acked

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

2013-03-19 Thread Maarten Lankhorst
, but other than that it looks to be a reasonably self-contained w/a for this perplexing problem. Reviewed-by: Chris Wilson ch...@chris-wilson.co.uk -Chris And completely wrong, version I pushed to ubuntu's xorg-server for comparison: 8-- Nacked-by: Maarten Lankhorst maarten.lankho

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 v2 0/7] xfree86: Handle drm race condition

2013-03-20 Thread Maarten Lankhorst
Hey, Op 19-03-13 22:13, Chris Wilson schreef: 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

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

2013-03-20 Thread Maarten Lankhorst
Op 20-03-13 09:40, Maarten Lankhorst schreef: Hey, Op 19-03-13 22:13, Chris Wilson schreef: 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

[Intel-gfx] [PATCH] configure: Unconditionally check for valgrind

2013-03-26 Thread Maarten Lankhorst
For those who want to run valgrind, but do not necessarily want to debug intel. :-) --- diff --git a/configure.ac b/configure.ac index de3990d..e084e84 100644 --- a/configure.ac +++ b/configure.ac @@ -440,12 +440,12 @@ AM_CONDITIONAL(FULL_DEBUG, test x$DEBUG = xfull) if test x$DEBUG = xno; then

Re: [Intel-gfx] [BUG] completely bonkers use of set_need_resched + VM_FAULT_NOPAGE

2013-09-12 Thread Maarten Lankhorst
Op 12-09-13 17:06, Peter Zijlstra schreef: Hi Dave, So I'm poking around the preemption code and stumbled upon: drivers/gpu/drm/i915/i915_gem.c:set_need_resched(); drivers/gpu/drm/ttm/ttm_bo_vm.c:set_need_resched(); drivers/gpu/drm/ttm/ttm_bo_vm.c:

Re: [Intel-gfx] [BUG] completely bonkers use of set_need_resched + VM_FAULT_NOPAGE

2013-09-12 Thread Maarten Lankhorst
Op 12-09-13 17:36, Daniel Vetter schreef: On Thu, Sep 12, 2013 at 5:06 PM, Peter Zijlstra pet...@infradead.org wrote: So I'm poking around the preemption code and stumbled upon: drivers/gpu/drm/i915/i915_gem.c:set_need_resched(); drivers/gpu/drm/ttm/ttm_bo_vm.c:

Re: [Intel-gfx] [BUG] completely bonkers use of set_need_resched + VM_FAULT_NOPAGE

2013-09-12 Thread Maarten Lankhorst
Op 12-09-13 18:44, Thomas Hellstrom schreef: On 09/12/2013 05:45 PM, Maarten Lankhorst wrote: Op 12-09-13 17:36, Daniel Vetter schreef: On Thu, Sep 12, 2013 at 5:06 PM, Peter Zijlstra pet...@infradead.org wrote: So I'm poking around the preemption code and stumbled upon: drivers/gpu/drm

Re: [Intel-gfx] [BUG] completely bonkers use of set_need_resched + VM_FAULT_NOPAGE

2013-09-13 Thread Maarten Lankhorst
Op 13-09-13 08:44, Thomas Hellstrom schreef: On 09/12/2013 11:50 PM, Maarten Lankhorst wrote: Op 12-09-13 18:44, Thomas Hellstrom schreef: On 09/12/2013 05:45 PM, Maarten Lankhorst wrote: Op 12-09-13 17:36, Daniel Vetter schreef: On Thu, Sep 12, 2013 at 5:06 PM, Peter Zijlstra pet

Re: [Intel-gfx] [BUG] completely bonkers use of set_need_resched + VM_FAULT_NOPAGE

2013-09-13 Thread Maarten Lankhorst
Op 13-09-13 09:46, Thomas Hellstrom schreef: On 09/13/2013 09:16 AM, Maarten Lankhorst wrote: Op 13-09-13 08:44, Thomas Hellstrom schreef: On 09/12/2013 11:50 PM, Maarten Lankhorst wrote: Op 12-09-13 18:44, Thomas Hellstrom schreef: On 09/12/2013 05:45 PM, Maarten Lankhorst wrote: Op 12-09

Re: [Intel-gfx] [BUG] completely bonkers use of set_need_resched + VM_FAULT_NOPAGE

2013-09-13 Thread Maarten Lankhorst
Op 13-09-13 10:23, Thomas Hellstrom schreef: On 09/13/2013 09:51 AM, Maarten Lankhorst wrote: Op 13-09-13 09:46, Thomas Hellstrom schreef: On 09/13/2013 09:16 AM, Maarten Lankhorst wrote: Op 13-09-13 08:44, Thomas Hellstrom schreef: On 09/12/2013 11:50 PM, Maarten Lankhorst wrote: Op 12-09

[Intel-gfx] [RFC PATCH] drm/nouveau: fix nested locking in mmap handler

2013-09-23 Thread Maarten Lankhorst
Hey, Op 13-09-13 11:00, Peter Zijlstra schreef: On Fri, Sep 13, 2013 at 10:41:54AM +0200, Daniel Vetter wrote: On Fri, Sep 13, 2013 at 10:29 AM, Peter Zijlstra pet...@infradead.org wrote: On Fri, Sep 13, 2013 at 09:46:03AM +0200, Thomas Hellstrom wrote: if (!bo_tryreserve()) { up_read

Re: [Intel-gfx] [RFC PATCH] drm/nouveau: fix nested locking in mmap handler

2013-09-24 Thread Maarten Lankhorst
Op 24-09-13 11:03, Thomas Hellstrom schreef: On 09/24/2013 09:34 AM, Maarten Lankhorst wrote: Op 24-09-13 09:22, Thomas Hellstrom schreef: On 09/23/2013 05:33 PM, Maarten Lankhorst wrote: Hey, Op 13-09-13 11:00, Peter Zijlstra schreef: On Fri, Sep 13, 2013 at 10:41:54AM +0200, Daniel Vetter

Re: [Intel-gfx] [RFC PATCH] drm/nouveau: fix nested locking in mmap handler

2013-09-24 Thread Maarten Lankhorst
Op 24-09-13 12:33, Thomas Hellstrom schreef: On 09/24/2013 12:11 PM, Maarten Lankhorst wrote: Op 24-09-13 11:36, Daniel Vetter schreef: On Tue, Sep 24, 2013 at 11:03:37AM +0200, Thomas Hellstrom wrote: On 09/24/2013 09:34 AM, Maarten Lankhorst wrote: Op 24-09-13 09:22, Thomas Hellstrom

[Intel-gfx] [RFC PATCH] drm/radeon: fixup locking inversion between mmap_sem and reservations

2013-10-08 Thread Maarten Lankhorst
Allocate and copy all kernel memory before doing reservations. This prevents a locking inversion between mmap_sem and reservation_class, and allows us to drop the trylocking in ttm_bo_vm_fault without upsetting lockdep. Signed-off-by: Maarten Lankhorst maarten.lankho...@canonical.com --- diff

Re: [Intel-gfx] [RFC PATCH] drm/radeon: fixup locking inversion between mmap_sem and reservations

2013-10-08 Thread Maarten Lankhorst
op 08-10-13 16:33, Jerome Glisse schreef: On Tue, Oct 08, 2013 at 04:14:40PM +0200, Maarten Lankhorst wrote: Allocate and copy all kernel memory before doing reservations. This prevents a locking inversion between mmap_sem and reservation_class, and allows us to drop the trylocking

[Intel-gfx] [RFC PATCH v2] drm/radeon: fixup locking inversion between, mmap_sem and reservations

2013-10-09 Thread Maarten Lankhorst
, schrieb Jerome Glisse: On Tue, Oct 08, 2013 at 04:14:40PM +0200, Maarten Lankhorst wrote: Allocate and copy all kernel memory before doing reservations. This prevents a locking inversion between mmap_sem and reservation_class, and allows us to drop the trylocking in ttm_bo_vm_fault without

Re: [Intel-gfx] [PATCH 2/3] drm/i915: Android sync points for i915 v3

2014-12-03 Thread Maarten Lankhorst
On 03-12-14 20:49, Jesse Barnes wrote: Expose an ioctl to create Android fences based on the Android sync point infrastructure (which in turn is based on DMA-buf fences). Just a sketch at this point, no testing has been done. There are a couple of goals here: 1) allow applications and

Re: [Intel-gfx] [PATCH 1/3] android: add sync_fence_create_dma

2015-01-14 Thread Maarten Lankhorst
Hey, On 14-01-15 15:09, Tvrtko Ursulin wrote: Hi, On 12/03/2014 07:49 PM, Jesse Barnes wrote: From: Maarten Lankhorst maarten.lankho...@canonical.com This allows users of dma fences to create a android fence. I couldn't figure out the motivation here vs. just exporting

Re: [Intel-gfx] [PATCH v3] dma-buf: cleanup dma_buf_export() to make it easily extensible

2015-01-28 Thread Maarten Lankhorst
Op 28-01-15 om 13:54 schreef Sumit Semwal: At present, dma_buf_export() takes a series of parameters, which makes it difficult to add any new parameters for exporters, if required. Make it simpler by moving all these parameters into a struct, and pass the struct * as parameter to

[Intel-gfx] [PATCH v2 RFC 5/5] drm/i915: Implement intel_crtc_toggle using atomic state

2015-04-23 Thread Maarten Lankhorst
Assume the function is locked with drm_modeset_lock_all for now. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- Changes since RFC v1: - Get rid of the crtc-state-active assignment in intel_crtc_control, it caused the whole state to be confused. - Convert some places

[Intel-gfx] [PATCH v2 RFC 4/5] drm/i915: make plane helpers fully atomic

2015-04-23 Thread Maarten Lankhorst
This kills off most of the transitional sers and uses atomic plane updates in the modeset path to update everything. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- Changes since v1: - Add atomic and sprite planes during a modeset too so they will be restored. - Drop

[Intel-gfx] [PATCH v2 RFC 6/5] drm/i915: Update less state during modeset.

2015-04-23 Thread Maarten Lankhorst
No need to repeatedly call update_watermarks, or update_fbc. For update_watermarks once should be enough after disabling crtc's and swapping the state. Down to a single call to update_watermarks in .crtc_enable Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- There is no v1

Re: [Intel-gfx] [RFC, 1/4] drm/i915: Convert requests to use struct fence

2015-04-19 Thread Maarten Lankhorst
Op 17-04-15 om 21:22 schreef Dave Gordon: On 07/04/15 12:18, Maarten Lankhorst wrote: Hey, Op 07-04-15 om 12:59 schreef John Harrison: On 07/04/2015 10:18, Maarten Lankhorst wrote: Hey, Op 20-03-15 om 18:48 schreef john.c.harri...@intel.com: From: John Harrison john.c.harri...@intel.com

[Intel-gfx] [PATCH RFC 1/5] drm/i915: Get rid of intel_crtc_disable and related code.

2015-04-22 Thread maarten . lankhorst
From: Maarten Lankhorst maarten.lankho...@linux.intel.com Now that the dpll updates are (mostly) atomic, the .off() code is no longer used, and there are no more callers for intel_put_shared_dpll. Move all the updates done in intel_crtc_disable to intel_modeset_update_state, one less special

[Intel-gfx] [PATCH] drm/i915: Keep crtc_state-active in sync with enable.

2015-05-11 Thread Maarten Lankhorst
changed flags as the commit that actually triggers the regression. Cc: Matt Roper matthew.d.ro...@intel.com Cc: Ander Conselvan de Oliveira ander.conselvan.de.olive...@intel.com Reported-and-Tested-by: Kenneth Graunke kenn...@whitecape.org Signed-off-by: Maarten Lankhorst maarten.lankho

[Intel-gfx] [PATCH 34/42] drm/i915: get rid of crtc-config in intel_display.c, part 1

2015-05-11 Thread Maarten Lankhorst
Removed some occurences, roughly based on where the errors of removing crtc-config occured. Because it's used a lot in this file the changes are done in passes. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_display.c | 205

[Intel-gfx] [PATCH 13/42] drm/i915: Set mode_changed for audio in intel_modeset_pipe_config()

2015-05-11 Thread Maarten Lankhorst
From: Ander Conselvan de Oliveira ander.conselvan.de.olive...@intel.com A follow up patch will make intel_modeset_compute_config() deal with multiple crtcs, so move crtc specific stuff into the lower level crtc specific function. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com

[Intel-gfx] [PATCH 37/42] drm/i915: swap state correctly in intel_atomic_commit

2015-05-11 Thread Maarten Lankhorst
crtc-config is gone, swap swap swap. :D Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_atomic.c | 36 ++-- drivers/gpu/drm/i915/intel_display.c | 7 +-- 2 files changed, 7 insertions(+), 36 deletions

[Intel-gfx] [PATCH 36/42] drm/i915: get rid of crtc-config

2015-05-11 Thread Maarten Lankhorst
This is now unused, goodbye. :-) Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_display.c | 2 -- drivers/gpu/drm/i915/intel_drv.h | 1 - 2 files changed, 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm

[Intel-gfx] [PATCH 02/42] drm/i915: get rid of intel_crtc_disable and related code, v2

2015-05-11 Thread Maarten Lankhorst
drm_atomic_helper_swap_state up. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/intel_display.c | 106 +++ drivers/gpu/drm/i915/intel_drv.h | 1 - 3 files changed, 19 insertions(+), 89

[Intel-gfx] [PATCH 03/42] drm/i915: Only update required power domains.

2015-05-11 Thread Maarten Lankhorst
This prevents unnecessarily updating power domains, while still enabling all power domains on initial setup. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_display.c | 52 1 file changed, 41 insertions(+), 11

[Intel-gfx] [PATCH 01/42] drm/atomic: Allow drivers to subclass drm_atomic_state

2015-05-11 Thread Maarten Lankhorst
-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/drm_atomic.c | 91 include/drm/drm_atomic.h | 4 ++ include/drm/drm_crtc.h | 4 ++ 3 files changed, 74 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm

[Intel-gfx] [PATCH 23/42] drm/i915: Pass old state to encoder-(post_)disable.

2015-05-11 Thread Maarten Lankhorst
This removes a lot of users for crtc-config. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_crt.c | 21 ++ drivers/gpu/drm/i915/intel_ddi.c | 78 +--- drivers/gpu/drm/i915/intel_display.c | 36

[Intel-gfx] [PATCH 09/42] drm/i915: Make intel_modeset_fixup_state similar to the atomic helper.

2015-05-11 Thread Maarten Lankhorst
This should be safe. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_display.c | 82 ++-- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915

[Intel-gfx] [PATCH 26/42] drm/i915: Remove use of crtc-config from intel_ddi.c

2015-05-11 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_ddi.c | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index c5a9e36d6a0e..388f02a8e6e1 100644

[Intel-gfx] [PATCH 25/42] drm/i915: Remove use of crtc-config from intel_psr.c

2015-05-11 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_psr.c | 25 ++--- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c index 5ee0fa57ed19

[Intel-gfx] [PATCH 07/42] drm/i915: Get rid of crtc-new_enabled, v2.

2015-05-11 Thread Maarten Lankhorst
No longer any different from state-enable. v2: Keep track of enabled crtc's for calling intel_crtc_restore_mode. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_display.c | 63 +++- drivers/gpu/drm/i915

[Intel-gfx] [PATCH 41/42] drm/i915: Read hw state into an atomic state struct

2015-05-11 Thread Maarten Lankhorst
...@intel.com Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_atomic.c | 22 +-- drivers/gpu/drm/i915/intel_display.c | 311 --- drivers/gpu/drm/i915/intel_drv.h | 3 + 3 files changed, 230 insertions(+), 106

[Intel-gfx] [PATCH 18/42] drm/i915: Remove use of crtc-config from intel_audio.c

2015-05-11 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_audio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c index c4312177b0ee..dd74fd3157ee 100644

[Intel-gfx] [PATCH 04/42] drm/i915: use intel_crtc_control everywhere

2015-05-11 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/i915_debugfs.c | 18 -- drivers/gpu/drm/i915/intel_display.c | 68 +--- drivers/gpu/drm/i915/intel_drv.h | 1 - 3 files changed, 39 insertions(+), 48 deletions

[Intel-gfx] [PATCH 30/42] drm/i915: Remove use of crtc-config in intel_hdmi.c

2015-05-11 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_hdmi.c | 58 +++ 1 file changed, 35 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index

[Intel-gfx] [PATCH 28/42] drm/i915: Remove use of crtc-config from intel_dp_mst.c

2015-05-11 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_dp_mst.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index 4992c8025520..4ecbc58c4e04 100644

[Intel-gfx] [PATCH 10/42] drm/i915: make plane helpers fully atomic

2015-05-11 Thread Maarten Lankhorst
, and this is not handled correctly otherwise. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_atomic_plane.c | 59 ++- drivers/gpu/drm/i915/intel_display.c | 655 ++ drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers

[Intel-gfx] [PATCH 35/42] drm/i915: get rid of crtc-config in intel_display.c, part 2

2015-05-11 Thread Maarten Lankhorst
Convert the rest of the file, but remove crtc-config in a separate commit to hopefully allow easier bisecting. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_display.c | 351 ++- drivers/gpu/drm/i915/intel_dp.c

[Intel-gfx] [PATCH 22/42] drm/i915: Pass old state to crtc_disable and use it.

2015-05-11 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/intel_display.c | 207 ++- drivers/gpu/drm/i915/intel_dp.c | 2 + drivers/gpu/drm/i915/intel_drv.h | 10

[Intel-gfx] [PATCH 42/42] drm/i915: return early in __intel_set_mode_setup_plls without modeset

2015-05-11 Thread Maarten Lankhorst
Don't walk the crtc_state twice if there's no need for it. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_display.c | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers

[Intel-gfx] [PATCH 40/42] drm/i915: Move cdclk and pll setup to intel_modeset_compute_config()

2015-05-11 Thread Maarten Lankhorst
From: Ander Conselvan de Oliveira ander.conselvan.de.olive...@intel.com It makes more sense there, since these are computation steps that can fail. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_display.c | 70

[Intel-gfx] [PATCH 17/42] drm/i915: Remove use of crtc-config from intel_pm.c

2015-05-11 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_pm.c | 96 - 1 file changed, 46 insertions(+), 50 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index

[Intel-gfx] [PATCH 27/42] drm/i915: Remove use of crtc-config from intel_dp.c

2015-05-11 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_dp.c | 33 ++--- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index eda1b22c3111

[Intel-gfx] [PATCH 00/42] drm/i915: Convert to atomic, part 2.

2015-05-11 Thread Maarten Lankhorst
: Make __intel_set_mode() take only atomic state as argument drm/i915: Use global atomic state for staged pll config drm/i915: Support modeset across multiple pipes drm/i915: Move cdclk and pll setup to intel_modeset_compute_config() drm/i915: Read hw state into an atomic state struct Maarten

[Intel-gfx] [PATCH 08/42] drm/i915: Implement intel_crtc_toggle using atomic state

2015-05-11 Thread Maarten Lankhorst
Assume the function is locked with drm_modeset_lock_all for now. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 79 ++-- 2 files changed, 50 insertions

[Intel-gfx] [PATCH 21/42] drm/i915: Remove use of crtc-config from intel_overlay.c

2015-05-11 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_overlay.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index 5fd2d5ac02e2..fa0ff6974dcc

[Intel-gfx] [PATCH 19/42] drm/i915: remove use of crtc-config from intel_fbc.c

2015-05-11 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_fbc.c | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c index 6abb83432d4d..098461ce1fe4 100644

[Intel-gfx] [PATCH 11/42] drm/i915: Update less state during modeset.

2015-05-11 Thread Maarten Lankhorst
No need to repeatedly call update_watermarks, or update_fbc. For update_watermarks once should be enough after disabling crtc's and swapping the state. Down to a single call to update_watermarks in .crtc_enable Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu

[Intel-gfx] [PATCH 15/42] drm/i915: Use hwmode for vblanks.

2015-05-11 Thread Maarten Lankhorst
Must start somewhere to get rid of crtc-config. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/i915_irq.c | 13 ++--- drivers/gpu/drm/i915/intel_display.c | 6 ++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git

[Intel-gfx] [PATCH 12/42] drm/i915: move swap_state to the right place

2015-05-11 Thread Maarten Lankhorst
Done as a separate commit to allow better bisecting. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_display.c | 50 +--- 1 file changed, 7 insertions(+), 43 deletions(-) diff --git a/drivers/gpu/drm/i915

[Intel-gfx] [PATCH 16/42] drm/i915: Remove usage of crtc-config from i915_debugfs.c

2015-05-11 Thread Maarten Lankhorst
Another abuser gone. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/i915_debugfs.c | 42 - 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915

[Intel-gfx] [PATCH 24/42] drm/i915: Remove use of crtc-config from intel_fbdev.c

2015-05-11 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_fbdev.c | 19 +++ 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index 4e7e7da2e03b

[Intel-gfx] [PATCH 06/42] drm/i915: get rid of new_crtc

2015-05-11 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_display.c | 15 --- drivers/gpu/drm/i915/intel_drv.h | 5 - 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu

[Intel-gfx] [PATCH 29/42] drm/i915: Remove use of crtc-config from intel_dsi.c

2015-05-11 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_dsi.c | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c index 3f28b046751b..ec5f4509dc87 100644

[Intel-gfx] [PATCH 14/42] drm/i915: Make __intel_set_mode() take only atomic state as argument

2015-05-11 Thread Maarten Lankhorst
for the atomic state. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_display.c | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index

[Intel-gfx] [PATCH 33/42] drm/i915: remove crtc-active tracking completely

2015-05-11 Thread Maarten Lankhorst
Small behavioral change: DPLL_DVO_2X_MODE may stay enabled during modeset for I830 if new state requires it, instead of being disabled and enabled again. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_display.c | 140

[Intel-gfx] [PATCH 39/42] drm/i915: Support modeset across multiple pipes

2015-05-11 Thread Maarten Lankhorst
crtc. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_display.c | 108 +++ 1 file changed, 45 insertions(+), 63 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c

[Intel-gfx] [PATCH 05/42] drm/i915: Get rid of new_encoder.

2015-05-11 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_display.c | 16 +--- drivers/gpu/drm/i915/intel_drv.h | 6 -- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu

[Intel-gfx] [PATCH 31/42] drm/i915: Remove use of crtc-config in intel_sdvo.c

2015-05-11 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_sdvo.c | 19 +++ 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 6a68098f8b08..93b31d66a1ab

[Intel-gfx] [PATCH 38/42] drm/i915: Use global atomic state for staged pll config

2015-05-11 Thread Maarten Lankhorst
From: Ander Conselvan de Oliveira ander.conselvan.de.olive...@intel.com Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/intel_atomic.c | 49 drivers/gpu/drm/i915/intel_display.c | 111

[Intel-gfx] [PATCH 20/42] drm/i915: remove use of crtc-config from intel_atomic.c and intel_sprite.c

2015-05-11 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_atomic.c | 10 +++--- drivers/gpu/drm/i915/intel_sprite.c | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915

[Intel-gfx] [PATCH 32/42] drm/i915: Calculate haswell plane workaround.

2015-05-11 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_display.c | 109 +-- drivers/gpu/drm/i915/intel_drv.h | 2 + 2 files changed, 81 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/i915

[Intel-gfx] [PATCH] drm/atomic: add drm_atomic_get_existing_*_state helpers

2015-05-13 Thread Maarten Lankhorst
There are cases where we want to test if a given object is part of the state, but don't want to add them if they're not. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/drm_atomic.c | 18 +++- include/drm/drm_atomic.h | 50

[Intel-gfx] [PATCH v2 12/17] drm/i915: Read hw state into an atomic state struct

2015-05-13 Thread Maarten Lankhorst
the previous state. As a nice bonus this kills off encoder-new_encoder, connector-new_enabled and crtc-new_enabled. They were used only to restore the state after a modeset. Signed-off-by: Ander Conselvan de Oliveira ander.conselvan.de.olive...@intel.com Signed-off-by: Maarten Lankhorst

[Intel-gfx] [PATCH v2 15/17] drm/i915: Calculate haswell plane workaround, v2.

2015-05-13 Thread Maarten Lankhorst
to haswell. - Use first loop to iterate over newly enabled crtc's only. This increases readability. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_display.c | 100 --- drivers/gpu/drm/i915/intel_drv.h | 3

[Intel-gfx] [PATCH v2 13/17] drm/i915: Move cdclk and pll setup to intel_modeset_compute_config()

2015-05-13 Thread Maarten Lankhorst
From: Ander Conselvan de Oliveira ander.conselvan.de.olive...@intel.com It makes more sense there, since these are computation steps that can fail. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_display.c | 70

[Intel-gfx] [PATCH v2 16/17] drm/i915: Use crtc-hwmode for vblanks.

2015-05-13 Thread Maarten Lankhorst
intel_crtc-config will be removed eventually, so use crtc-hwmode. drm_atomic_helper_update_legacy_modeset_state updates hwmode, but crtc-active will eventually be gone too. Set dotclock to zero to indicate the crtc is inactive. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com

[Intel-gfx] [PATCH v2 01/17] drm/atomic: update crtc-hwmode in legacy state

2015-05-13 Thread Maarten Lankhorst
This is useful when calculating vblank in drivers that support it. During a modeset the atomic state may not match the hardware state, so if the driver wants to wait on a vblank they'll want to use crtc-hwmode rather than crtc-state-adjusted_mode. Signed-off-by: Maarten Lankhorst maarten.lankho

[Intel-gfx] [PATCH v2 06/17] drm/i915: Use drm_atomic_helper_update_legacy_modeset_state

2015-05-13 Thread Maarten Lankhorst
Now that the helper is exported there's no need to duplicate this code any more. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_display.c | 61 +++- 1 file changed, 4 insertions(+), 57 deletions(-) diff --git

[Intel-gfx] [PATCH v2 08/17] drm/i915: Set mode_changed for audio in intel_modeset_pipe_config()

2015-05-13 Thread Maarten Lankhorst
From: Ander Conselvan de Oliveira ander.conselvan.de.olive...@intel.com A follow up patch will make intel_modeset_compute_config() deal with multiple crtcs, so move crtc specific stuff into the lower level crtc specific function. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com

[Intel-gfx] [PATCH v2 17/17] drm/i915: Remove use of crtc-config from i915_debugfs.c

2015-05-13 Thread Maarten Lankhorst
crtc-config is a pointer to the current crtc-state, and will be removed eventually. Same for crtc-active, instead use crtc-state-active. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/i915_debugfs.c | 42 - 1 file

[Intel-gfx] [PATCH v2 05/17] drm/i915: use intel_crtc_control everywhere

2015-05-13 Thread Maarten Lankhorst
-active. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/i915_debugfs.c | 18 -- drivers/gpu/drm/i915/intel_display.c | 64 +--- drivers/gpu/drm/i915/intel_drv.h | 1 - 3 files changed, 37 insertions(+), 46

[Intel-gfx] [PATCH v2 02/17] drm/atomic: Allow drivers to subclass drm_atomic_state, v3

2015-05-18 Thread Maarten Lankhorst
ander.conselvan.de.olive...@intel.com Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index c6277a4a1f2f..cd1b16b25716 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -30,7

Re: [Intel-gfx] [PATCH v2 01/17] drm/atomic: update crtc-hwmode in legacy state

2015-05-18 Thread Maarten Lankhorst
Op 13-05-15 om 22:23 schreef Maarten Lankhorst: This is useful when calculating vblank in drivers that support it. During a modeset the atomic state may not match the hardware state, so if the driver wants to wait on a vblank they'll want to use crtc-hwmode rather than crtc-state-adjusted_mode

Re: [Intel-gfx] [PATCH v2 11/17] drm/i915: Use global atomic state for staged pll config

2015-05-18 Thread Maarten Lankhorst
Op 18-05-15 om 17:45 schreef Daniel Vetter: On Wed, May 13, 2015 at 10:23:41PM +0200, Maarten Lankhorst wrote: From: Ander Conselvan de Oliveira ander.conselvan.de.olive...@intel.com Now that we can subclass drm_atomic_state we can also use it to keep track of all the pll settings

Re: [Intel-gfx] [PATCH v2 08/17] drm/i915: Set mode_changed for audio in intel_modeset_pipe_config()

2015-05-18 Thread Maarten Lankhorst
Op 18-05-15 om 17:36 schreef Daniel Vetter: On Wed, May 13, 2015 at 10:23:38PM +0200, Maarten Lankhorst wrote: From: Ander Conselvan de Oliveira ander.conselvan.de.olive...@intel.com A follow up patch will make intel_modeset_compute_config() deal with multiple crtcs, so move crtc specific

Re: [Intel-gfx] [PATCH v2 07/17] drm/i915: Use crtc_state-active instead of crtc_state-enable

2015-05-18 Thread Maarten Lankhorst
Op 18-05-15 om 17:30 schreef Daniel Vetter: On Wed, May 13, 2015 at 10:23:37PM +0200, Maarten Lankhorst wrote: crtc_state-enable means a crtc is configured, but it may be turned off for dpms. Until the previous commit crtc_state-active was not updated on crtc off, but now that we do we should

Re: [Intel-gfx] [PATCH 04/42] drm/i915: use intel_crtc_control everywhere

2015-05-12 Thread Maarten Lankhorst
Op 11-05-15 om 19:11 schreef Daniel Vetter: On Mon, May 11, 2015 at 04:24:40PM +0200, Maarten Lankhorst wrote: @@ -6079,26 +6059,29 @@ void intel_crtc_control(struct drm_crtc *crtc, bool enable) enum intel_display_power_domain domain; unsigned long domains; +if (enable

Re: [Intel-gfx] [PATCH 06/42] drm/i915: get rid of new_crtc

2015-05-12 Thread Maarten Lankhorst
Op 11-05-15 om 19:28 schreef Daniel Vetter: On Mon, May 11, 2015 at 04:24:42PM +0200, Maarten Lankhorst wrote: Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com Same comment about the terse commit message as in the previous patch. --- drivers/gpu/drm/i915/intel_display.c

Re: [Intel-gfx] [PATCH 09/42] drm/i915: Make intel_modeset_fixup_state similar to the atomic helper.

2015-05-12 Thread Maarten Lankhorst
Op 12-05-15 om 08:59 schreef Daniel Vetter: On Mon, May 11, 2015 at 04:24:45PM +0200, Maarten Lankhorst wrote: This should be safe. Usual request: A few more details about what you've changed to help guide the review would be great. E.g. which functions from the atomic helpers you're trying

Re: [Intel-gfx] [PATCH 03/42] drm/i915: Only update required power domains.

2015-05-12 Thread Maarten Lankhorst
Op 11-05-15 om 19:00 schreef Daniel Vetter: On Mon, May 11, 2015 at 04:24:39PM +0200, Maarten Lankhorst wrote: This prevents unnecessarily updating power domains, while still enabling all power domains on initial setup. Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com

Re: [Intel-gfx] [PATCH v2 16/17] drm/i915: Use crtc-hwmode for vblanks.

2015-05-19 Thread Maarten Lankhorst
Op 18-05-15 om 18:28 schreef Ville Syrjälä: On Mon, May 18, 2015 at 05:49:23PM +0200, Daniel Vetter wrote: On Wed, May 13, 2015 at 10:23:46PM +0200, Maarten Lankhorst wrote: intel_crtc-config will be removed eventually, so use crtc-hwmode. drm_atomic_helper_update_legacy_modeset_state updates

Re: [Intel-gfx] [PATCH 34/42] drm/i915: get rid of crtc-config in intel_display.c, part 1

2015-05-12 Thread Maarten Lankhorst
Op 12-05-15 om 12:11 schreef Daniel Vetter: On Mon, May 11, 2015 at 04:25:10PM +0200, Maarten Lankhorst wrote: Removed some occurences, roughly based on where the errors of removing crtc-config occured. Because it's used a lot in this file the changes are done in passes. Signed-off

Re: [Intel-gfx] [PATCH 32/42] drm/i915: Calculate haswell plane workaround.

2015-05-12 Thread Maarten Lankhorst
Op 12-05-15 om 11:43 schreef Daniel Vetter: On Mon, May 11, 2015 at 04:25:08PM +0200, Maarten Lankhorst wrote: Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_display.c | 109 +-- drivers/gpu/drm/i915

Re: [Intel-gfx] [PATCH 33/42] drm/i915: remove crtc-active tracking completely

2015-05-12 Thread Maarten Lankhorst
Op 12-05-15 om 12:03 schreef Daniel Vetter: On Mon, May 11, 2015 at 4:25 PM, Maarten Lankhorst maarten.lankho...@linux.intel.com wrote: @@ -11953,16 +11930,14 @@ check_shared_dpll_state(struct drm_device *dev) for_each_intel_crtc(dev, crtc) { if (crtc

Re: [Intel-gfx] [PATCH 37/42] drm/i915: swap state correctly in intel_atomic_commit

2015-05-12 Thread Maarten Lankhorst
Op 12-05-15 om 15:03 schreef Daniel Vetter: On Mon, May 11, 2015 at 04:25:13PM +0200, Maarten Lankhorst wrote: crtc-config is gone, swap swap swap. :D Signed-off-by: Maarten Lankhorst maarten.lankho...@linux.intel.com --- drivers/gpu/drm/i915/intel_atomic.c | 36

Re: [Intel-gfx] [PATCH 2/2] drm/atomic-helpers: Export drm_atomic_helper_update_legacy_modeset_state

2015-05-12 Thread Maarten Lankhorst
Op 12-05-15 om 15:29 schreef Daniel Vetter: This is useful for drivers which have their own modeset infrastructure but want to reuse most of the legacy state frobbery from the helpers. i915 wants this. Cc: Maarten Lankhorst maarten.lankho...@linux.intel.com Signed-off-by: Daniel Vetter

  1   2   3   4   5   6   7   8   9   10   >