]> asedeno.scripts.mit.edu Git - linux.git/commit
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)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 30 Sep 2015 15:15:56 +0000 (17:15 +0200)
commitde4a9f83395e8a709ffe463dff6d1c51945da352
tree9601207c292c1fac1aadf54f4e27694961f168e2
parentde165e0bccb4a8fe71debd5adb2f599609bcb8e0
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>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_pm.c