Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9d5c839 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Matt Roper
Browse files

drm/i915: Refactor ilk_update_wm (v3) 



Split ilk_update_wm() into two parts; one doing the programming
and the other the calculations.

v2: Fix typo in commit message

v3 (by Matt): Heavily rebased for current codebase.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Smoke-tested-by: default avatarPaulo Zanoni <przanoni@gmail.com>
Link: http://patchwork.freedesktop.org/patch/60366/
parent 791a32be

drivers/gpu/drm/i915/intel_pm.c

+35 −29
Original line number Diff line number Diff line
@@ -3617,39 +3617,14 @@ static void skl_update_wm(struct drm_crtc *crtc) 
	dev_priv->wm.skl_hw = *results;

}



static void ilk_update_wm(struct drm_crtc *crtc)

static void ilk_program_watermarks(struct drm_i915_private *dev_priv)

{

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state);

	struct drm_device *dev = crtc->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_device *dev = dev_priv->dev;

	struct intel_pipe_wm lp_wm_1_2 = {}, lp_wm_5_6 = {}, *best_lp_wm;

	struct ilk_wm_maximums max;

	struct intel_wm_config config = {};

	struct ilk_wm_values results = {};

	enum intel_ddb_partitioning partitioning;

	struct intel_pipe_wm pipe_wm = {};

	struct intel_pipe_wm lp_wm_1_2 = {}, lp_wm_5_6 = {}, *best_lp_wm;

	struct intel_wm_config config = {};



	WARN_ON(cstate->base.active != intel_crtc->active);



	/*

	 * IVB workaround: must disable low power watermarks for at least

	 * one frame before enabling scaling.  LP watermarks can be re-enabled

	 * when scaling is disabled.

	 *

	 * WaCxSRDisabledForSpriteScaling:ivb

	 */

	if (cstate->disable_lp_wm) {

		ilk_disable_lp_wm(dev);

		intel_wait_for_vblank(dev, intel_crtc->pipe);

	}



	intel_compute_pipe_wm(cstate, &pipe_wm);



	if (!memcmp(&intel_crtc->wm.active, &pipe_wm, sizeof(pipe_wm)))

		return;



	intel_crtc->wm.active = pipe_wm;



	ilk_compute_wm_config(dev, &config);
@@ -3675,6 +3650,37 @@ static void ilk_update_wm(struct drm_crtc *crtc) 
	ilk_write_wm_values(dev_priv, &results);

}



static void ilk_update_wm(struct drm_crtc *crtc)

{

	struct drm_i915_private *dev_priv = to_i915(crtc->dev);

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state);

	struct intel_pipe_wm pipe_wm = {};



	WARN_ON(cstate->base.active != intel_crtc->active);



	/*

	 * IVB workaround: must disable low power watermarks for at least

	 * one frame before enabling scaling.  LP watermarks can be re-enabled

	 * when scaling is disabled.

	 *

	 * WaCxSRDisabledForSpriteScaling:ivb

	 */

	if (cstate->disable_lp_wm) {

		ilk_disable_lp_wm(crtc->dev);

		intel_wait_for_vblank(crtc->dev, intel_crtc->pipe);

	}



	intel_compute_pipe_wm(cstate, &pipe_wm);



	if (!memcmp(&intel_crtc->wm.active, &pipe_wm, sizeof(pipe_wm)))

		return;



	intel_crtc->wm.active = pipe_wm;



	ilk_program_watermarks(dev_priv);

}



static void skl_pipe_wm_active_state(uint32_t val,

				     struct skl_pipe_wm *active,

				     bool is_transwm,