Skip to content

Atomic watermark updates (v5)

Matt Roper intel-gfx 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest15 patches 8 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/15drm/i915: Drop redundant watermark programmingdrivers/gpu/drm/i915/intel_display.c+2 -90 replies
2/15drm/i915: Eliminate usage of plane_wm_parameters from ILK-style WM code (v2)drivers/gpu/drm/i915/intel_pm.c+70 -633 replies
3/15drm/i915: Eliminate usage of pipe_wm_parameters from ILK-style WM (v2)drivers/gpu/drm/i915/intel_pm.c+29 -550 replies
4/15drm/i915: Determine I915_MAX_PLANES from plane enumdrivers/gpu/drm/i915/i915_drv.h+6 -60 replies
5/15drm/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+52 -551 reply
6/15drm/i915/skl: Eliminate usage of pipe_wm_parameters from SKL-style WM (v3)drivers/gpu/drm/i915/intel_pm.c+151 -1750 replies
7/15drm/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/15drm/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/15drm/i915: Refactor ilk_update_wm (v3)drivers/gpu/drm/i915/intel_pm.c+35 -290 replies
10/15drm/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/15drm/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/15drm/i915: Don't set plane visible during HW readout if CRTC is offdrivers/gpu/drm/i915/intel_display.c+1 -10 replies
13/15drm/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/15drm/i915: Sanitize watermarks after hardware state readoutdrivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_pm.c+60 -64 replies
15/15drm/i915: Add two-stage ILK-style watermark programming (v5)drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/intel_atomic.c drivers/gpu/drm/i915/intel_display.c +2 more+233 -560 replies

Reviews trailers per patch

13 of 15 patches have a Reviewed-by or Acked-by.

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

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/15] Atomic watermark updates (v5)

Previous version of the series was here:
http://lists.freedesktop.org/archives/intel-gfx/2015-September/075883.html

Pretty minimal changes since the last series:
* General rebasing on di-nightly
* Some minor SKL-specific bugfixes on patch #6 based on Maarten's review of v4 of this series.
* Added a new patch #14 to try to sanitize watermarks after hardware state readout. Once we've read general state out of the hardware, we should recalculate what we think the watermarks for that state should be and not just trust whatever the system firmware happens to have programmed them to.
* Added Maarten's r-b to all patches except the new #14; he gave it on his feedback to patch #6 of the last revision of the series and I didn't notice that it applied to the whole series until I re-read his feedback. :-)

Matt Roper (14):
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
    (v3)

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: Sanitize watermarks after hardware state readout drm/i915: Add two-stage ILK-style watermark programming (v5)

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 | 255 +++++++++--
 drivers/gpu/drm/i915/intel_drv.h     |  85 +++-
 drivers/gpu/drm/i915/intel_pm.c      | 855 ++++++++++++++++-------------------
 drivers/gpu/drm/i915/intel_sprite.c  |  15 -
 7 files changed, 707 insertions(+), 548 deletions(-)
Signature · 6 lines
2.1.4

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