Skip to content

Atomic watermark updates (v4)

Matt Roper intel-gfx 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest14 patches 5 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/14drm/i915: Drop redundant watermark programmingdrivers/gpu/drm/i915/intel_display.c+2 -90 replies
2/14drm/i915: Eliminate usage of plane_wm_parameters from ILK-style WM code (v2)drivers/gpu/drm/i915/intel_pm.c+70 -630 replies
3/14drm/i915: Eliminate usage of pipe_wm_parameters from ILK-style WM (v2)drivers/gpu/drm/i915/intel_pm.c+29 -550 replies
4/14drm/i915: Determine I915_MAX_PLANES from plane enumdrivers/gpu/drm/i915/i915_drv.h+6 -60 replies
5/14drm/i915/skl: Simplify wm structures slightly (v2)drivers/gpu/drm/i915/i915_debugfs.c drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/intel_display.c +1 more+49 -520 replies
6/14drm/i915/skl: Eliminate usage of pipe_wm_parameters from SKL-style WM (v2)drivers/gpu/drm/i915/intel_pm.c+151 -1751 reply
7/14drm/i915/ivb: Move WaCxSRDisabledForSpriteScaling w/a to atomic checkdrivers/gpu/drm/i915/intel_atomic.c drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_drv.h +1 more+48 -300 replies
8/14drm/i915: Drop intel_update_sprite_watermarksdrivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_drv.h +2 more+0 -880 replies
9/14drm/i915: Refactor ilk_update_wm (v3)drivers/gpu/drm/i915/intel_pm.c+35 -290 replies
10/14drm/i915: Calculate pipe watermarks into CRTC state (v3)drivers/gpu/drm/i915/intel_drv.h drivers/gpu/drm/i915/intel_pm.c+57 -350 replies
11/14drm/i915: Calculate ILK-style watermarks during atomic check (v3)drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_pm.c+51 -450 replies
12/14drm/i915: Don't set plane visible during HW readout if CRTC is offdrivers/gpu/drm/i915/intel_display.c+1 -10 replies
13/14drm/i915: Calculate watermark configuration during atomic check (v2)drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_drv.h +1 more+72 -550 replies
14/14drm/i915: Add two-stage ILK-style watermark programming (v4)drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/intel_atomic.c drivers/gpu/drm/i915/intel_display.c +2 more+213 -494 replies

Reviews trailers per patch

1 of 14 patches has a Reviewed-by or Acked-by.

PatchMaarten Lankhorst
1/14
2/14
3/14
4/14
5/14
6/14R-b
7/14
8/14
9/14
10/14
11/14
12/14
13/14
14/14

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 00/14] Atomic watermark updates (v4)

Previous revision is here:
http://lists.freedesktop.org/archives/intel-gfx/2015-August/074161.html

Key changes:
- Lots of bugfixes from review comments by Ander and Ville (and a couple I found on my own)
- We now keep the active watermarks in intel_crtc, but pre-calculate to future watermarks in intel_crtc_state. The values stored in the state have been renamed to 'optimal' and 'intermediate' for clarity.
- The interface exposed by platforms that can do atomic updates has changed slightly. .initial_watermarks() and .optimize_watermarks() are the two routines called by the device-independent code to program the precomputed watermarks. These functions handle the locking, the copy of values from cstate->wm to intel_crtc->wm.active, and the actual programming (if needed).
- Added the wm_mutex in preparation for async.

A few patches from previous iterations have been left out of this series:
- Async watermark optimization. I had this in an earlier series, but Maarten indicated that it would clash with his ongoing work. I'll bring back the async patch in the future once his work lands.
- SKL/BXT version. I have some gen9 code that should plug into this framework (gen9 only requires one-step programming), but haven't had a chance to test it yet. I should be able to give it a spin on BXT hardware soon, so I'll wait until I've done that before reposting the gen9-specific followups.

Also note that after some mailing list / IRC discussion, we've decided not to perform modesets in a two-step process that was being discussed as a potential prereq for this, so my experimental prereq patches to do that have been dropped.

Matt Roper (13):
drm/i915: Drop redundant watermark programming drm/i915: Eliminate usage of plane_wm_parameters from ILK-style WM

    code (v2)
  drm/i915: Eliminate usage of pipe_wm_parameters from ILK-style WM (v2)
  drm/i915: Determine I915_MAX_PLANES from plane enum
  drm/i915/skl: Simplify wm structures slightly (v2)
  drm/i915/skl: Eliminate usage of pipe_wm_parameters from SKL-style WM
    (v2)

drm/i915/ivb: Move WaCxSRDisabledForSpriteScaling w/a to atomic check drm/i915: Drop intel_update_sprite_watermarks
drm/i915: Calculate pipe watermarks into CRTC state (v3) drm/i915: Calculate ILK-style watermarks during atomic check (v3) drm/i915: Don't set plane visible during HW readout if CRTC is off drm/i915: Calculate watermark configuration during atomic check (v2) drm/i915: Add two-stage ILK-style watermark programming (v4)

Ville Syrjälä (1):
drm/i915: Refactor ilk_update_wm (v3)

 drivers/gpu/drm/i915/i915_debugfs.c  |   2 +-
 drivers/gpu/drm/i915/i915_drv.h      |  41 +-
 drivers/gpu/drm/i915/intel_atomic.c  |   2 +
 drivers/gpu/drm/i915/intel_display.c | 194 ++++++--
 drivers/gpu/drm/i915/intel_drv.h     |  79 +++-
 drivers/gpu/drm/i915/intel_pm.c      | 849 ++++++++++++++++-------------------
 drivers/gpu/drm/i915/intel_sprite.c  |  15 -
 7 files changed, 637 insertions(+), 545 deletions(-)
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx