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/i915_drv.h | |
| parent | 19b8d3875e21f4f7e5c999350892f1a788f4e977 (diff) | |
| download | lwn-aa363136866caa636031284f13ea0f730c64fca9.tar.gz lwn-aa363136866caa636031284f13ea0f730c64fca9.zip | |
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/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index a5f6636d1d66..af0af6cacc87 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1692,6 +1692,13 @@ struct i915_execbuffer_params { struct drm_i915_gem_request *request; }; +/* used in computing the new watermarks state */ +struct intel_wm_config { + unsigned int num_pipes_active; + bool sprites_enabled; + bool sprites_scaled; +}; + struct drm_i915_private { struct drm_device *dev; struct kmem_cache *objects; @@ -1917,6 +1924,9 @@ struct drm_i915_private { */ uint16_t skl_latency[8]; + /* Committed wm config */ + struct intel_wm_config config; + /* * The skl_wm_values structure is a bit too big for stack * allocation, so we keep the staging struct where we store |