diff options
author | Matt Roper <matthew.d.roper@intel.com> | 2015-09-24 15:53:18 -0700 |
---|---|---|
committer | Matt Roper <matthew.d.roper@intel.com> | 2015-10-21 14:55:06 -0700 |
commit | aa363136866caa636031284f13ea0f730c64fca9 (patch) | |
tree | 4a1fe17d59c9949f8f85172e0d0e5da2945b5570 /drivers/gpu/drm/i915/intel_drv.h | |
parent | 19b8d3875e21f4f7e5c999350892f1a788f4e977 (diff) |
drm/i915: Calculate watermark configuration during atomic check (v2)
v2: Don't forget to actually check the cstate->active value when
tallying up the number of active CRTC's. (Ander)
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/59561/
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 9361df5b8a60..1a3bbdc4f18a 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -250,6 +250,7 @@ struct intel_atomic_state { unsigned int cdclk; bool dpll_set; struct intel_shared_dpll_config shared_dpll[I915_NUM_PLLS]; + struct intel_wm_config wm_config; }; struct intel_plane_state { |