From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Everything is r-b'd already, but I wanted to do a few mostly
cosmetic changes so that things will look more similar to my
upcoming g4x two stage watermarks work.
The changes are:
* rename the 'noninverted' watermarks to 'raw' since
g4x doesn't have any inverted watermarks but I still
want to have the same structure for storing these things
* rename vlv_plane_wm_set() to vlv_raw_plane_wm_set() to
make it clear that it operates on the "raw" watermarks
* I also spotted one memset() missing a '&'. I fixed it up
even though the entire memset() disappears in a later
patch. It might avoid some problems if someone lands on
it during bisection
So nothing should have changed functionally, but let's
see if CI agrees before I go and push this...
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 | 185 ++++----
drivers/gpu/drm/i915/intel_drv.h | 73 ++--
drivers/gpu/drm/i915/intel_fifo_underrun.c | 11 +-
drivers/gpu/drm/i915/intel_pm.c | 670 ++++++++++++++++++++---------
9 files changed, 844 insertions(+), 324 deletions(-)
--
2.10.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
