Patch "drm/i915: Use the active wm config for merging on ILK-BDW" has been added to the 4.5-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
drm/i915: Use the active wm config for merging on ILK-BDW
to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-i915-use-the-active-wm-config-for-merging-on-ilk-bdw.patch
and it can be found in the queue-4.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
d890565c44447db08fd9d07f5b02928a07a88c7eMon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <[email protected]>
Date: Thu, 14 Jan 2016 14:53:35 +0200
Subject: drm/i915: Use the active wm config for merging on ILK-BDW
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Ville Syrjälä <[email protected]>
commit d890565c44447db08fd9d07f5b02928a07a88c7e upstream.
ilk_program_watermarks() is supposed to merge the active watermarks from all pipes. Thus we need to use the active config too instead of some precomputed stuff.
--- drivers/gpu/drm/i915/intel_pm.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +26 -6
@@ -3606,23 +3606,43 @@ static void skl_update_wm(struct drm_crt dev_priv->wm.skl_hw = *results; } +static void ilk_compute_wm_config (struct drm_device *dev, +struct intel_wm_config *config) +{ +struct intel_crtc *crtc; + +/* Compute the currently _active_ config */ +for_each_intel_crtc (dev, crtc) { +const struct intel_pipe_wm *wm = &crtc->wm.active.ilk; + +if (!wm->pipe_enabled) +continue ; + + config->sprites_enabled |= wm->sprites_enabled; + config->sprites_scaled |= wm->sprites_scaled; + config->num_pipes_active++; + } +} +static void ilk_program_watermarks (struct drm_i915_private *dev_priv) {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 = &dev_priv->wm.config; +struct intel_wm_config config = {};struct ilk_wm_values results = {};enum intel_ddb_partitioning partitioning; -ilk_compute_wm_maximums (dev,1 , config,INTEL_DDB_PART_1_2 , &max); -ilk_wm_merge (dev, config, &max, &lp_wm_1_2); +ilk_compute_wm_config (dev, &config); + +ilk_compute_wm_maximums (dev,1 , &config,INTEL_DDB_PART_1_2 , &max); +ilk_wm_merge (dev, &config, &max, &lp_wm_1_2);/* 5/6 split only in single pipe config on IVB+ */ if (INTEL_INFO (dev)->gen >=7 && - config->num_pipes_active ==1 && config->sprites_enabled) { -ilk_compute_wm_maximums (dev,1 , config,INTEL_DDB_PART_5_6 , &max); -ilk_wm_merge (dev, config, &max, &lp_wm_5_6); + config.num_pipes_active ==1 && config.sprites_enabled) { +ilk_compute_wm_maximums (dev,1 , &config,INTEL_DDB_PART_5_6 , &max); +ilk_wm_merge (dev, &config, &max, &lp_wm_5_6); best_lp_wm =ilk_find_best_result (dev, &lp_wm_1_2, &lp_wm_5_6); }else {
Patches currently in stable-queue which might be from [email protected] are
queue-4.5/drm-i915-use-fw_domains_put_with_fifo-on-hsw.patch queue-4.5/drm-i915-exit-cherryview_irq_handler-after-one-pass.patch queue-4.5/drm-i915-skl_update_scaler-wants-a-rotation-bitmask-instead-of-bit-number.patch queue-4.5/drm-i915-cleanup-phys-status-page-too.patch queue-4.5/drm-i915-use-the-active-wm-config-for-merging-on-ilk-bdw.patch queue-4.5/drm-i915-start-wm-computation-from-scratch-on-ilk-bdw.patch queue-4.5/drm-i915-fix-race-condition-in-intel_dp_destroy_mst_connector.patch queue-4.5/drm-i915-pass-the-correct-encoder-to-intel_ddi_clk_select-with-mst.patch