Patch "drm/i915: Move the min_pixclk[] handling to the end of readout" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
drm/i915: Move the min_pixclk[] handling to the end of readout
to the 4.9-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-move-the-min_pixclk-handling-to-the-end-of-readout.patch
and it can be found in the queue-4.9 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
00b2b7288299a8c73c0c37b531a075ba5c849e67Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <[email protected]>
Date: Tue, 20 Dec 2016 17:39:02 +0200
Subject: drm/i915: Move the min_pixclk[] handling to the end of readout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Ville Syrjälä <[email protected]>
commit 00b2b7288299a8c73c0c37b531a075ba5c849e67 upstream.
Trying to determine the pixel rate of the pipe can't be done until we know the clock, which means it can't be done until the encoder .get_config() hooks have been called. So let's move the min_pixclk[] stuff to the end of intel_modeset_readout_hw_state() when we actually have gathered all the required infromation.
--- drivers/gpu/drm/i915/intel_display.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/intel_display.c +16 -16
@@ -16749,7 +16749,6 @@ static void intel_modeset_readout_hw_stafor_each_intel_crtc (dev, crtc) {struct intel_crtc_state *crtc_state = crtc->config; -int pixclk =0 ;__drm_atomic_helper_crtc_destroy_state (&crtc_state->base);memset (crtc_state,0 ,sizeof (*crtc_state));
@@ -16761,23 +16760,9 @@ static void intel_modeset_readout_hw_sta crtc->base.enabled = crtc_state->base.enable; crtc->active = crtc_state->base.active; -if (crtc_state->base.active) { +if (crtc_state->base.active) dev_priv->active_crtcs |=1 << crtc->pipe; -if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv)) - pixclk =ilk_pipe_pixel_rate (crtc_state); -else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) - pixclk = crtc_state->base.adjusted_mode.crtc_clock; -else -WARN_ON (dev_priv->display.modeset_calc_cdclk); - -/* pixel rate mustn't exceed 95% of cdclk with IPS on BDW */ -if (IS_BROADWELL (dev_priv) && crtc_state->ips_enabled) - pixclk =DIV_ROUND_UP (pixclk *100 ,95 ); - } - - dev_priv->min_pixclk[crtc->pipe] = pixclk; -readout_plane_state (crtc); DRM_DEBUG_KMS("[CRTC:%d:%s] hw state readout: %s\n",
@@ -16851,6 +16836,8 @@ static void intel_modeset_readout_hw_sta }for_each_intel_crtc (dev, crtc) { +int pixclk =0 ; + crtc->base.hwmode = crtc->config->base.adjusted_mode;memset (&crtc->base.mode,0 ,sizeof (crtc->base.mode));
@@ -16878,10 +16865,23 @@ static void intel_modeset_readout_hw_sta*/ crtc->base.state->mode.private_flags =I915_MODE_FLAG_INHERITED ; +if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv)) + pixclk =ilk_pipe_pixel_rate (crtc->config); +else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) + pixclk = crtc->config->base.adjusted_mode.crtc_clock; +else +WARN_ON (dev_priv->display.modeset_calc_cdclk); + +/* pixel rate mustn't exceed 95% of cdclk with IPS on BDW */ +if (IS_BROADWELL (dev_priv) && crtc->config->ips_enabled) + pixclk =DIV_ROUND_UP (pixclk *100 ,95 ); +drm_calc_timestamping_constants (&crtc->base, &crtc->base.hwmode);update_scanline_offset (crtc); } + dev_priv->min_pixclk[crtc->pipe] = pixclk; +intel_pipe_config_sanity_check (dev_priv, crtc->config); } }
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/drm-i915-gen9-fix-pcode-polling-during-sagv-disabling.patch queue-4.9/drm-i915-move-the-min_pixclk-handling-to-the-end-of-readout.patch queue-4.9/drm-i915-gen9-fix-pcode-polling-timeout-in-stable-backport.patch