drm/i915: Calculate pipe watermarks into CRTC state (v3)
authorMatt Roper <matthew.d.roper@intel.com>
Thu, 24 Sep 2015 22:53:15 +0000 (15:53 -0700)
committerMatt Roper <matthew.d.roper@intel.com>
Wed, 21 Oct 2015 21:54:17 +0000 (14:54 -0700)
commit4e0963c7663b0538b5a21fb49d17ea4ad64de861
treebaf13ba5bebde2952ad83f2170b72c1a2bb3e10c
parentb9d5c839f18c8bbd79a61013371eb8cadf6d897d
drm/i915: Calculate pipe watermarks into CRTC state (v3)

A future patch will calculate these during the atomic 'check' phase
rather than at WM programming time, so let's store the watermark
values we're planning to use in the CRTC state; the values actually
active on the hardware remains in intel_crtc.

While we're at it, do some minor restructuring to keep ILK and SKL
values in a union.

v2: Don't move cxsr_allowed to state (Maarten)

v3: Only calculate watermarks in state.  Still keep active watermarks in
    intel_crtc itself.  (Ville)

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Smoke-tested-by: Paulo Zanoni <przanoni@gmail.com>
Link: http://patchwork.freedesktop.org/patch/59556/
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_pm.c