From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
A rebased version of the two stage watermark support for VLV/CHV. Mostly
just cosmetic changes due to churn. I did clear out that unused
intel_plane_wm_parameters structure Maarten pointed out.
The sticking point in the last series was the active_planes bitmask, but
I've decided to leave that as is because it was the most convenient way
to do it for VLV/CHV, and I think it should work quite well for g4x as
well (which is something I want to tackle after landing this stuff).
I might still change my mind when I get down to gen2-gen4 territory
but until I really start on that I don't want to needlessly change
directions.
Oh one new thing I added here is cleaned up versions of some the
tracepoints I used in debugging this stuff. I think those would
be usedful to have upstream so I've included them in the series.
Entire series is available here:
git://github.com/vsyrjala/linux.git vlv_atomic_wm_6
Ville Syrjälä (18):
drm/i915: Track visible planes in a bitmask
drm/i915: Track plane fifo sizes under intel_crtc
drm/i915: Move vlv wms from crtc->wm_state to crtc->wm.active.vlv
drm/i915: Plop vlv wm state into crtc_state
drm/i915: Plop vlv/chv fifo sizes into crtc state
drm/i915: Compute VLV/CHV FIFO sizes based on the PM2 watermarks
drm/i915: Compute vlv/chv wms the atomic way
drm/i915: Skip useless watermark/FIFO related work on VLV/CHV when not
needed
drm/i915: Compute proper intermediate wms for vlv/cvh
drm/i915: Nuke crtc->wm.cxsr_allowed
drm/i915: Only use update_wm_{pre,post} for pre-ilk platforms
drm/i915: Sanitize VLV/CHV watermarks properly
drm/i915: Workaround VLV/CHV sprite1->sprite0 enable underrun
drm/i915: Kill level 0 wm hack for VLV/CHV
drm/i915: Add plane update/disable tracepoints
drm/i915: Add VLV/CHV watermark/FIFO programming tracepoints
drm/i915: Add cxsr toggle tracepoint
drm/i915: Add FIFO underrun tracepoints
drivers/gpu/drm/i915/i915_drv.h | 8 +
drivers/gpu/drm/i915/i915_irq.c | 3 +
drivers/gpu/drm/i915/i915_trace.h | 200 +++++++++
drivers/gpu/drm/i915/intel_atomic.c | 1 +
drivers/gpu/drm/i915/intel_atomic_plane.c | 17 +-
drivers/gpu/drm/i915/intel_display.c | 179 +++++---
drivers/gpu/drm/i915/intel_drv.h | 71 ++-
drivers/gpu/drm/i915/intel_fifo_underrun.c | 11 +-
drivers/gpu/drm/i915/intel_pm.c | 668 ++++++++++++++++++++---------
9 files changed, 836 insertions(+), 322 deletions(-)
--
2.10.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
