diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2014-05-22 17:48:13 +0300 |
|---|---|---|
| committer | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2014-12-29 16:44:02 -0200 |
| commit | 43b93ef0985a0b140ed9c071337467b8953f1b29 (patch) | |
| tree | 4e868463f80f7c648a9bc2367be24bee61dcee54 /drivers/gpu/drm/i915/intel_drv.h | |
| parent | 70af10edb42967e09e0408e5c2fb80e40f4cc639 (diff) | |
drm/i915: Split watermark programming into pre and post stepsrebase-ville-wm
We need to perform watermark programming before and after changing the
plane configuration. Add two new vfuncs to do that. The pre phase is
supposed to switch over to the intermediate watermarks which are
computed so that they can deal with both the old and new plane
configurations. The post phase will arm the vblank based update
systems to switch over to the optimal target watermarks after the
plane configuration has for sure changed.
v2: Pass around intel_crtc and s/intel_crtc/crtc/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 5e9162a86aac..d80bd42a425f 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -415,6 +415,13 @@ struct skl_pipe_wm { uint32_t linetime; }; +struct intel_crtc_wm_config { + /* target watermarks for the pipe */ + struct intel_pipe_wm target; + /* intermediate watermarks for pending/active->target transition */ + struct intel_pipe_wm intm; +}; + struct intel_crtc { struct drm_crtc base; enum pipe pipe; @@ -1218,6 +1225,10 @@ void gen6_rps_idle(struct drm_i915_private *dev_priv); void gen6_rps_boost(struct drm_i915_private *dev_priv); void ilk_wm_get_hw_state(struct drm_device *dev); void ilk_update_pipe_wm(struct drm_device *dev, enum pipe pipe); +void intel_program_watermarks_pre(struct intel_crtc *crtc, + const struct intel_crtc_wm_config *config); +void intel_program_watermarks_post(struct intel_crtc *crtc, + const struct intel_crtc_wm_config *config); void skl_wm_get_hw_state(struct drm_device *dev); void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv, struct skl_ddb_allocation *ddb /* out */); |