[Intel-gfx] [PATCH 0/3] Watermark atomic fixes (v2)

Matt Roper matthew.d.roper at intel.com
Fri Feb 27 10:11:58 PST 2015


I'm in the process of reworking watermarks to play more nicely with atomic
driver design.  It sounds like a few people are already running into
watermark-related problems caused by the atomic changes, so I've extracted a
few early patches here that might solve those immediate issues.

Note that the first patch here moves all of the watermark code out of
intel_pm.c and into intel_wm.c.  Watermarks are already very complicated and
the move to atomic is just adding to the complexity, so it's probably a good
idea to give them their own file before we start making a lot of other changes.

v2: Rebased against latest di-nightly.  A few watermark changes had landed
    since I last rebased my watermark branch, so the original patch series no
    longer applied cleanly.

Matt Roper (3):
  drm/i915: Move watermark handling to intel_wm.c (v2)
  drm/i915: Kill intel_crtc->cursor_{width,height} (v2)
  drm/i915: Use plane->state->fb in watermark code (v2)

 drivers/gpu/drm/i915/Makefile        |    3 +-
 drivers/gpu/drm/i915/i915_debugfs.c  |    3 +-
 drivers/gpu/drm/i915/intel_display.c |   21 +-
 drivers/gpu/drm/i915/intel_drv.h     |    4 +-
 drivers/gpu/drm/i915/intel_pm.c      | 3499 ---------------------------------
 drivers/gpu/drm/i915/intel_wm.c      | 3588 ++++++++++++++++++++++++++++++++++
 6 files changed, 3605 insertions(+), 3513 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/intel_wm.c

-- 
1.8.5.1



More information about the Intel-gfx mailing list