All sort of cdclk stuff
Subsystems (2)
v5 cover All sort of cdclk stuff
This patch series rebases Ville's original cdclk patch series
excluding the ones that has already been reviewed.
http://lists.freedesktop.org/archives/intel-gfx/2014-November/055633.html
The patches are rebased to the latest drm-intel-nightly. The major change to the original series is the patch order change for Broadwell and Haswell. Now, the Broadwell CD clock patch can be applied before Haswell CD clock patch. This way, if decided, the CD clock change for Haswell can be discarded without affecting the Broadwell patch.
Ville Syrjälä (8):
drm/i915: Cache current cdclk frequency in dev_priv drm/i915: Use cached cdclk value
drm/i915: Unify ilk and hsw .get_aux_clock_divider drm/i915: Store max cdclk value in dev_priv drm/i915: Don't enable IPS when pixel rate exceeds 95% drm/i915: Add IS_BDW_ULX
drm/i915: BDW clock change support
drm/i915: HSW cdclk support
drivers/gpu/drm/i915/i915_drv.h | 5 +- drivers/gpu/drm/i915/i915_reg.h | 4 + drivers/gpu/drm/i915/intel_display.c | 408 +++++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_dp.c | 24 +-- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_pm.c | 19 +- 6 files changed, 415 insertions(+), 47 deletions(-)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 1/8 drm/i915: Cache current cdclk frequency in dev_priv
From: Ville Syrjälä <[email protected]>
Rather that extracting the current cdclk freuqncy every time someone wants to know it, cache the current value and use that. VLV/CHV already stored a cached value there so just expand that to cover all platforms.
v2: Rebased to the latest
v3: Rebased to the latest
v4: Rebased to the latest
Author: Ville Syrjälä <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_display.c +17 -9
@@ -5747,7 +5747,7 @@ static int valleyview_get_vco(struct drm_i915_private *dev_priv)return vco_freq[hpll_freq] *1000 ; } -static void vlv_update_cdclk (struct drm_device *dev) +static void intel_update_cdclk (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -5760,7 +5760,14 @@ static void vlv_update_cdclk(struct drm_device *dev)* BSpec erroneously claims we should aim for 4MHz, but * in fact 1MHz is the correct frequency. */ -I915_WRITE (GMBUSFREQ_VLV ,DIV_ROUND_UP (dev_priv->cdclk_freq,1000 )); +if (IS_VALLEYVIEW (dev)) { +/* +* Program the gmbus_freq based on the cdclk frequency. +* BSpec erroneously claims we should aim for 4MHz, but +* in fact 1MHz is the correct frequency. +*/ +I915_WRITE (GMBUSFREQ_VLV ,DIV_ROUND_UP (dev_priv->cdclk_freq,1000 )); + } }/* Adjust CDclk dividers to allow high res or save power if possible */
@@ -5826,7 +5833,7 @@ static void valleyview_set_cdclk(struct drm_device *dev, int cdclk)mutex_unlock (&dev_priv->sb_lock); -vlv_update_cdclk (dev); +intel_update_cdclk (dev); }static void cherryview_set_cdclk (struct drm_device *dev,int cdclk)
@@ -5867,7 +5874,7 @@ static void cherryview_set_cdclk(struct drm_device *dev, int cdclk) }mutex_unlock (&dev_priv->rps.hw_lock); -vlv_update_cdclk (dev); +intel_update_cdclk (dev); } static int valleyview_calc_cdclk(struct drm_i915_private *dev_priv,
@@ -6056,6 +6063,8 @@ static void valleyview_modeset_global_resources(struct drm_atomic_state *old_staintel_display_power_put (dev_priv,POWER_DOMAIN_PIPE_A ); } + +intel_update_cdclk (dev); }static void valleyview_crtc_enable (struct drm_crtc *crtc)
@@ -9479,6 +9488,7 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv) }intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); +intel_update_cdclk (dev_priv->dev); }/*
@@ -13273,6 +13283,8 @@ static void intel_shared_dpll_init(struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; +intel_update_cdclk (dev); +if (HAS_DDI (dev))intel_ddi_pll_init (dev);else if (HAS_PCH_IBX (dev) ||HAS_PCH_CPT (dev))
@@ -14848,13 +14860,9 @@ static void i915_disable_vga(struct drm_device *dev)void intel_modeset_init_hw (struct drm_device *dev) { +intel_update_cdclk (dev);intel_prepare_ddi (dev); - -if (IS_VALLEYVIEW (dev)) -vlv_update_cdclk (dev); -intel_init_clock_gating (dev); -intel_enable_gt_powersave (dev); }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [PATCH v5 1/8] drm/i915: Cache current cdclk frequency in dev_priv
Quoted 5 lines · Mika Kahola
From: Ville Syrjälä <[email protected]>
Rather that extracting the current cdclk freuqncy every time someone wants to know it, cache the current value and use that. VLV/CHV already stored a cached value there so just expand that to cover all platforms.
All of the below:
Quoted 9 lines
Signed-off-by Ville Syrjälä <[email protected]>v2: Rebased to the latest
v3: Rebased to the latest
v4: Rebased to the latestSigned-off-by Mika Kahola <[email protected]>Author: Ville Syrjälä <[email protected]>
Should be turned into:
Quoted 6 lines
v2: Rebased to the latest
v3: Rebased to the latest
v4: Rebased to the latestSigned-off-by Ville Syrjälä <[email protected]>Signed-off-by Mika Kahola <[email protected]>
to conform to existing style. See git log for examples.
Damien had a comment to the previous version of this patch [1], but I don't see it addressed either in the patch or in reply to his mail. You should do one or the other.
BR,
Jani.
[1] http://mid.gmane.org/[email protected]
Quoted 99 lines
--- drivers/gpu/drm/i915/intel_display.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/intel_display.c +17
-9@@ -5747,7 +5747,7 @@ static int valleyview_get_vco(struct drm_i915_private *dev_priv)return vco_freq[hpll_freq] *1000 ; } -static void vlv_update_cdclk (struct drm_device *dev) +static void intel_update_cdclk (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;@@ -5760,7 +5760,14 @@ static void vlv_update_cdclk(struct drm_device *dev)* BSpec erroneously claims we should aim for 4MHz, but * in fact 1MHz is the correct frequency. */ -I915_WRITE (GMBUSFREQ_VLV ,DIV_ROUND_UP (dev_priv->cdclk_freq,1000 )); +if (IS_VALLEYVIEW (dev)) { +/* +* Program the gmbus_freq based on the cdclk frequency. +* BSpec erroneously claims we should aim for 4MHz, but +* in fact 1MHz is the correct frequency. +*/ +I915_WRITE (GMBUSFREQ_VLV ,DIV_ROUND_UP (dev_priv->cdclk_freq,1000 )); + } }/* Adjust CDclk dividers to allow high res or save power if possible */ @@ -5826,7 +5833,7 @@ static void valleyview_set_cdclk(struct drm_device *dev, int cdclk)mutex_unlock (&dev_priv->sb_lock); -vlv_update_cdclk (dev); +intel_update_cdclk (dev); }static void cherryview_set_cdclk (struct drm_device *dev,int cdclk)@@ -5867,7 +5874,7 @@ static void cherryview_set_cdclk(struct drm_device *dev, int cdclk) }mutex_unlock (&dev_priv->rps.hw_lock); -vlv_update_cdclk (dev); +intel_update_cdclk (dev); } static int valleyview_calc_cdclk(struct drm_i915_private *dev_priv,@@ -6056,6 +6063,8 @@ static void valleyview_modeset_global_resources(struct drm_atomic_state *old_staintel_display_power_put (dev_priv,POWER_DOMAIN_PIPE_A ); } + +intel_update_cdclk (dev); }static void valleyview_crtc_enable (struct drm_crtc *crtc)@@ -9479,6 +9488,7 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv) }intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); +intel_update_cdclk (dev_priv->dev); }/* @@ -13273,6 +13283,8 @@ static void intel_shared_dpll_init(struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; +intel_update_cdclk (dev); +if (HAS_DDI (dev))intel_ddi_pll_init (dev);else if (HAS_PCH_IBX (dev) ||HAS_PCH_CPT (dev))@@ -14848,13 +14860,9 @@ static void i915_disable_vga(struct drm_device *dev)void intel_modeset_init_hw (struct drm_device *dev) { +intel_update_cdclk (dev);intel_prepare_ddi (dev); - -if (IS_VALLEYVIEW (dev)) -vlv_update_cdclk (dev); -intel_init_clock_gating (dev); -intel_enable_gt_powersave (dev); }Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5 1/8] drm/i915: Cache current cdclk frequency in dev_priv
Quoted 34 lines · Jani Nikula
Quoted 5 lines · Mika Kahola
From: Ville Syrjälä <[email protected]>
Rather that extracting the current cdclk freuqncy every time someone wants to know it, cache the current value and use that. VLV/CHV already stored a cached value there so just expand that to cover all platforms.
All of the below:
Quoted 9 lines
Signed-off-by Ville Syrjälä <[email protected]>v2: Rebased to the latest
v3: Rebased to the latest
v4: Rebased to the latestSigned-off-by Mika Kahola <[email protected]>Author: Ville Syrjälä <[email protected]>
Should be turned into:
Quoted 6 lines
v2: Rebased to the latest
v3: Rebased to the latest
v4: Rebased to the latestSigned-off-by Ville Syrjälä <[email protected]>Signed-off-by Mika Kahola <[email protected]>to conform to existing style. See git log for examples.
Damien had a comment to the previous version of this patch [1], but I don't see it addressed either in the patch or in reply to his mail. You should do one or the other.
Quoted 6 lines
BR,
Jani.
Ok. I'll revise the patches and resend them.
Cheers,
Mika
Quoted 93 lines
Quoted 93 lines
--- drivers/gpu/drm/i915/intel_display.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/intel_display.c +17
-9@@ -5747,7 +5747,7 @@ static int valleyview_get_vco(struct drm_i915_private *dev_priv)return vco_freq[hpll_freq] *1000 ; } -static void vlv_update_cdclk (struct drm_device *dev) +static void intel_update_cdclk (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;@@ -5760,7 +5760,14 @@ static void vlv_update_cdclk(struct drm_device *dev)* BSpec erroneously claims we should aim for 4MHz, but * in fact 1MHz is the correct frequency. */ -I915_WRITE (GMBUSFREQ_VLV ,DIV_ROUND_UP (dev_priv->cdclk_freq,1000 )); +if (IS_VALLEYVIEW (dev)) { +/* +* Program the gmbus_freq based on the cdclk frequency. +* BSpec erroneously claims we should aim for 4MHz, but +* in fact 1MHz is the correct frequency. +*/ +I915_WRITE (GMBUSFREQ_VLV ,DIV_ROUND_UP (dev_priv->cdclk_freq,1000 )); + } }/* Adjust CDclk dividers to allow high res or save power if possible */ @@ -5826,7 +5833,7 @@ static void valleyview_set_cdclk(struct drm_device *dev, int cdclk)mutex_unlock (&dev_priv->sb_lock); -vlv_update_cdclk (dev); +intel_update_cdclk (dev); }static void cherryview_set_cdclk (struct drm_device *dev,int cdclk)@@ -5867,7 +5874,7 @@ static void cherryview_set_cdclk(struct drm_device *dev, int cdclk) }mutex_unlock (&dev_priv->rps.hw_lock); -vlv_update_cdclk (dev); +intel_update_cdclk (dev); } static int valleyview_calc_cdclk(struct drm_i915_private *dev_priv,@@ -6056,6 +6063,8 @@ static void valleyview_modeset_global_resources(struct drm_atomic_state *old_staintel_display_power_put (dev_priv,POWER_DOMAIN_PIPE_A ); } + +intel_update_cdclk (dev); }static void valleyview_crtc_enable (struct drm_crtc *crtc)@@ -9479,6 +9488,7 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv) }intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); +intel_update_cdclk (dev_priv->dev); }/* @@ -13273,6 +13283,8 @@ static void intel_shared_dpll_init(struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; +intel_update_cdclk (dev); +if (HAS_DDI (dev))intel_ddi_pll_init (dev);else if (HAS_PCH_IBX (dev) ||HAS_PCH_CPT (dev))@@ -14848,13 +14860,9 @@ static void i915_disable_vga(struct drm_device *dev)void intel_modeset_init_hw (struct drm_device *dev) { +intel_update_cdclk (dev);intel_prepare_ddi (dev); - -if (IS_VALLEYVIEW (dev)) -vlv_update_cdclk (dev); -intel_init_clock_gating (dev); -intel_enable_gt_powersave (dev); }
Quoted 8 lines
Quoted 7 lines
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 2/8 drm/i915: Use cached cdclk value
In reply to Mika KaholaFrom: Ville Syrjälä <[email protected]>
Rather than reading out the current cdclk value use the cached value we have tucked away in dev_priv.
v2: Rebased to the latest
v3: Rebased to the latest
Author: Ville Syrjälä <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 3 +-- drivers/gpu/drm/i915/intel_dp.c | 5 +++-- drivers/gpu/drm/i915/intel_pm.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -2
@@ -6612,8 +6612,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,/* FIXME should check pixel clock limits on all platforms */ if (INTEL_INFO (dev)->gen <4 ) { -int clock_limit = - dev_priv->display.get_display_clock_speed (dev); +int clock_limit = dev_priv->cdclk_freq;/* * Enable pixel doubling when the dot clock
drivers/gpu/drm/i915/intel_dp.c +3 -2
@@ -708,7 +708,8 @@ static uint32_t ilk_get_aux_clock_divider(struct intel_dp *intel_dp, int index)return 0 ;if (intel_dig_port->port ==PORT_A ) { -return DIV_ROUND_UP (dev_priv->display.get_display_clock_speed (dev),2000 ); +return DIV_ROUND_UP (dev_priv->cdclk_freq,2000 ); + }else {return DIV_ROUND_UP (intel_pch_rawclk (dev),2 ); }
@@ -723,7 +724,7 @@ static uint32_t hsw_get_aux_clock_divider(struct intel_dp *intel_dp, int index)if (intel_dig_port->port ==PORT_A ) {if (index)return 0 ; -return DIV_ROUND_CLOSEST (dev_priv->display.get_display_clock_speed (dev),2000 ); +return DIV_ROUND_CLOSEST (dev_priv->cdclk_freq,2000 ); }else if (dev_priv->pch_id ==INTEL_PCH_LPT_DEVICE_ID_TYPE ) {/* Workaround for non-ULT HSW */ switch (index) {
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -1815,7 +1815,7 @@ hsw_compute_linetime_wm(struct drm_device *dev, struct drm_crtc *crtc) linetime =DIV_ROUND_CLOSEST (mode->crtc_htotal *1000 *8 , mode->crtc_clock); ips_linetime =DIV_ROUND_CLOSEST (mode->crtc_htotal *1000 *8 , - dev_priv->display.get_display_clock_speed (dev_priv->dev)); + dev_priv->cdclk_freq);return PIPE_WM_LINETIME_IPS_LINETIME (ips_linetime) |PIPE_WM_LINETIME_TIME (linetime);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 3/8 drm/i915: Unify ilk and hsw .get_aux_clock_divider
In reply to Mika KaholaFrom: Ville Syrjälä <[email protected]>
ilk_get_aux_clock_divider() is now a subset ofhsw_get_aux_clock_divider() so unify them.
v2: Rebased to the latest
v3: Rebased to the latest
Author: Ville Syrjälä <[email protected]>
--- drivers/gpu/drm/i915/intel_dp.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +3 -20
@@ -704,23 +704,6 @@ static uint32_t ilk_get_aux_clock_divider(struct intel_dp *intel_dp, int index)struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv = dev->dev_private; -if (index) -return 0 ; - -if (intel_dig_port->port ==PORT_A ) { -return DIV_ROUND_UP (dev_priv->cdclk_freq,2000 ); - - }else { -return DIV_ROUND_UP (intel_pch_rawclk (dev),2 ); - } -} - -static uint32_t hsw_get_aux_clock_divider (struct intel_dp *intel_dp,int index) -{ -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv = dev->dev_private; -if (intel_dig_port->port ==PORT_A ) {if (index)return 0 ;
@@ -733,7 +716,9 @@ static uint32_t hsw_get_aux_clock_divider(struct intel_dp *intel_dp, int index)default :return 0 ; } }else { -return index ?0 :DIV_ROUND_UP (intel_pch_rawclk (dev),2 ); +if (index) +return 0 ; +return DIV_ROUND_UP (intel_pch_rawclk (dev),2 ); } }
@@ -5746,8 +5731,6 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, intel_dp->get_aux_clock_divider = skl_get_aux_clock_divider; else if (IS_VALLEYVIEW(dev)) intel_dp->get_aux_clock_divider = vlv_get_aux_clock_divider; - else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) - intel_dp->get_aux_clock_divider = hsw_get_aux_clock_divider; else if (HAS_PCH_SPLIT(dev)) intel_dp->get_aux_clock_divider = ilk_get_aux_clock_divider; else
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 4/8 drm/i915: Store max cdclk value in dev_priv
In reply to Mika KaholaFrom: Ville Syrjälä <[email protected]>
Keep the cdclk maximum supported frequency around in dev_priv so that we can verify certain things against it before actually changing the cdclk frequency.
For now only VLV/CHV have support changing cdclk frequency, so other plarforms get to assume cdclk is fixed.
v2: Rebased to the latest
v3: Rebased to the latest
Author: Ville Syrjälä <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_display.c | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -1743,7 +1743,7 @@ struct drm_i915_private {unsigned int fsb_freq, mem_freq, is_ddr3;unsigned int skl_boot_cdclk; -unsigned int cdclk_freq; +unsigned int cdclk_freq, max_cdclk_freq;unsigned int hpll_freq;/**
drivers/gpu/drm/i915/intel_display.c +19 -1
@@ -5747,6 +5747,21 @@ static int valleyview_get_vco(struct drm_i915_private *dev_priv)return vco_freq[hpll_freq] *1000 ; } +static void intel_update_max_cdclk (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; + +if (IS_VALLEYVIEW (dev)) { + dev_priv->max_cdclk_freq =400000 ; + }else { +/* otherwise assume cdclk is fixed */ + dev_priv->max_cdclk_freq = dev_priv->cdclk_freq; + } + +DRM_DEBUG_DRIVER ("Max CD clock rate: %d kHz\n" , + dev_priv->max_cdclk_freq); +} +static void intel_update_cdclk (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -5768,6 +5783,9 @@ static void intel_update_cdclk(struct drm_device *dev)*/ I915_WRITE (GMBUSFREQ_VLV ,DIV_ROUND_UP (dev_priv->cdclk_freq,1000 )); } + +if (dev_priv->max_cdclk_freq ==0 ) +intel_update_max_cdclk (dev); }/* Adjust CDclk dividers to allow high res or save power if possible */
@@ -6612,7 +6630,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,/* FIXME should check pixel clock limits on all platforms */ if (INTEL_INFO (dev)->gen <4 ) { -int clock_limit = dev_priv->cdclk_freq; +int clock_limit = dev_priv->max_cdclk_freq;/* * Enable pixel doubling when the dot clock
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 5/8 drm/i915: Don't enable IPS when pixel rate exceeds 95%
In reply to Mika KaholaFrom: Ville Syrjälä <[email protected]>
Bspec says we shouldn't enable IPS on BDW when the pipe pixel rate exceeds 95% of the core display clock. Apparently this can cause underruns.
There's no similar restriction listed for HSW, so leave that one alone for now.
v2: Add pipe_config_supports_ips() (Chris)
v3: Compare against the max cdclk insted of the current cdclk
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83497
v4: Rebased to the latest
v5: Rebased to the latest
Author: Ville Syrjälä <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 30 ++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_pm.c | 17 ++++++++--------- 3 files changed, 37 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/intel_display.c +28 -2
@@ -6612,12 +6612,38 @@ retry:return ret; } +static bool pipe_config_supports_ips (struct drm_i915_private *dev_priv, +struct intel_crtc_state *pipe_config) +{ +if (pipe_config->pipe_bpp >24 ) +return false; + +/* HSW can handle pixel rate up to cdclk? */ +if (IS_HASWELL (dev_priv->dev)) +return true; + +/* +* FIXME if we compare against max we should then +* increase the cdclk frequency when the current +* value is too low. The other option is to compare +* against the cdclk frequency we're going have post +* modeset (ie. one we computed using other constraints). +* Need to measure whether using a lower cdclk w/o IPS +* is better or worse than a higher cdclk w/ IPS. +*/ +return ilk_pipe_pixel_rate (pipe_config) <= + dev_priv->max_cdclk_freq *95 /100 ; +} +static void hsw_compute_ips_config (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config) { +struct drm_device *dev = crtc->base.dev; +struct drm_i915_private *dev_priv = dev->dev_private; + pipe_config->ips_enabled = i915.enable_ips && -hsw_crtc_supports_ips (crtc) && - pipe_config->pipe_bpp <=24 ; +hsw_crtc_supports_ips (crtc) && +pipe_config_supports_ips (dev_priv, pipe_config); } static int intel_crtc_compute_config(struct intel_crtc *crtc,
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -1375,7 +1375,7 @@ void ilk_wm_get_hw_state(struct drm_device *dev);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 */ ); - +uint32_t ilk_pipe_pixel_rate (const struct intel_crtc_state *pipe_config);/* intel_sdvo.c */ bool intel_sdvo_init (struct drm_device *dev,uint32_t sdvo_reg,bool is_sdvob);
drivers/gpu/drm/i915/intel_pm.c +8 -9
@@ -1434,23 +1434,22 @@ static void i845_update_wm(struct drm_crtc *unused_crtc)I915_WRITE (FW_BLC , fwater_lo); } -static uint32_t ilk_pipe_pixel_rate (struct drm_device *dev, -struct drm_crtc *crtc) +uint32_t ilk_pipe_pixel_rate (const struct intel_crtc_state *pipe_config) { -struct intel_crtc *intel_crtc =to_intel_crtc (crtc);uint32_t pixel_rate; - pixel_rate = intel_crtc->config->base.adjusted_mode.crtc_clock; + pixel_rate = pipe_config->base.adjusted_mode.crtc_clock;/* We only use IF-ID interlacing. If we ever use PF-ID we'll need to * adjust the pixel_rate here. */ -if (intel_crtc->config->pch_pfit.enabled) { +if (pipe_config->pch_pfit.enabled) {uint64_t pipe_w, pipe_h, pfit_w, pfit_h; -uint32_t pfit_size = intel_crtc->config->pch_pfit.size; +uint32_t pfit_size = pipe_config->pch_pfit.size; + + pipe_w = pipe_config->pipe_src_w; + pipe_h = pipe_config->pipe_src_h; - pipe_w = intel_crtc->config->pipe_src_w; - pipe_h = intel_crtc->config->pipe_src_h; pfit_w = (pfit_size >>16 ) &0xFFFF ; pfit_h = pfit_size &0xFFFF ;if (pipe_w < pfit_w)
@@ -2066,7 +2065,7 @@ static void ilk_compute_wm_parameters(struct drm_crtc *crtc, p->active = true; p->pipe_htotal = intel_crtc->config->base.adjusted_mode.crtc_htotal; - p->pixel_rate =ilk_pipe_pixel_rate (dev, crtc); + p->pixel_rate =ilk_pipe_pixel_rate (intel_crtc->config);if (crtc->primary->state->fb) p->pri.bytes_per_pixel =
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 6/8 drm/i915: Add IS_BDW_ULX
In reply to Mika KaholaFrom: Ville Syrjälä <[email protected]>
We need to tell BDW ULT and ULX apart.
v2: Rebased to the latest
v3: Rebased to the latest
Author: Ville Syrjälä <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.h | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -2399,6 +2399,9 @@ struct drm_i915_cmd_table { ((INTEL_DEVID(dev) & 0xf) == 0x6 || \ (INTEL_DEVID(dev) & 0xf) == 0xb || \ (INTEL_DEVID(dev) & 0xf) == 0xe)) +/* ULX machines are also considered ULT. */ +#define IS_BDW_ULX (dev) (IS_BROADWELL(dev) && \ + (INTEL_DEVID(dev) & 0xf) == 0xe)#define IS_BDW_GT3 (dev) (IS_BROADWELL(dev) && \ (INTEL_DEVID(dev) & 0x00F0) == 0x0020)#define IS_HSW_ULT (dev) (IS_HASWELL(dev) && \
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 7/8 drm/i915: BDW clock change support
In reply to Mika KaholaFrom: Ville Syrjälä <[email protected]>
Add support for changing cdclk frequency during runtime on BDW. The procedure is quite a bit different on BDW from the one on HSW, so add a separate function for it.
Also with IPS enabled the actual pixel rate mustn't exceed 95% of cdclk, so take that into account when computing the max pixel rate.
v2: Grab rps.hw_lock around sandybridge_pcode_write()
v3: Rebase due to power well vs. .global_resources() reordering
v4: Rebased to the latest
v5: Rebased to the latest
v6: Patch order shuffle so that Broadwell CD clock change is
applied before the patch for Haswell CD clock change
Author: Ville Syrjälä <[email protected]>
--- drivers/gpu/drm/i915/i915_reg.h | 2 + drivers/gpu/drm/i915/intel_display.c | 216 +++++++++++++++++++++++++++++++++-- 2 files changed, 208 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -6705,6 +6705,7 @@ enum skl_disp_power_wells {#define GEN6_PCODE_READ_RC6VIDS 0x5#define GEN6_ENCODE_RC6_VID (mv) (((mv) - 245) / 5)#define GEN6_DECODE_RC6_VID (vids) (((vids) * 5) + 245) +#define BDW_PCODE_DISPLAY_FREQ_CHANGE_REQ 0x18#define GEN9_PCODE_READ_MEM_LATENCY 0x6#define GEN9_MEM_LATENCY_LEVEL_MASK 0xFF#define GEN9_MEM_LATENCY_LEVEL_1_5_SHIFT 8
@@ -7170,6 +7171,7 @@ enum skl_disp_power_wells {#define LCPLL_CLK_FREQ_337_5_BDW (2<<26)#define LCPLL_CLK_FREQ_675_BDW (3<<26)#define LCPLL_CD_CLOCK_DISABLE (1<<25) +#define LCPLL_ROOT_CD_CLOCK_DISABLE (1<<24)#define LCPLL_CD2X_CLOCK_DISABLE (1<<23)#define LCPLL_POWER_DOWN_ALLOW (1<<22)#define LCPLL_CD_SOURCE_FCLK (1<<21)
drivers/gpu/drm/i915/intel_display.c +206 -10
246 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 8/8 drm/i915: HSW cdclk support
In reply to Mika KaholaFrom: Ville Syrjälä <[email protected]>
Implement support for changing the cdclk frequency during runtime on HSW. VLV/CHV already have support for this, so we can follow their example for the most part. Only the actual hardware programming differs, the rest is pretty much the same.
The pipe pixel rate stuff is handled a bit differently for now due to the difference in pch vs. gmch pfit handling. Eventually we should unify that part to eliminate what is essentially duplicated code.
v2: Grab rps.hw_lock around sandybridge_pcode_write()
v3: Rebase due to power well vs. .global_resources() reordering
v3: Rebased to the latest
v4: Reformatting 'haswell_modeset_global_pipes' function to
support atomic state
v5: Shuffling the patch order so the Broadwell CD clock patch
can be applied before this Haswell CD clock patch
Author: Ville Syrjälä <[email protected]>
--- drivers/gpu/drm/i915/i915_reg.h | 2 + drivers/gpu/drm/i915/intel_display.c | 137 ++++++++++++++++++++++++++++++++++- 2 files changed, 136 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -6705,6 +6705,7 @@ enum skl_disp_power_wells {#define GEN6_PCODE_READ_RC6VIDS 0x5#define GEN6_ENCODE_RC6_VID (mv) (((mv) - 245) / 5)#define GEN6_DECODE_RC6_VID (vids) (((vids) * 5) + 245) +#define HSW_PCODE_DE_WRITE_FREQ_REQ 0x17#define BDW_PCODE_DISPLAY_FREQ_CHANGE_REQ 0x18#define GEN9_PCODE_READ_MEM_LATENCY 0x6#define GEN9_MEM_LATENCY_LEVEL_MASK 0xFF
@@ -7167,6 +7168,7 @@ enum skl_disp_power_wells {#define LCPLL_PLL_LOCK (1<<30)#define LCPLL_CLK_FREQ_MASK (3<<26)#define LCPLL_CLK_FREQ_450 (0<<26) +#define LCPLL_CLK_FREQ_ALT_HSW (1<<26)/* 337.5 (ULX) or 540 */ #define LCPLL_CLK_FREQ_54O_BDW (1<<26)#define LCPLL_CLK_FREQ_337_5_BDW (2<<26)#define LCPLL_CLK_FREQ_675_BDW (3<<26)
drivers/gpu/drm/i915/intel_display.c +134 -3
170 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5 8/8] drm/i915: HSW cdclk support
Task id: 6518 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 276/276 276/276 ILK 303/303 303/303 SNB -1 315/315 314/315 IVB 343/343 343/343 BYT 287/287 287/287
BDW -1 321/321 320/321
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*SNB igt@pm_rpm@dpms-mode-unset-non-lpsp PASS(1) DMESG_WARN(1)
(dmesg patch applied)WARNING:at_drivers/gpu/drm/i915/intel_uncore.c:#assert_device_not_suspended[i915]()@WARNING:.* at .* assert_device_not_suspended+0x
*BDW igt@gem_flink_race@flink_name PASS(1) DMESG_WARN(1)
(dmesg patch applied)WARNING:at_drivers/gpu/drm/i915/intel_display.c:#assert_plane[i915]()@WARNING:.* at .* assert_plane assertion_failure@assertion failure
WARNING:at_drivers/gpu/drm/drm_irq.c:#drm_wait_one_vblank[drm]()@WARNING:.* at .* drm_wait_one_vblank+0x
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 2 lines · Mika Kahola
This patch series rebases Ville's original cdclk patch series
excluding the ones that has already been reviewed.
FYI, When a patch that has been reviewed is resent, we usually but the r-b tags tags along (yes, I know, confusing with what has been said before)
Signature · 5 lines
Damien _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx