Re: [Intel-gfx] [PATCH 04/38] drm/rcar-du: Use for_each_*_in_state

2016-06-02 Thread Maarten Lankhorst
state, i) > + commit->crtcs |= 1 << drm_crtc_index(crtc); > Maybe also change this one to _mask, either way. Reviewed-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH 06/38] drm/omap: Use for_each_plane_in_state

2016-06-02 Thread Maarten Lankhorst
tate->crtcs[i]); > - } > + for_each_crtc_in_state(state, crtc, crtc_state, i) > + commit->crtcs |= 1 << drm_crtc_index(crtc); > > wait_event(priv->commit.wait, !omap_atomic_is_pending(priv, commit)); > (again 1 << index -> cr

Re: [Intel-gfx] [PATCH 08/38] drm/atomic: Add __drm_atomic_get_current_plane_state

2016-06-02 Thread Maarten Lankhorst
Op 02-06-16 om 00:06 schreef Daniel Vetter: > ... and use it in msm Again just want to encapsulate > drm_atomic_state internals a bit. > > The const threading is a bit awkward in vc4 since C sucks, but I still > think it's worth to enforce this. Eventually I want to make all the > obj->state

Re: [Intel-gfx] [PATCH 03/38] drm/msm: Use for_each_*_in_state

2016-06-02 Thread Maarten Lankhorst
; + plane_state->fence = > reservation_object_get_excl_rcu(msm_obj->resv); > } > } > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c > b/drivers/gpu/drm/rockchip/rockchip_drm

Re: [Intel-gfx] [PATCH 0/9] drm/i915: Reapply page flip atomic preparation patches.

2016-05-26 Thread Maarten Lankhorst
Op 26-05-16 om 13:46 schreef Ville Syrjälä: > On Thu, May 26, 2016 at 01:38:02PM +0200, Maarten Lankhorst wrote: >> Op 26-05-16 om 13:35 schreef Ville Syrjälä: >>> On Thu, May 26, 2016 at 12:37:56PM +0200, Maarten Lankhorst wrote: >>>> Add some minor chan

[Intel-gfx] [PATCH 8/9] drm/i915: Remove reset_counter from intel_crtc.

2016-05-26 Thread Maarten Lankhorst
With the removal of cs-based flips all mmio waits will finish without requiring the reset counter, because the waits will complete during gpu reset. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> Reviewed-by: Patrik Jakobsson <patrik.jakobs...@linux.intel.com>

[Intel-gfx] [PATCH 3/9] drm/i915: Add the exclusive fence to plane_state.

2016-05-26 Thread Maarten Lankhorst
Set plane_state->base.fence to the dma_buf exclusive fence, and add a wait to the mmio function. This will make it easier to unify plane updates later on. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> Reviewed-by: Patrik Jakobsson <patrik.jakobs...@lin

[Intel-gfx] [PATCH 4/9] drm/i915: Rework intel_crtc_page_flip to be almost atomic, v4.

2016-05-26 Thread Maarten Lankhorst
since v3: - Update for legacy cursor work. - null pointer to request_unreference is no longer allowed. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 36 +- drivers/gpu/drm/i915/intel_display.c

[Intel-gfx] [PATCH 6/9] drm/i915: Remove use_mmio_flip kernel parameter.

2016-05-26 Thread Maarten Lankhorst
With the removal of cs flips this is always force enabled. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> Reviewed-by: Patrik Jakobsson <patrik.jakobs...@linux.intel.com> --- drivers/gpu/drm/i915/i915_params.c | 5 - drivers/gpu/drm/i915/i915_params.h | 1 -

[Intel-gfx] [PATCH 9/9] drm/i915: Pass atomic states to fbc update functions.

2016-05-26 Thread Maarten Lankhorst
This is required to let fbc updates run async. It has a lot of checks whether certain locks are taken, which can be removed when the relevant states are passed in as pointers. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> Reviewed-by: Patrik Jakobsson <patr

[Intel-gfx] [PATCH 5/9] drm/i915: Remove cs based page flip support, v2.

2016-05-26 Thread Maarten Lankhorst
With mmio flips now available on all platforms it's time to remove support for cs flips. Changes since v1: - Rebase for legacy cursor updates. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 19 +- drivers/gpu/drm/i915/i915

[Intel-gfx] [PATCH 1/9] drm/i915: Allow mmio updates on all platforms, v3.

2016-05-26 Thread Maarten Lankhorst
ges since v2: - Do not break bisect by reverting the stall fix for cursor updates, instead add crtc_state to intel_flip_work, and make sure it's not freed in intel_atomic_commit for legacy cursor updates. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu

[Intel-gfx] [PATCH 2/9] drm/i915: Convert flip_work to a list, v2.

2016-05-26 Thread Maarten Lankhorst
This will be required to allow more than 1 outstanding update in the future. For now it's unclear how this will will be handled, but with a list it's definitely possible. Changes since v1: - Changed to prevent breaking with the legacy cursor update changes. Signed-off-by: Maarten Lankhorst

[Intel-gfx] [PATCH 0/9] drm/i915: Reapply page flip atomic preparation patches.

2016-05-26 Thread Maarten Lankhorst
Add some minor changes to prevent bisect breaking. Main change is making sure crtc_state is not freed while the mmio update still runs. Maarten Lankhorst (9): drm/i915: Allow mmio updates on all platforms, v3. drm/i915: Convert flip_work to a list, v2. drm/i915: Add the exclusive fence

[Intel-gfx] [PATCH 7/9] drm/i915: Remove queue_flip pointer.

2016-05-26 Thread Maarten Lankhorst
With the removal of cs support this is no longer reachable. Can be revived if needed. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> Reviewed-by: Patrik Jakobsson <patrik.jakobs...@linux.intel.com> --- drivers/gpu/drm/i915/i915_drv.h | 5 - drivers/

Re: [Intel-gfx] [PATCH] mutex: Do not spin/queue before performing ww_mutex deadlock avoidance

2016-05-26 Thread Maarten Lankhorst
modesets. > > Testcase: igt/kms_cursor_legacy > Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> > Cc: Peter Zijlstra <pet...@infradead.org> > Cc: Ingo Molnar <mi...@redhat.com> > Cc: Christian König <christian.koe...@amd.com> > Cc: Maarten Lankhors

Re: [Intel-gfx] ✗ Ro.CI.BAT: failure for drm/i915: Reapply page flip atomic preparation patches.

2016-05-26 Thread Maarten Lankhorst
Op 26-05-16 om 13:02 schreef Patchwork: > == Series Details == > > Series: drm/i915: Reapply page flip atomic preparation patches. > URL : https://patchwork.freedesktop.org/series/7801/ > State : failure > > == Summary == > > Series 7801v1 drm/i915: Reapply page flip atomic preparation patches.

Re: [Intel-gfx] [PATCH] mutex: Do not spin/queue before performing ww_mutex deadlock avoidance

2016-05-26 Thread Maarten Lankhorst
Op 26-05-16 om 12:43 schreef Chris Wilson: > On Thu, May 26, 2016 at 12:37:30PM +0200, Maarten Lankhorst wrote: >> The check should also not be for NULL, but for use_ww_ctx. >> This way the if check is optimized out for the ww_ctx path, where >> ww_ctx is always non-null. &

Re: [Intel-gfx] [PATCH 0/9] drm/i915: Reapply page flip atomic preparation patches.

2016-05-26 Thread Maarten Lankhorst
Op 26-05-16 om 13:35 schreef Ville Syrjälä: > On Thu, May 26, 2016 at 12:37:56PM +0200, Maarten Lankhorst wrote: >> Add some minor changes to prevent bisect breaking. >> >> Main change is making sure crtc_state is not freed while the mmio update >> still runs. > I

Re: [Intel-gfx] [PATCH 05/10] drm/cirrus: Drop redundnant gamma size check

2016-05-31 Thread Maarten Lankhorst
Op 30-03-16 om 11:51 schreef Daniel Vetter: > The core does this for us already. Unfortunately some other drivers do the same. :( various variations of end = min_t(start + size, 256); I'll kill the rest off when killing start parameter and returning int. Reviewed-by: Maarten Lankho

Re: [Intel-gfx] [PATCH 01/10] drm: Initialize a linear gamma table by default

2016-05-31 Thread Maarten Lankhorst
Op 30-03-16 om 11:51 schreef Daniel Vetter: > Code stolen from gma500. It would be useful to mention why this is done. :) But even with this patch it seems the legacy gamma in gamma_get is not very reliable. A failed call to gamma_set could leave wrong values in crtc->gamma_store either by

Re: [Intel-gfx] [PATCH 02/10] drm/fb-helper: Remove dead code in setcolreg

2016-05-31 Thread Maarten Lankhorst
Op 30-03-16 om 11:51 schreef Daniel Vetter: > DRM fbdev emulation only supports pallete_color with depth == 8, and > truecolor with depth > 8. Handling depth == 16 for palettes is hence > dead code, let's remove it. Hooray, less chance for failure! Reviewed-by: Maarten Lankhorst <

Re: [Intel-gfx] [PATCH 12/26] drm/atomic-helper: Massage swap_state signature somewhat

2016-05-31 Thread Maarten Lankhorst
Op 31-05-16 om 12:46 schreef Daniel Vetter: > On Tue, May 31, 2016 at 10:43:56AM +0200, Maarten Lankhorst wrote: >> Op 30-05-16 om 17:09 schreef Daniel Vetter: >>> On Mon, May 30, 2016 at 03:08:39PM +0200, Maarten Lankhorst wrote: >>>> Op 29-05-16 om 20:35 schr

Re: [Intel-gfx] [PATCH 06/10] drm/msm: Nuke dummy gamma_set/get functions

2016-05-31 Thread Maarten Lankhorst
ed-off-by: Daniel Vetter <daniel.vet...@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH 09/10] drm/qxl: Don't set a gamma table size

2016-05-31 Thread Maarten Lankhorst
Op 30-03-16 om 11:51 schreef Daniel Vetter: > qxl doesn't have any functions for setting the gamma table, so this is > completely defunct. > > Not nice to lie to userspace, so let's stop! Reviewed-by: Maarten Lankhorst <maarten.lankho...@

Re: [Intel-gfx] [PATCH 01/10] drm: Initialize a linear gamma table by default

2016-05-31 Thread Maarten Lankhorst
Op 31-05-16 om 15:24 schreef Daniel Vetter: > On Tue, May 31, 2016 at 03:05:32PM +0200, Maarten Lankhorst wrote: >> Op 30-03-16 om 11:51 schreef Daniel Vetter: >>> Code stolen from gma500. >> It would be useful to mention why this is done. :) >> >> But even

Re: [Intel-gfx] [PATCH] drm/atomic-helper: nonblocking commit support

2016-05-31 Thread Maarten Lankhorst
Op 30-05-16 om 10:01 schreef Daniel Vetter: > Design ideas: > > - split up the actual commit into different phases, and have > completions for each of them. This will be useful for the future > when we want to interleave phases much more aggressively, for e.g. > queue depth > 1. For not it's

[Intel-gfx] [PATCH v2 4/4] drm/i915: Use connector_type for printing in intel_connector_info, v2.

2016-06-21 Thread Maarten Lankhorst
t list encoder types for eDP/DP, they're always valid. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> Reviewed-by: Ville Syrjälä <ville.syrj...@linux.intel.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 26 +++--- 1 file changed, 19 insertio

Re: [Intel-gfx] [PATCH v10 2/6] drm/i915: Convert requests to use struct fence

2016-06-21 Thread Maarten Lankhorst
ots of ring -> engine renaming and > interface change to get_seqno(). > > v8: Rebased to newer nightly - no longer needs to worry about mutex > locking in the request free code path. Moved to after fence timeline > patch so no longer needs to add a horrid hack timeline. > >

Re: [Intel-gfx] [PATCH v10 6/6] drm/i915: Cache last IRQ seqno to reduce IRQ overhead

2016-06-21 Thread Maarten Lankhorst
no longer used at IRQ time. > [Review comment from Tvrtko Ursulin] > > For: VIZ-5190 > Signed-off-by: John Harrison <john.c.harri...@intel.com> > Cc: Maarten Lankhorst <maarten.lankho...@linux.intel.com> > Cc: Tvrtko Ursulin <tvrtko.ursu...@intel.com> I

Re: [Intel-gfx] [PATCH v10 1/6] drm/i915: Add per context timelines for fence objects

2016-06-21 Thread Maarten Lankhorst
in patch series so no longer needs to remove the > quick hack timeline that was being added before. > > v9: Updated to another newer nightly (changes to context structure > naming). Also updated commit message to match previous changes. > > v10: Removed obsolete fields from timeline st

[Intel-gfx] [PATCH] drm/atomic: Make drm_atomic_legacy_backoff reset crtc->acquire_ctx

2016-06-23 Thread Maarten Lankhorst
571] [] ? posix_get_monotonic_raw+0xc/0x10 [ 601.491576] [] entry_SYSCALL_64_fastpath+0x13/0x8f [ 601.491581] ---[ end trace 56f3d3d85f000d00 ]--- For good measure, test mode_config.acquire_ctx too, although this should never happen. Testcase: kms_cursor_legacy Signed-off-by: Maarten Lankho

Re: [Intel-gfx] [PATCH 11/12] drm/i915: Check for invalid cloning earlier during modeset

2016-06-20 Thread Maarten Lankhorst
loning()? Just checking... :) > Nope. The rejection only happened due to exceeding the max fdi lane > count. I think I had a warn in there somewhere when I originally > submitted the fdi==port_clock patch, but that apparently didn't > survive into the version that eventually got merge

[Intel-gfx] [PATCH 0/4] Fix looking at encoder->type in debugfs.

2016-06-20 Thread Maarten Lankhorst
This is required for patch "[PATCH 12/12] drm/i915: Stop frobbing with DDI encoder->type", otherwise debugfs will not give all info when encoder->type == DDI. Cc: Ville Syrjälä <ville.syrj...@linux.intel.com> Maarten Lankhorst (4): drm/i915: Use connector->name in

[Intel-gfx] [PATCH 3/4] drm/i915: Use atomic state and connector_type in i915_sink_src

2016-06-20 Thread Maarten Lankhorst
DPMS is unreliable, use crtc->state. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu

[Intel-gfx] [PATCH 4/4] drm/i915: Use connector_type for printing in intel_connector_info

2016-06-20 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 38f2cb

[Intel-gfx] [PATCH 1/4] drm/i915: Use connector->name in drrs debugfs.

2016-06-20 Thread Maarten Lankhorst
This removes relying on intel_encoder->type, which may be set to unknown. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 33 - 1 file changed, 8 insertions(+), 25 deletions(-) diff --git

[Intel-gfx] [PATCH 2/4] drm/i915: Use connector_type instead of intel_encoder->type for DP.

2016-06-20 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 18867f

[Intel-gfx] [PATCH v2 0.999/9] drm/i915: Pass crtc state to modeset_get_crtc_power_domains.

2016-01-11 Thread Maarten Lankhorst
Use our newly created encoder_mask to iterate over the encoders. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- This depends on the atomic encoder_mask patches and is required for unifying power domain handling. diff --git a/drivers/gpu/drm/i915/intel_displa

[Intel-gfx] [PATCH v2 1/9] drm/i915: Unify power domain handling.

2016-01-11 Thread Maarten Lankhorst
Right now there's separate power domain handling for update_pipe and modesets. Unify this and only grab POWER_DOMAIN_MODESET once. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/intel_display.c | 64

[Intel-gfx] [PATCH v2 3/9] drm/i915: Remove intel_crtc->atomic.disable_ips.

2016-01-11 Thread Maarten Lankhorst
This is a revert of commit 066cf55b9ce3 "drm/i915: Fix IPS related flicker". intel_pre_disable_primary already handles this, and now everything goes through the atomic path there's no need to try to disable ips twice. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.

[Intel-gfx] [PATCH v2 7/9] drm/i915: Nuke fbc members from intel_crtc->atomic, v2.

2016-01-11 Thread Maarten Lankhorst
Factor out intel_fbc_supports_rotation and use it in pre_plane_update as well. This leaves intel_crtc->atomic empty, so remove it too. Changes since v1: - Add a intel_fbc_supports_rotation helper. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu

[Intel-gfx] [PATCH v2 0/9] Kill off intel_crtc->atomic!

2016-01-11 Thread Maarten Lankhorst
I've fixed some patches with feedback from review. It's about time that intel_crtc->atomic dies. It was useful with the transitional helpers, but can be removed safely now. Maarten Lankhorst (9): drm/i915: Unify power domain handling. drm/i915: Kill off intel_crtc->atomic.wait_vbla

[Intel-gfx] [PATCH v2 6/9] drm/i915: Remove some post-commit members from intel_crtc->atomic, v2.

2016-01-11 Thread Maarten Lankhorst
wording, remove comment about loop. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselv...@gmail.com> --- drivers/gpu/drm/i915/intel_atomic.c | 1 + drivers/gpu/drm/i915/intel_di

[Intel-gfx] [PATCH v2 4/9] drm/i915: Remove atomic.pre_disable_primary.

2016-01-11 Thread Maarten Lankhorst
This can be derived from the atomic state in pre_plane_update, which makes it more clear when it's supposed to be called. Reviewed-by: Ander Conselvan de Oliveira <conselv...@gmail.com> Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/int

[Intel-gfx] [PATCH v2 5/9] drm/i915: Remove update_sprite_watermarks.

2016-01-11 Thread Maarten Lankhorst
Commit 791a32be6eb2 ("drm/i915: Drop intel_update_sprite_watermarks") removes the use of this variable, but forgot to remove it. Reviewed-by: Matt Roper <matthew.d.ro...@intel.com> Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i9

[Intel-gfx] [PATCH v2 2/9] drm/i915: Kill off intel_crtc->atomic.wait_vblank, v3.

2016-01-11 Thread Maarten Lankhorst
out POWER_DOMAIN_MODESET handling to its own commit. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/intel_atomic.c | 1 + drivers/gpu/drm/i915/intel_display.c | 80 ++-- drivers/gpu/drm/i915/intel_drv.h | 2 +-

[Intel-gfx] [PATCH v2 8/9] drm/i915: Do not compute watermarks on a noop.

2016-01-11 Thread Maarten Lankhorst
This should not be done this late when nothing changed. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/intel_display.c | 3 +- drivers/gpu/drm/i915/intel_drv.h | 13 drivers/gpu/drm/i915/intel_pm.c

[Intel-gfx] [PATCH v2 9/9] drm/i915: Remove vblank wait from hsw_enable_ips.

2016-01-11 Thread Maarten Lankhorst
intel_post_plane_update did an extra vblank wait that's no longer needed when enabling ips. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/intel_display.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_displa

Re: [Intel-gfx] [PATCH v2 1/9] drm/i915: Unify power domain handling.

2016-01-11 Thread Maarten Lankhorst
Op 11-01-16 om 13:27 schreef Maarten Lankhorst: > Right now there's separate power domain handling for update_pipe and > modesets. Unify this and only grab POWER_DOMAIN_MODESET once. > > Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> > --- &g

Re: [Intel-gfx] [PATCH] drm/i915: Don't do pre plane update on disabled crtcs

2016-01-18 Thread Maarten Lankhorst
---[ end trace 6387a0ad001bb39f ]--- >> >> Fix this by limiting pre plane update only to active crtcs. >> >> References: https://bugs.freedesktop.org/show_bug.cgi?id=93698 >> Cc: Ville Syrjälä <ville.syrj...@linux.intel.com> >> Cc: Maarten Lankhorst &l

Re: [Intel-gfx] [PATCH] drm/i915: Don't reject primayr plane windowing with color keying enabled on SKL+

2016-01-18 Thread Maarten Lankhorst
imary plane windowing when color keying is used. There is > no such restriction in the hardware, so restore the original logic. > > Cc: Maarten Lankhorst <maarten.lankho...@linux.intel.com> > Fixes: 061e4b8d650a ("drm/i915: clean up atomic plane check functions, v2.&

Re: [Intel-gfx] [PATCH v2 3/9] drm/i915: Remove intel_crtc->atomic.disable_ips.

2016-01-18 Thread Maarten Lankhorst
Op 13-01-16 om 14:02 schreef Ville Syrjälä: > On Mon, Jan 11, 2016 at 01:27:43PM +0100, Maarten Lankhorst wrote: >> This is a revert of commit 066cf55b9ce3 "drm/i915: Fix IPS related flicker". >> intel_pre_disable_primary already handles this, and now everything >&g

Re: [Intel-gfx] [PATCH] Revert "drm/i915: Use atomic commits for legacy page_flips"

2016-06-28 Thread Maarten Lankhorst
ven Newbury <st...@snewbury.org.uk> > Reported-by: Rafael Ristovski <rafael.ristov...@gmail.com> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96593 > Testcase: igt/kms_cursor_legacy/basic-flip-vs-cursor > Signed-off-by: Chris Wilson <ch...@chris-wilson.co

Re: [Intel-gfx] [PATCH] drm/i915/gen9: Re-allocate DDB only for changed pipes

2016-06-28 Thread Maarten Lankhorst
ageflips against one > CRTC to return -EBUSY if there's an outstanding pageflip against a > different CRTC (a situation easily triggered via compositors like > Weston). > > Fixes: 98d39494d3 ("drm/i915/gen9: Compute DDB allocation at atomic check > time (v4)") > Cc: Maarten

Re: [Intel-gfx] [RFC 8/8] drm/i915/vlv: Add intermediate field in intel_crtc_wm_state and handlers for two-level watermark

2016-06-28 Thread Maarten Lankhorst
Op 23-06-16 om 14:36 schreef Chi Ding: > From: Maarten Lankhorst <maarten.lankho...@linux.intel.com> > > Rename vlv_compute_wm to vlv_compute_pipe_wm to compute optimal watermark > Add vlv_compute_intermediate_wm to computer intermediate watermark > Add vlv_initial_watermarks

Re: [Intel-gfx] [PATCH 2/3] drm/i915: Remove atomic.pre_disable_primary.

2016-02-04 Thread Maarten Lankhorst
Op 03-02-16 om 18:39 schreef Ville Syrjälä: > On Wed, Feb 03, 2016 at 06:23:13PM +0100, Maarten Lankhorst wrote: >> Op 03-02-16 om 17:07 schreef Ville Syrjälä: >>> On Wed, Feb 03, 2016 at 04:53:24PM +0100, Maarten Lankhorst wrote: >>>> This can be derived from the at

Re: [Intel-gfx] [PATCH v2 2/9] drm/i915: Kill off intel_crtc->atomic.wait_vblank, v3.

2016-02-09 Thread Maarten Lankhorst
Hey, Op 13-01-16 om 13:58 schreef Ville Syrjälä: > On Mon, Jan 11, 2016 at 01:27:42PM +0100, Maarten Lankhorst wrote: >> Currently we perform our own wait in post_plane_update, >> but the atomic core performs another one in wait_for_vblanks. >> This means that 2 vblan

Re: [Intel-gfx] [PATCH v2 1/6] drm/i915: Use atomic state to obtain load detection crtc, v2.

2016-02-09 Thread Maarten Lankhorst
Op 03-02-16 om 17:34 schreef Ville Syrjälä: > On Wed, Feb 03, 2016 at 09:57:55AM +0100, Maarten Lankhorst wrote: >> Op 02-02-16 om 18:32 schreef Ville Syrjälä: >>> On Tue, Feb 02, 2016 at 01:48:17PM +0100, Maarten Lankhorst wrote: >>>> drm/i915: Use atomic state to

Re: [Intel-gfx] [PATCH v2 2/9] drm/i915: Kill off intel_crtc->atomic.wait_vblank, v3.

2016-02-09 Thread Maarten Lankhorst
Op 09-02-16 om 11:42 schreef Ville Syrjälä: > On Tue, Feb 09, 2016 at 11:27:44AM +0100, Maarten Lankhorst wrote: >> Hey, >> >> Op 13-01-16 om 13:58 schreef Ville Syrjälä: >>> On Mon, Jan 11, 2016 at 01:27:42PM +0100, Maarten Lankhorst wrote: >>

Re: [Intel-gfx] [PATCH 2/3] drm/i915: Use atomic helpers for suspend.

2016-02-09 Thread Maarten Lankhorst
Op 09-02-16 om 14:37 schreef Ville Syrjälä: > On Tue, Feb 09, 2016 at 01:52:22PM +0100, Maarten Lankhorst wrote: >> Instead of duplicating the functionality now that we no longer need >> to preserve dpll state we can move to using the upstream suspend helper. >> >> Signe

[Intel-gfx] [PATCH 1/3] drm/i915: Clear shared dpll based on old state.

2016-02-09 Thread Maarten Lankhorst
Atomic resume was preserving the dpll state because it was required for clearing pll state correctly. If we look at the old_crtc_state for pll to clear this is not needed and the hack can be removed. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/dr

[Intel-gfx] [PATCH 3/3] drm/i915: Use atomic state to obtain load detection crtc, v3.

2016-02-09 Thread Maarten Lankhorst
any more, no need to do so. (Ville) Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/intel_display.c | 132 ++- drivers/gpu/drm/i915/intel_drv.h | 4 +- 2 files changed, 54 insertions(+), 82 deletions(-)

[Intel-gfx] [PATCH 2/3] drm/i915: Use atomic helpers for suspend.

2016-02-09 Thread Maarten Lankhorst
Instead of duplicating the functionality now that we no longer need to preserve dpll state we can move to using the upstream suspend helper. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/drm_atomic_helper.c | 3 + drivers/gpu/drm/i915/i915

[Intel-gfx] [PATCH v4 6/8] drm/i915: Nuke fbc members from intel_crtc->atomic, v2.

2016-02-10 Thread Maarten Lankhorst
Factor out intel_fbc_supports_rotation and use it in pre_plane_update as well. This leaves intel_crtc->atomic empty, so remove it too. Changes since v1: - Add a intel_fbc_supports_rotation helper. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu

[Intel-gfx] [PATCH v4 1/8] drm/i915: Pass crtc state to modeset_get_crtc_power_domains.

2016-02-10 Thread Maarten Lankhorst
Use our newly created encoder_mask to iterate over the encoders. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/intel_display.c | 33 + 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/drivers/g

[Intel-gfx] [PATCH v4 3/8] drm/i915: Kill off intel_crtc->atomic.wait_vblank, v4.

2016-02-10 Thread Maarten Lankhorst
out POWER_DOMAIN_MODESET handling to its own commit. Changes since v3: - Do not wait for vblank on legacy cursor updates. (Ville) - Move broadwell vblank workaround comment to page_flip_finished. (Ville) Changes since v4: - Compile fix, legacy_cursor_flip -> *_update. Signed-off-by: Maarten Lan

[Intel-gfx] [PATCH v4 8/8] drm/i915: Remove vblank wait from hsw_enable_ips.

2016-02-10 Thread Maarten Lankhorst
intel_post_plane_update did an extra vblank wait that's no longer needed when enabling ips. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/intel_display.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_displa

[Intel-gfx] [PATCH v4 0/8] Kill off intel_crtc->atomic!

2016-02-10 Thread Maarten Lankhorst
. Maarten Lankhorst (8): drm/i915: Pass crtc state to modeset_get_crtc_power_domains. drm/i915: Unify power domain handling. drm/i915: Kill off intel_crtc->atomic.wait_vblank, v4. drm/i915: Remove update_sprite_watermarks. drm/i915: Remove some post-commit members from intel_crtc->atom

[Intel-gfx] [PATCH v4 7/8] drm/i915: Do not compute watermarks on a noop.

2016-02-10 Thread Maarten Lankhorst
No atomic state should be included after all validation when nothing has changed. During modeset all active planes will be added to the state, while disabled planes won't change their state. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> Cc: Matt Roper <mat

[Intel-gfx] [PATCH v4 4/8] drm/i915: Remove update_sprite_watermarks.

2016-02-10 Thread Maarten Lankhorst
Commit 791a32be6eb2 ("drm/i915: Drop intel_update_sprite_watermarks") removes the use of this variable, but forgot to remove it. Reviewed-by: Matt Roper <matthew.d.ro...@intel.com> Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i9

[Intel-gfx] [PATCH v4 5/8] drm/i915: Remove some post-commit members from intel_crtc->atomic, v2.

2016-02-10 Thread Maarten Lankhorst
wording, remove comment about loop. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselv...@gmail.com> --- drivers/gpu/drm/i915/intel_atomic.c | 1 + drivers/gpu/drm/i915/intel_di

[Intel-gfx] [PATCH v4 2/8] drm/i915: Unify power domain handling.

2016-02-10 Thread Maarten Lankhorst
Right now there's separate power domain handling for update_pipe and modesets. Unify this and only grab POWER_DOMAIN_MODESET once. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/intel_display.c | 69 +---

Re: [Intel-gfx] [IGT PATCH 5/6] kms_force_connector_basic: Add force-load-detect test

2016-02-11 Thread Maarten Lankhorst
Op 11-02-16 om 09:59 schreef Daniel Vetter: > On Mon, Feb 01, 2016 at 02:44:01PM +0100, Maarten Lankhorst wrote: >> Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> >> --- >> diff --git a/tests/kms_force_connector_basic.c >> b/tests/kms

[Intel-gfx] [PATCH 6/6] drm/i915: Use atomic state in intel_fb_initial_config.

2016-02-01 Thread Maarten Lankhorst
This is another step in removing legacy state. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/intel_fbdev.c | 17 +++-- 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/g

[Intel-gfx] [IGT PATCH 5/6] kms_force_connector_basic: Add force-load-detect test

2016-02-01 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- diff --git a/tests/kms_force_connector_basic.c b/tests/kms_force_connector_basic.c index bd80caeffd82..f827d0008f7b 100644 --- a/tests/kms_force_connector_basic.c +++ b/tests/kms_force_connector_basic.c @@ -52,6

[Intel-gfx] [PATCH 1/6] drm/i915: Use atomic state to obtain load detection crtc.

2016-02-01 Thread Maarten Lankhorst
Instead of restoring dpms and a flag for whether a temp fb is allocated duplicate the old plane_state and crtc_state, and restore the members we potentially touched. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/intel_display.c

[Intel-gfx] [PATCH 0/6] Use more atomic state in i915.

2016-02-01 Thread Maarten Lankhorst
Use atomic state for load detection, stop use of obsolete connector->dpms and use atomic in intel_fb_initial_config. Maarten Lankhorst (6): drm/i915: Use atomic state to obtain load detection crtc. drm/i915: Use atomic state for load detect in crt. drm/i915: Use atomic state in tv l

[Intel-gfx] [PATCH 2/6] drm/i915: Use atomic state in crt load detection.

2016-02-01 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/intel_crt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 9c89df1af036..8b37bfa6bbb3

[Intel-gfx] [PATCH 3/6] drm/i915: Use atomic state in tv load detection.

2016-02-01 Thread Maarten Lankhorst
Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/intel_tv.c | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index 948cbff6c62e..643f52184d2f

[Intel-gfx] [PATCH 4/6] drm/i915: Use correct dpms for intel_enable_crt.

2016-02-01 Thread Maarten Lankhorst
With the conversion to atomic only on/off are still supported. The rest is mapped to one of those, and when enable is called DPMS_ON should be true. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/intel_crt.c | 4 +--- 1 file changed, 1 ins

Re: [Intel-gfx] [PATCH v2 1/6] drm/i915: Use atomic state to obtain load detection crtc, v2.

2016-02-03 Thread Maarten Lankhorst
Op 02-02-16 om 18:32 schreef Ville Syrjälä: > On Tue, Feb 02, 2016 at 01:48:17PM +0100, Maarten Lankhorst wrote: >> drm/i915: Use atomic state to obtain load detection crtc, v2. >> >> Instead of restoring dpms and a flag for whether a temp fb is allocated >> duplicat

[Intel-gfx] [PATCH 3/3] drm/i915: Do not disable cxsr when crtc is disabled.

2016-02-03 Thread Maarten Lankhorst
-wf_vblank Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93698 Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/intel_display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/d

[Intel-gfx] [PATCH 0/3] Fix cxsr warning spew.

2016-02-03 Thread Maarten Lankhorst
First 2 patches from the remove intel_crtc->atomic series. They were already reviewed when part of a different series which I had slightly adjusted. I put them in the series because I need to pass old_crtc_state to pre_plane_update, and those patches were reviewed anyway. Maarten Lankhorst

[Intel-gfx] [PATCH 1/3] drm/i915: Remove intel_crtc->atomic.disable_ips.

2016-02-03 Thread Maarten Lankhorst
This is a revert of commit 066cf55b9ce3 "drm/i915: Fix IPS related flicker". intel_pre_disable_primary already handles this, and now everything goes through the atomic path there's no need to try to disable ips twice. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.

[Intel-gfx] [PATCH 2/3] drm/i915: Remove atomic.pre_disable_primary.

2016-02-03 Thread Maarten Lankhorst
This can be derived from the atomic state in pre_plane_update, which makes it more clear when it's supposed to be called. Reviewed-by: Ander Conselvan de Oliveira <conselv...@gmail.com> Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/i915/int

Re: [Intel-gfx] [PATCH 1/6] drm/i915: Use atomic state to obtain load detection crtc.

2016-02-02 Thread Maarten Lankhorst
Op 01-02-16 om 17:08 schreef Ville Syrjälä: > On Mon, Feb 01, 2016 at 02:43:57PM +0100, Maarten Lankhorst wrote: >> Instead of restoring dpms and a flag for whether a temp fb is allocated >> duplicate >> the old plane_state and crtc_state, and restore the members we po

Re: [Intel-gfx] [PATCH 1/3] drm/i915: don't deactivate FBC at skylake_disable_primary_plane

2016-02-02 Thread Maarten Lankhorst
h was > the kgdboc function. But the following commit added it to the SKL > function: > > commit a8d201af68506b375b701d0d8dbe8487034256f2 > Author: Maarten Lankhorst <maarten.lankho...@linux.intel.com> > Date: Thu Jan 7 11:54:11 2016 +0100 > drm/i915: Use

Re: [Intel-gfx] [PATCH] lib/igt_kms: Add COMIT_ATOMIC to igt_display_commit2()

2016-02-02 Thread Maarten Lankhorst
Op 01-02-16 om 06:50 schreef Mayuresh Gharpure: > Co-Author : Marius Vlad > > So far we have had only two commit styles, COMMIT_LEGACY > and COMMIT_UNIVERSAL. This patch adds another commit style > COMMIT_ATOMIC which makes use of drmModeAtomicCommit() > > Signed-off-by:

Re: [Intel-gfx] [PATCH 2/3] drm/i915: Remove atomic.pre_disable_primary.

2016-02-03 Thread Maarten Lankhorst
Op 03-02-16 om 17:07 schreef Ville Syrjälä: > On Wed, Feb 03, 2016 at 04:53:24PM +0100, Maarten Lankhorst wrote: >> This can be derived from the atomic state in pre_plane_update, >> which makes it more clear when it's supposed to be called. >> >> Reviewed-by: Ander Con

[Intel-gfx] [PATCH v3 5/5] drm/atomic: Add encoder_mask to crtc_state, v3.

2016-01-28 Thread Maarten Lankhorst
. - Add some paranoia to steal_encoder to prevent accidentally setting best_encoder to NULL. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 9c84b3b37631..391b3783e341

Re: [Intel-gfx] [PATCH 5/5] drm/atomic: Add encoder_mask to crtc_state, v2.

2016-01-28 Thread Maarten Lankhorst
A diff to make this v3. Found when running this through IGT bat. - Keeping an encoder but moving it to a different crtc resulted, in encoder_mask not being updated. - Add some paranoia when best_encoder was already updated to a different encoder in steal_encoder. This could happen in

Re: [Intel-gfx] [PATCH v6 3/7] drm/i915: Add per context timelines to fence object

2016-02-24 Thread Maarten Lankhorst
Op 22-02-16 om 15:33 schreef John Harrison: > On 18/02/2016 14:49, Chris Wilson wrote: >> On Thu, Feb 18, 2016 at 02:24:06PM +, john.c.harri...@intel.com wrote: >>> From: John Harrison >>> >>> The fence object used inside the request structure requires a sequence

[Intel-gfx] [PATCH v6 3/8] drm/i915: Kill off intel_crtc->atomic.wait_vblank, v6.

2016-02-24 Thread Maarten Lankhorst
- Add WARN_ON when wait_for_vblanks fails. - Remove extra newlines. - Split the checks whether vblank is needed to a separate function, with comments why a vblank is needed. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- v5 was skipped, previous version was v5 be

Re: [Intel-gfx] [PATCH 3/3] drm/atomic: Refuse to steal encoders from connectors not part of the state.

2016-02-24 Thread Maarten Lankhorst
Hey, Op 18-02-16 om 13:59 schreef Ville Syrjälä: > On Thu, Feb 18, 2016 at 01:43:11PM +0100, Daniel Vetter wrote: >> On Thu, Feb 18, 2016 at 12:18:53PM +0100, Maarten Lankhorst wrote: >>> Op 18-02-16 om 12:07 schreef Daniel Vetter: >>>> On Thu, Feb 18, 2016 at 09:54

[Intel-gfx] [PATCH] drm/i915: Update state before setting watermarks.

2016-02-24 Thread Maarten Lankhorst
95a423 ]--- [ cut here ] Reported-by: Tvrtko Ursulin <tvrtko.ursu...@linux.intel.com> Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index deee5601

[Intel-gfx] [PATCH v2 3/6] drm/atomic: Always call steal_encoder.

2016-02-24 Thread Maarten Lankhorst
There's no need to have a separate function to get the crtc which is stolen, this can already be found when actually stealing the encoder. drm_for_each_connector already checks for connection_mutex, so use that macro now. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.

[Intel-gfx] [PATCH v2 4/6] drm/atomic: Handle encoder stealing from set_config better.

2016-02-24 Thread Maarten Lankhorst
ing, the results would be too unpredictable. Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> --- drivers/gpu/drm/drm_atomic_helper.c | 69 + include/drm/drm_crtc.h | 2 ++ 2 files changed, 71 insertions(+) diff --git a/driver

Re: [Intel-gfx] [PATCH] drm/i915: Add two-stage ILK-style watermark programming (v11)

2016-02-24 Thread Maarten Lankhorst
ng the >>watermarks before turning on the CRTC, which was the cause of the >>underruns that the CI system was seeing. >> - Fix inverted logic for determining when to optimize watermarks. We >>were needlessly optimizing when the intermediate/opt

[Intel-gfx] [PATCH v2 0/6] drm/atomic: Fix encoder stealing, v2.

2016-02-24 Thread Maarten Lankhorst
conflicting encoders. After that 2 cleanups, then a fix to make encoder stealing explicit, followed by using the newly created function to prevent encoder duplication and finally another cleanup. Maarten Lankhorst (6): drm/atomic: Clean up update_output_state. drm/atomic: Pass connector and state

<    5   6   7   8   9   10   11   12   13   14   >