Check pixel clock when setting mode
Subsystems (2)
v3 cover Check pixel clock when setting mode
From EDID we can read and request higher pixel clock than our HW can support. This set of patches add checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock. For example for Cherryview
'cvt 2560 1600 60' gives
# 2560x1600 59.99 Hz (CVT 4.10MA) hsync: 99.46 kHz; pclk: 348.50 MHz Modeline "2560x1600_60.00" 348.50 2560 2760 3032 3504 1600 1603 1609 1658 -hsync +vsync
where pixel clock 348.50 MHz is higher than the supported 304 MHz.
The checks are implemented for DisplayPort, HDMI, LVDS, DVO, SDVO, DSI, CRT, TV, and DP-MST.
V2:
- The maximum DOT clock frequency is added to debugfs i915_frequency_info.
- max dotclock cached in dev_priv structure
- moved computation of max dotclock to 'intel_display.c'
V3:
- intel_update_max_dotclk() renamed as intel_compute_max_dotclk()
- for GEN9 and above the max dotclock frequency is equal to CD clock frequency
- for older generations the dot clock frequency is limited to 90% of the CD clock frequency
- For Cherryview the dot clock is limited to 95% of CD clock frequency
- for GEN2/3 the maximum dot clock frequency is limited to 90% of the 2X CD clock frequency as we have on option to use double wide mode
- cleanup
Mika Kahola (11):
drm/i915: Store max dotclock
drm/i915: DisplayPort pixel clock check
drm/i915: HDMI pixel clock check
drm/i915: LVDS pixel clock check
drm/i915: SDVO pixel clock check
drm/i915: DSI pixel clock check
drm/i915: CRT pixel clock check
drm/i915: TV pixel clock check
drm/i915: DisplayPort-MST pixel clock check
drm/i915: DVO pixel clock check
drm/i915: Max DOT clock frequency to debugfs
drivers/gpu/drm/i915/i915_debugfs.c | 2 ++ drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_crt.c | 4 ++++ drivers/gpu/drm/i915/intel_display.c | 19 +++++++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 3 ++- drivers/gpu/drm/i915/intel_dp_mst.c | 5 +++++ drivers/gpu/drm/i915/intel_dsi.c | 4 ++++ drivers/gpu/drm/i915/intel_dvo.c | 4 ++++ drivers/gpu/drm/i915/intel_hdmi.c | 4 ++++ drivers/gpu/drm/i915/intel_lvds.c | 3 +++ drivers/gpu/drm/i915/intel_sdvo.c | 4 ++++ drivers/gpu/drm/i915/intel_tv.c | 4 ++++ 12 files changed, 56 insertions(+), 1 deletion(-)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/11 drm/i915: Store max dotclock
Store max dotclock into dev_priv structure so we are able to filter out the modes that are not supported by our platforms.
V2:
- limit the max dot clock frequency to max CD clock frequency for the gen9 and above
- limit the max dot clock frequency to 90% of the max CD clock frequency for the older gens
- for Cherryview the max dot clock frequency is limited to 95% of the max CD clock frequency
- for gen2 and gen3 the max dot clock limit is set to 90% of the 2X max CD clock frequency
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_display.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -1777,6 +1777,7 @@ struct drm_i915_private {unsigned int fsb_freq, mem_freq, is_ddr3;unsigned int skl_boot_cdclk;unsigned int cdclk_freq, max_cdclk_freq; +unsigned int max_dotclk;unsigned int hpll_freq;/**
drivers/gpu/drm/i915/intel_display.c +19 -0
@@ -5259,6 +5259,23 @@ static void modeset_update_crtc_power_domains(struct drm_atomic_state *state)modeset_put_power_domains (dev_priv, put_domains[i]); } +static int intel_compute_max_dotclk (struct drm_i915_private *dev_priv) +{ +int max_cdclk_freq = dev_priv->max_cdclk_freq; +int max_dotclk_freq; + +if (INTEL_INFO (dev_priv)->gen >=9 ) + max_dotclk_freq = max_cdclk_freq; +else if (IS_CHERRYVIEW (dev_priv)) + max_dotclk_freq =DIV_ROUND_UP (max_cdclk_freq *95 ,100 ); +else if (INTEL_INFO (dev_priv)->gen ==2 ||INTEL_INFO (dev_priv)->gen ==3 ) + max_dotclk_freq =DIV_ROUND_UP (2 * max_cdclk_freq *90 ,100 ); +else + max_dotclk_freq =DIV_ROUND_UP (max_cdclk_freq *90 ,100 ); + +return max_dotclk_freq; +} +static void intel_update_max_cdclk (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -5298,6 +5315,8 @@ static void intel_update_max_cdclk(struct drm_device *dev) dev_priv->max_cdclk_freq = dev_priv->cdclk_freq; } + dev_priv->max_dotclk =intel_compute_max_dotclk (dev_priv); +DRM_DEBUG_DRIVER ("Max CD clock rate: %d kHz\n" , dev_priv->max_cdclk_freq); }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 01/11] drm/i915: Store max dotclock
Quoted 25 lines · Mika Kahola
Store max dotclock into
dev_privstructure so we are able to filter out the modes that are not supported by our platforms.V2:
- limit the max dot clock frequency to max CD clock frequency for the gen9 and above
- limit the max dot clock frequency to 90% of the max CD clock frequency for the older gens
- for Cherryview the max dot clock frequency is limited to 95% of the max CD clock frequency
- for gen2 and gen3 the max dot clock limit is set to 90% of the 2X max CD clock frequencySigned-off-by Mika Kahola <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_display.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+)drivers/gpu/drm/i915/i915_drv.h +0
-0
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_private { · line 1780
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -1777,6 +1777,7 @@ struct drm_i915_private {unsigned int fsb_freq, mem_freq, is_ddr3;unsigned int skl_boot_cdclk;unsigned int cdclk_freq, max_cdclk_freq; +unsigned int max_dotclk;
nit: maybe max_dotclk_freq for extra consistentcy?
Quoted 11 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0unsigned int hpll_freq;/** drivers/gpu/drm/i915/intel_display.c +0
-0@@ -5259,6 +5259,23 @@ static void modeset_update_crtc_power_domains(struct drm_atomic_state *state)modeset_put_power_domains (dev_priv, put_domains[i]); }
drivers/gpu/drm/i915/intel_display.c static void modeset_update_crtc_power_domains(struct drm_atomic_state *state) · line 5271
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +10
-0+static int intel_compute_max_dotclk (struct drm_i915_private *dev_priv) +{ +int max_cdclk_freq = dev_priv->max_cdclk_freq; +int max_dotclk_freq; + +if (INTEL_INFO (dev_priv)->gen >=9 ) + max_dotclk_freq = max_cdclk_freq; +else if (IS_CHERRYVIEW (dev_priv)) + max_dotclk_freq =DIV_ROUND_UP (max_cdclk_freq *95 ,100 ); +else if (INTEL_INFO (dev_priv)->gen ==2 ||INTEL_INFO (dev_priv)->gen ==3 )
intel_crtc_compute_config() uses 'gen < 4' as the condition around the double_wide handling. Maybe do the same here for consistency.
drivers/gpu/drm/i915/intel_display.c static void modeset_update_crtc_power_domains(struct drm_atomic_state *state) · line 5274
Quoted 3 lines
drivers/gpu/drm/i915/intel_display.c +3
-0+ max_dotclk_freq =DIV_ROUND_UP (2 * max_cdclk_freq *90 ,100 ); + else + max_dotclk_freq =DIV_ROUND_UP (max_cdclk_freq *90 ,100 );
These should round down to match what we do in the calc_cdclk funcs.
Also to add another bikeshed color, there's no need for the local max_dotclk_freq variable, you can just 'return <whatever>' from each branch.
With at least the rounding fixed this can have
Quoted 23 lines
drivers/gpu/drm/i915/intel_display.c +6
-0+ +return max_dotclk_freq; +} +static void intel_update_max_cdclk (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;@@ -5298,6 +5315,8 @@ static void intel_update_max_cdclk(struct drm_device *dev) dev_priv->max_cdclk_freq = dev_priv->cdclk_freq; } + dev_priv->max_dotclk =intel_compute_max_dotclk (dev_priv); +DRM_DEBUG_DRIVER ("Max CD clock rate: %d kHz\n" , dev_priv->max_cdclk_freq); }Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 01/11] drm/i915: Store max dotclock
Quoted 82 lines · Ville Syrjälä
Quoted 25 lines · Mika Kahola
Store max dotclock into
dev_privstructure so we are able to filter out the modes that are not supported by our platforms.V2:
- limit the max dot clock frequency to max CD clock frequency for the gen9 and above
- limit the max dot clock frequency to 90% of the max CD clock frequency for the older gens
- for Cherryview the max dot clock frequency is limited to 95% of the max CD clock frequency
- for gen2 and gen3 the max dot clock limit is set to 90% of the 2X max CD clock frequencySigned-off-by Mika Kahola <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_display.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+)drivers/gpu/drm/i915/i915_drv.h +0
-0drivers/gpu/drm/i915/i915_drv.h struct drm_i915_private { · line 1780
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -1777,6 +1777,7 @@ struct drm_i915_private {unsigned int fsb_freq, mem_freq, is_ddr3;unsigned int skl_boot_cdclk;unsigned int cdclk_freq, max_cdclk_freq; +unsigned int max_dotclk;nit: maybe
max_dotclk_freqfor extra consistentcy?Quoted 11 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0unsigned int hpll_freq;/** drivers/gpu/drm/i915/intel_display.c +0
-0@@ -5259,6 +5259,23 @@ static void modeset_update_crtc_power_domains(struct drm_atomic_state *state)modeset_put_power_domains (dev_priv, put_domains[i]); }drivers/gpu/drm/i915/intel_display.c static void modeset_update_crtc_power_domains(struct drm_atomic_state *state) · line 5271
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +10
-0+static int intel_compute_max_dotclk (struct drm_i915_private *dev_priv) +{ +int max_cdclk_freq = dev_priv->max_cdclk_freq; +int max_dotclk_freq; + +if (INTEL_INFO (dev_priv)->gen >=9 ) + max_dotclk_freq = max_cdclk_freq; +else if (IS_CHERRYVIEW (dev_priv)) + max_dotclk_freq =DIV_ROUND_UP (max_cdclk_freq *95 ,100 ); +else if (INTEL_INFO (dev_priv)->gen ==2 ||INTEL_INFO (dev_priv)->gen ==3 )
intel_crtc_compute_config()uses 'gen < 4' as the condition around thedouble_widehandling. Maybe do the same here for consistency.drivers/gpu/drm/i915/intel_display.c static void modeset_update_crtc_power_domains(struct drm_atomic_state *state) · line 5274
Quoted 3 lines
drivers/gpu/drm/i915/intel_display.c +3
-0+ max_dotclk_freq =DIV_ROUND_UP (2 * max_cdclk_freq *90 ,100 ); + else + max_dotclk_freq =DIV_ROUND_UP (max_cdclk_freq *90 ,100 );These should round down to match what we do in the
calc_cdclkfuncs.Also to add another bikeshed color, there's no need for the local
max_dotclk_freqvariable, you can just 'return <whatever>' from each branch.With at least the rounding fixed this can have
Reviewed-by Ville Syrjälä <[email protected]>Quoted 11 lines
drivers/gpu/drm/i915/intel_display.c +4
-0+ +return max_dotclk_freq; +} +static void intel_update_max_cdclk (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;@@ -5298,6 +5315,8 @@ static void intel_update_max_cdclk(struct drm_device *dev) dev_priv->max_cdclk_freq = dev_priv->cdclk_freq; }
Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c static void intel_update_max_cdclk(struct drm_device *dev) · line 5321
Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c +2
-0+ dev_priv->max_dotclk =intel_compute_max_dotclk (dev_priv); +DRM_DEBUG_DRIVER ("Max CD clock rate: %d kHz\n" , dev_priv->max_cdclk_freq);
Oh and I think it would be nice to add a DRM_DEBUG_DRIVER for the compute max_dotclk so that we'll have it handy in bug reports without having to recompute it in ones head.
Quoted 12 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_display.c +0
-0}Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 2 lines
Ville Syrjälä Intel OTC
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 01/11] drm/i915: Store max dotclock
Quoted 83 lines · Ville Syrjälä
Quoted 82 lines · Ville Syrjälä
Quoted 25 lines · Mika Kahola
Store max dotclock into
dev_privstructure so we are able to filter out the modes that are not supported by our platforms.V2:
- limit the max dot clock frequency to max CD clock frequency for the gen9 and above
- limit the max dot clock frequency to 90% of the max CD clock frequency for the older gens
- for Cherryview the max dot clock frequency is limited to 95% of the max CD clock frequency
- for gen2 and gen3 the max dot clock limit is set to 90% of the 2X max CD clock frequencySigned-off-by Mika Kahola <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_display.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+)drivers/gpu/drm/i915/i915_drv.h +0
-0drivers/gpu/drm/i915/i915_drv.h struct drm_i915_private { · line 1780
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -1777,6 +1777,7 @@ struct drm_i915_private {unsigned int fsb_freq, mem_freq, is_ddr3;unsigned int skl_boot_cdclk;unsigned int cdclk_freq, max_cdclk_freq; +unsigned int max_dotclk;nit: maybe
max_dotclk_freqfor extra consistentcy?Quoted 11 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0unsigned int hpll_freq;/** drivers/gpu/drm/i915/intel_display.c +0
-0@@ -5259,6 +5259,23 @@ static void modeset_update_crtc_power_domains(struct drm_atomic_state *state)modeset_put_power_domains (dev_priv, put_domains[i]); }drivers/gpu/drm/i915/intel_display.c static void modeset_update_crtc_power_domains(struct drm_atomic_state *state) · line 5271
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +10
-0+static int intel_compute_max_dotclk (struct drm_i915_private *dev_priv) +{ +int max_cdclk_freq = dev_priv->max_cdclk_freq; +int max_dotclk_freq; + +if (INTEL_INFO (dev_priv)->gen >=9 ) + max_dotclk_freq = max_cdclk_freq; +else if (IS_CHERRYVIEW (dev_priv)) + max_dotclk_freq =DIV_ROUND_UP (max_cdclk_freq *95 ,100 ); +else if (INTEL_INFO (dev_priv)->gen ==2 ||INTEL_INFO (dev_priv)->gen ==3 )
intel_crtc_compute_config()uses 'gen < 4' as the condition around thedouble_widehandling. Maybe do the same here for consistency.drivers/gpu/drm/i915/intel_display.c static void modeset_update_crtc_power_domains(struct drm_atomic_state *state) · line 5274
Quoted 3 lines
drivers/gpu/drm/i915/intel_display.c +3
-0+ max_dotclk_freq =DIV_ROUND_UP (2 * max_cdclk_freq *90 ,100 ); + else + max_dotclk_freq =DIV_ROUND_UP (max_cdclk_freq *90 ,100 );These should round down to match what we do in the
calc_cdclkfuncs.Also to add another bikeshed color, there's no need for the local
max_dotclk_freqvariable, you can just 'return <whatever>' from each branch.With at least the rounding fixed this can have
Reviewed-by Ville Syrjälä <[email protected]>Quoted 11 lines
drivers/gpu/drm/i915/intel_display.c +4
-0+ +return max_dotclk_freq; +} +static void intel_update_max_cdclk (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;@@ -5298,6 +5315,8 @@ static void intel_update_max_cdclk(struct drm_device *dev) dev_priv->max_cdclk_freq = dev_priv->cdclk_freq; }
Quoted 9 lines
Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c static void intel_update_max_cdclk(struct drm_device *dev) · line 5321
Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c +2
-0+ dev_priv->max_dotclk =intel_compute_max_dotclk (dev_priv); +DRM_DEBUG_DRIVER ("Max CD clock rate: %d kHz\n" , dev_priv->max_cdclk_freq);Oh and I think it would be nice to add a
DRM_DEBUG_DRIVERfor the computemax_dotclkso that we'll have it handy in bug reports without having to recompute it in ones head.
Thanks Ville for the review. I will work my way up towards v4 based on your comments.
Cheers,
Mika
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c +0
-0}Signature · 1 line
1.9.1
Quoted 9 lines
Quoted 8 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 2 lines
Ville Syrjälä Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 2/11 drm/i915: DisplayPort pixel clock check
In reply to Mika KaholaIt is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to DisplayPort.
V2:
- removed computation for max DOT clock
V3:
- cleanup by removing unnecessary lines
--- drivers/gpu/drm/i915/intel_dp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +2 -1
@@ -206,6 +206,7 @@ intel_dp_mode_valid(struct drm_connector *connector,struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;int target_clock = mode->clock;int max_rate, mode_rate, max_lanes, max_link_clock; +int max_pixclk =to_i915 (connector->dev)->max_dotclk;if (is_edp (intel_dp) && fixed_mode) {if (mode->hdisplay > fixed_mode->hdisplay)
@@ -223,7 +224,7 @@ intel_dp_mode_valid(struct drm_connector *connector, max_rate =intel_dp_max_data_rate (max_link_clock, max_lanes); mode_rate =intel_dp_link_required (target_clock,18 ); -if (mode_rate > max_rate) +if (mode_rate > max_rate || target_clock > max_pixclk)return MODE_CLOCK_HIGH ;if (mode->clock <10000 )
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 02/11] drm/i915: DisplayPort pixel clock check
Quoted 32 lines · Mika Kahola
It is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to DisplayPort.
V2:
- removed computation for max DOT clockV3:
- cleanup by removing unnecessary linesSigned-off-by Mika Kahola <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_dp.c +1
-0@@ -206,6 +206,7 @@ intel_dp_mode_valid(struct drm_connector *connector,struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;int target_clock = mode->clock;int max_rate, mode_rate, max_lanes, max_link_clock; +int max_pixclk =to_i915 (connector->dev)->max_dotclk;if (is_edp (intel_dp) && fixed_mode) {if (mode->hdisplay > fixed_mode->hdisplay)
drivers/gpu/drm/i915/intel_dp.c intel_dp_mode_valid(struct drm_connector *connector, · line 228
Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -223,7 +224,7 @@ intel_dp_mode_valid(struct drm_connector *connector, max_rate =intel_dp_max_data_rate (max_link_clock, max_lanes); mode_rate =intel_dp_link_required (target_clock,18 ); -if (mode_rate > max_rate) +if (mode_rate > max_rate || target_clock > max_pixclk)return MODE_CLOCK_HIGH ;
This one ends up checking the fixed_mode clock every time, but I think I already declared that to OK, so let's go with it.
Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c +0
-0if (mode->clock <10000 )Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 3/11 drm/i915: HDMI pixel clock check
In reply to Mika KaholaIt is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to HDMI.
V2:
- removed computation for max dot clock
V3:
- cleanup by removing unnecessary lines
--- drivers/gpu/drm/i915/intel_hdmi.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/intel_hdmi.c +4 -0
@@ -1193,10 +1193,14 @@ intel_hdmi_mode_valid(struct drm_connector *connector,struct drm_device *dev =intel_hdmi_to_dev (hdmi);enum drm_mode_status status;int clock; +int max_pixclk =to_i915 (connector->dev)->max_dotclk;if (mode->flags &DRM_MODE_FLAG_DBLSCAN )return MODE_NO_DBLESCAN ; +if (mode->clock > max_pixclk) +return MODE_CLOCK_HIGH ; + clock = mode->clock;if (mode->flags &DRM_MODE_FLAG_DBLCLK ) clock *=2 ;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 03/11] drm/i915: HDMI pixel clock check
Quoted 26 lines · Mika Kahola
It is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to HDMI.
V2:
- removed computation for max dot clockV3:
- cleanup by removing unnecessary linesSigned-off-by Mika Kahola <[email protected]>--- drivers/gpu/drm/i915/intel_hdmi.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/gpu/drm/i915/intel_hdmi.c +0
-0@@ -1193,10 +1193,14 @@ intel_hdmi_mode_valid(struct drm_connector *connector,struct drm_device *dev =intel_hdmi_to_dev (hdmi);enum drm_mode_status status;
drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_mode_valid(struct drm_connector *connector, · line 1204
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4
-0int clock; +int max_pixclk =to_i915 (connector->dev)->max_dotclk;if (mode->flags &DRM_MODE_FLAG_DBLSCAN )return MODE_NO_DBLESCAN ; +if (mode->clock > max_pixclk) +return MODE_CLOCK_HIGH ; + clock = mode->clock;
I believe we should do something like this here:
clock = mode->clock; if ((mode->flags & DRM_MODE_FLAG_3D_MASK) == DRM_MODE_FLAG_3D_FRAME_PACKING) clock *= 2; if (clock > max_pixclk) return MODE_CLOCK_HIGH;
drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_mode_valid(struct drm_connector *connector, · line 1206
Quoted 2 lines
drivers/gpu/drm/i915/intel_hdmi.c +0
-0if (mode->flags &DRM_MODE_FLAG_DBLCLK ) clock *=2 ;
The stero handling should probably be in a separate patch, but in preparation for it you could already put the dotclk check between the clock= assigment and the DBCLK doubling (since DBLCLK only affects the port_clock and not pixel clock).
Quoted 7 lines
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 03/11] drm/i915: HDMI pixel clock check
Quoted 40 lines · Ville Syrjälä
Quoted 26 lines · Mika Kahola
It is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to HDMI.
V2:
- removed computation for max dot clockV3:
- cleanup by removing unnecessary linesSigned-off-by Mika Kahola <[email protected]>--- drivers/gpu/drm/i915/intel_hdmi.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/gpu/drm/i915/intel_hdmi.c +0
-0@@ -1193,10 +1193,14 @@ intel_hdmi_mode_valid(struct drm_connector *connector,struct drm_device *dev =intel_hdmi_to_dev (hdmi);enum drm_mode_status status;drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_mode_valid(struct drm_connector *connector, · line 1204
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4
-0int clock; +int max_pixclk =to_i915 (connector->dev)->max_dotclk;if (mode->flags &DRM_MODE_FLAG_DBLSCAN )return MODE_NO_DBLESCAN ; +if (mode->clock > max_pixclk) +return MODE_CLOCK_HIGH ; + clock = mode->clock;I believe we should do something like this here:
Quoted 4 lines
clock = mode->clock; if ((mode->flags & DRM_MODE_FLAG_3D_MASK) == DRM_MODE_FLAG_3D_FRAME_PACKING) clock *= 2;
That's already done in drm_mode_set_crtcinfo, i915 uses the STEREO_DOUBLE mode of that function.
-Daniel
Quoted 27 lines
if (clock > max_pixclk) return MODE_CLOCK_HIGH;drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_mode_valid(struct drm_connector *connector, · line 1206
Quoted 2 lines
drivers/gpu/drm/i915/intel_hdmi.c +0
-0if (mode->flags &DRM_MODE_FLAG_DBLCLK ) clock *=2 ;The stero handling should probably be in a separate patch, but in preparation for it you could already put the dotclk check between the clock= assigment and the DBCLK doubling (since DBLCLK only affects the
port_clockand not pixel clock).Quoted 7 lines
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 03/11] drm/i915: HDMI pixel clock check
Quoted 41 lines · Daniel Vetter
Quoted 40 lines · Ville Syrjälä
Quoted 26 lines · Mika Kahola
It is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to HDMI.
V2:
- removed computation for max dot clockV3:
- cleanup by removing unnecessary linesSigned-off-by Mika Kahola <[email protected]>--- drivers/gpu/drm/i915/intel_hdmi.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/gpu/drm/i915/intel_hdmi.c +0
-0@@ -1193,10 +1193,14 @@ intel_hdmi_mode_valid(struct drm_connector *connector,struct drm_device *dev =intel_hdmi_to_dev (hdmi);enum drm_mode_status status;drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_mode_valid(struct drm_connector *connector, · line 1204
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4
-0int clock; +int max_pixclk =to_i915 (connector->dev)->max_dotclk;if (mode->flags &DRM_MODE_FLAG_DBLSCAN )return MODE_NO_DBLESCAN ; +if (mode->clock > max_pixclk) +return MODE_CLOCK_HIGH ; + clock = mode->clock;I believe we should do something like this here:
Quoted 7 lines
Quoted 4 lines
clock = mode->clock; if ((mode->flags & DRM_MODE_FLAG_3D_MASK) == DRM_MODE_FLAG_3D_FRAME_PACKING) clock *= 2;That's already done in
drm_mode_set_crtcinfo, i915 uses theSTEREO_DOUBLEmode of that function.
Only for modesets. .mode_valid() only deals with the results of .get_modes() etc., so the timings won't have been doubled. And even then we only double the .crtc_ timings, which is where I previously gave up trying to use the same mode validation code during modeset and .fill_modes(). I suppose we can make it happen if we really try, but in the meantime I think it's at least an improvement if we stop advertising modes we for sure can't use.
Quoted 34 lines
-Daniel
Quoted 27 lines
if (clock > max_pixclk) return MODE_CLOCK_HIGH;drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_mode_valid(struct drm_connector *connector, · line 1206
Quoted 2 lines
drivers/gpu/drm/i915/intel_hdmi.c +0
-0if (mode->flags &DRM_MODE_FLAG_DBLCLK ) clock *=2 ;The stero handling should probably be in a separate patch, but in preparation for it you could already put the dotclk check between the clock= assigment and the DBCLK doubling (since DBLCLK only affects the
port_clockand not pixel clock).Quoted 7 lines
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 03/11] drm/i915: HDMI pixel clock check
Quoted 50 lines · Ville Syrjälä
Quoted 41 lines · Daniel Vetter
Quoted 40 lines · Ville Syrjälä
Quoted 26 lines · Mika Kahola
It is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to HDMI.
V2:
- removed computation for max dot clockV3:
- cleanup by removing unnecessary linesSigned-off-by Mika Kahola <[email protected]>--- drivers/gpu/drm/i915/intel_hdmi.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/gpu/drm/i915/intel_hdmi.c +0
-0@@ -1193,10 +1193,14 @@ intel_hdmi_mode_valid(struct drm_connector *connector,struct drm_device *dev =intel_hdmi_to_dev (hdmi);enum drm_mode_status status;drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_mode_valid(struct drm_connector *connector, · line 1204
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4
-0int clock; +int max_pixclk =to_i915 (connector->dev)->max_dotclk;if (mode->flags &DRM_MODE_FLAG_DBLSCAN )return MODE_NO_DBLESCAN ; +if (mode->clock > max_pixclk) +return MODE_CLOCK_HIGH ; + clock = mode->clock;I believe we should do something like this here:
Quoted 7 lines
Quoted 4 lines
clock = mode->clock; if ((mode->flags & DRM_MODE_FLAG_3D_MASK) == DRM_MODE_FLAG_3D_FRAME_PACKING) clock *= 2;That's already done in
drm_mode_set_crtcinfo, i915 uses theSTEREO_DOUBLEmode of that function.
Quoted 7 lines
Only for modesets. .mode_valid() only deals with the results of .get_modes() etc., so the timings won't have been doubled. And even then we only double the .crtc_ timings, which is where I previously gave up trying to use the same mode validation code during modeset and .fill_modes(). I suppose we can make it happen if we really try, but in the meantime I think it's at least an improvement if we stop advertising modes we for sure can't use.
Oh right totally mixed things up, you're correct.
-Daniel
Quoted 39 lines
Quoted 35 lines
-Daniel
Quoted 27 lines
if (clock > max_pixclk) return MODE_CLOCK_HIGH;drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_mode_valid(struct drm_connector *connector, · line 1206
Quoted 2 lines
drivers/gpu/drm/i915/intel_hdmi.c +0
-0if (mode->flags &DRM_MODE_FLAG_DBLCLK ) clock *=2 ;The stero handling should probably be in a separate patch, but in preparation for it you could already put the dotclk check between the clock= assigment and the DBCLK doubling (since DBLCLK only affects the
port_clockand not pixel clock).Quoted 7 lines
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.chSignature · 2 lines
Ville Syrjälä Intel OTC
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 4/11 drm/i915: LVDS pixel clock check
In reply to Mika KaholaIt is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to LVDS.
V2:
- removed computation for max pixel clock
V3:
- cleanup by removing unnecessary lines
--- drivers/gpu/drm/i915/intel_lvds.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/intel_lvds.c +3 -0
@@ -289,11 +289,14 @@ intel_lvds_mode_valid(struct drm_connector *connector, {struct intel_connector *intel_connector =to_intel_connector (connector);struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode; +int max_pixclk =to_i915 (connector->dev)->max_dotclk;if (mode->hdisplay > fixed_mode->hdisplay)return MODE_PANEL ;if (mode->vdisplay > fixed_mode->vdisplay)return MODE_PANEL ; +if (mode->clock > max_pixclk) +return MODE_CLOCK_HIGH ;return MODE_OK ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 04/11] drm/i915: LVDS pixel clock check
Quoted 25 lines · Mika Kahola
It is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to LVDS.
V2:
- removed computation for max pixel clockV3:
- cleanup by removing unnecessary linesSigned-off-by Mika Kahola <[email protected]>--- drivers/gpu/drm/i915/intel_lvds.c | 3 +++ 1 file changed, 3 insertions(+)drivers/gpu/drm/i915/intel_lvds.c +0
-0@@ -289,11 +289,14 @@ intel_lvds_mode_valid(struct drm_connector *connector, {
drivers/gpu/drm/i915/intel_lvds.c intel_lvds_mode_valid(struct drm_connector *connector, · line 299
Quoted 10 lines
drivers/gpu/drm/i915/intel_lvds.c +3
-0struct intel_connector *intel_connector =to_intel_connector (connector);struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode; +int max_pixclk =to_i915 (connector->dev)->max_dotclk;if (mode->hdisplay > fixed_mode->hdisplay)return MODE_PANEL ;if (mode->vdisplay > fixed_mode->vdisplay)return MODE_PANEL ; +if (mode->clock > max_pixclk) +return MODE_CLOCK_HIGH ;
This should really be checking fixed_mode->clock. Though checking it every time is a bit pointless since it never changes. But what the eDP cases ends up doing as well.
Maybe we should just stick the check to where we pick fixed_mode, or perhaps just have intel_panel_init() print an error if the provided modes(s) are no good? In theory that should never happen anyway.
Quoted 10 lines
drivers/gpu/drm/i915/intel_lvds.c +0
-0return MODE_OK ; }Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 5/11 drm/i915: SDVO pixel clock check
In reply to Mika KaholaIt is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to SDVO.
V2:
- removed computation for max pixel clock
V3:
- cleanup by removing unnecessary lines
--- drivers/gpu/drm/i915/intel_sdvo.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/intel_sdvo.c +4 -0
@@ -1560,6 +1560,7 @@ intel_sdvo_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode) {struct intel_sdvo *intel_sdvo =intel_attached_sdvo (connector); +int max_pixclk =to_i915 (connector->dev)->max_dotclk;if (mode->flags &DRM_MODE_FLAG_DBLSCAN )return MODE_NO_DBLESCAN ;
@@ -1570,6 +1571,9 @@ intel_sdvo_mode_valid(struct drm_connector *connector,if (intel_sdvo->pixel_clock_max < mode->clock)return MODE_CLOCK_HIGH ; +if (mode->clock > max_pixclk) +return MODE_CLOCK_HIGH ; +if (intel_sdvo->is_lvds) {if (mode->hdisplay > intel_sdvo->sdvo_lvds_fixed_mode->hdisplay)return MODE_PANEL ;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 05/11] drm/i915: SDVO pixel clock check
Quoted 32 lines · Mika Kahola
It is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to SDVO.
V2:
- removed computation for max pixel clockV3:
- cleanup by removing unnecessary linesSigned-off-by Mika Kahola <[email protected]>--- drivers/gpu/drm/i915/intel_sdvo.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/gpu/drm/i915/intel_sdvo.c +1
-0@@ -1560,6 +1560,7 @@ intel_sdvo_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode) {struct intel_sdvo *intel_sdvo =intel_attached_sdvo (connector); +int max_pixclk =to_i915 (connector->dev)->max_dotclk;if (mode->flags &DRM_MODE_FLAG_DBLSCAN )return MODE_NO_DBLESCAN ;
drivers/gpu/drm/i915/intel_sdvo.c intel_sdvo_mode_valid(struct drm_connector *connector, · line 1576
Quoted 6 lines
drivers/gpu/drm/i915/intel_sdvo.c +3
-0@@ -1570,6 +1571,9 @@ intel_sdvo_mode_valid(struct drm_connector *connector,if (intel_sdvo->pixel_clock_max < mode->clock)return MODE_CLOCK_HIGH ; +if (mode->clock > max_pixclk) +return MODE_CLOCK_HIGH ; +
Had to think a bit on this one. But yeah checking mode->clock is the right thing. I suppose in theory we should do the whole intel_sdvo_get_preferred_input_mode() thing here, but I guess that would clobber the current sdvo device state and so can't be done safely.
Quoted 10 lines
drivers/gpu/drm/i915/intel_sdvo.c +0
-0if (intel_sdvo->is_lvds) {if (mode->hdisplay > intel_sdvo->sdvo_lvds_fixed_mode->hdisplay)return MODE_PANEL ;Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 6/11 drm/i915: DSI pixel clock check
In reply to Mika KaholaIt is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to DSI.
V2:
- removed computation for max pixel clock
V3:
- cleanup by removing unnecessary lines
--- drivers/gpu/drm/i915/intel_dsi.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/intel_dsi.c +4 -0
@@ -654,6 +654,7 @@ intel_dsi_mode_valid(struct drm_connector *connector, {struct intel_connector *intel_connector =to_intel_connector (connector);struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode; +int max_pixclk =to_i915 (connector->dev)->max_dotclk;DRM_DEBUG_KMS ("\n" );
@@ -669,6 +670,9 @@ intel_dsi_mode_valid(struct drm_connector *connector,return MODE_PANEL ; } +if (mode->clock > max_pixclk) +return MODE_CLOCK_HIGH ; +return MODE_OK ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 06/11] drm/i915: DSI pixel clock check
Quoted 32 lines · Mika Kahola
It is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to DSI.
V2:
- removed computation for max pixel clockV3:
- cleanup by removing unnecessary linesSigned-off-by Mika Kahola <[email protected]>--- drivers/gpu/drm/i915/intel_dsi.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/gpu/drm/i915/intel_dsi.c +1
-0@@ -654,6 +654,7 @@ intel_dsi_mode_valid(struct drm_connector *connector, {struct intel_connector *intel_connector =to_intel_connector (connector);struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode; +int max_pixclk =to_i915 (connector->dev)->max_dotclk;DRM_DEBUG_KMS ("\n" );
drivers/gpu/drm/i915/intel_dsi.c intel_dsi_mode_valid(struct drm_connector *connector, · line 675
Quoted 6 lines
drivers/gpu/drm/i915/intel_dsi.c +3
-0@@ -669,6 +670,9 @@ intel_dsi_mode_valid(struct drm_connector *connector,return MODE_PANEL ; } +if (mode->clock > max_pixclk) +return MODE_CLOCK_HIGH ; +
Hmm. Seems like this too ought to be checking the fixed_mode. intel_dsi_mode_valid() seems to assume there could be no fixed mode, but looking at intel_dsi_init() tells me that can't be (if we ignore the totally broken looking error handling).
Also we don't set up the panel fitter in the DSI code even though the presence of fixed_mode clearly indicates that we should. So the whole thing seems more or less busted.
For now, I think just sticking the clock check inside the 'if (fixed_mode)' block would be fine, and then someone can try to clean up the bigger mess.
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi.c +0
-0return MODE_OK ; }Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 7/11 drm/i915: CRT pixel clock check
In reply to Mika KaholaIt is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to CRT.
V2:
- removed computation for max pixel clock
V3:
- cleanup by removing unnecessary lines
--- drivers/gpu/drm/i915/intel_crt.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/intel_crt.c +4 -0
@@ -290,6 +290,7 @@ intel_crt_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode) {struct drm_device *dev = connector->dev; +int max_pixclk =to_i915 (dev)->max_dotclk;int max_clock =0 ;if (mode->flags &DRM_MODE_FLAG_DBLSCAN )
@@ -305,6 +306,9 @@ intel_crt_mode_valid(struct drm_connector *connector,if (mode->clock > max_clock)return MODE_CLOCK_HIGH ; +if (mode->clock > max_pixclk) +return MODE_CLOCK_HIGH ; +/* The FDI receiver on LPT only supports 8bpc and only has 2 lanes. */ if (HAS_PCH_LPT (dev) && (ironlake_get_lanes_required (mode->clock,270000 ,24 ) >2 ))
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 07/11] drm/i915: CRT pixel clock check
Quoted 8 lines · Mika Kahola
It is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to CRT.
Quoted 7 lines
V2:
- removed computation for max pixel clockV3:
- cleanup by removing unnecessary linesSigned-off-by Mika Kahola <[email protected]>
Quoted 33 lines
--- drivers/gpu/drm/i915/intel_crt.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/gpu/drm/i915/intel_crt.c +4
-0@@ -290,6 +290,7 @@ intel_crt_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode) {struct drm_device *dev = connector->dev; +int max_pixclk =to_i915 (dev)->max_dotclk;int max_clock =0 ;if (mode->flags &DRM_MODE_FLAG_DBLSCAN )@@ -305,6 +306,9 @@ intel_crt_mode_valid(struct drm_connector *connector,if (mode->clock > max_clock)return MODE_CLOCK_HIGH ; +if (mode->clock > max_pixclk) +return MODE_CLOCK_HIGH ; +/* The FDI receiver on LPT only supports 8bpc and only has 2 lanes. */ if (HAS_PCH_LPT (dev) && (ironlake_get_lanes_required (mode->clock,270000 ,24 ) >2 ))Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 8/11 drm/i915: TV pixel clock check
In reply to Mika KaholaIt is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to TV.
V2:
- removed computation for max pixel clock
V3:
- cleanup by removing unnecessary lines
--- drivers/gpu/drm/i915/intel_tv.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/intel_tv.c +4 -0
@@ -897,6 +897,10 @@ intel_tv_mode_valid(struct drm_connector *connector, {struct intel_tv *intel_tv =intel_attached_tv (connector);const struct tv_mode *tv_mode =intel_tv_mode_find (intel_tv); +int max_pixclk =to_i915 (connector->dev)->max_dotclk; + +if (mode->clock > max_pixclk) +return MODE_CLOCK_HIGH ;/* Ensure TV refresh is close to desired refresh */ if (tv_mode && abs(tv_mode->refresh - drm_mode_vrefresh(mode) * 1000)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 08/11] drm/i915: TV pixel clock check
Quoted 24 lines · Mika Kahola
It is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to TV.
V2:
- removed computation for max pixel clockV3:
- cleanup by removing unnecessary linesSigned-off-by Mika Kahola <[email protected]>--- drivers/gpu/drm/i915/intel_tv.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/gpu/drm/i915/intel_tv.c +0
-0
drivers/gpu/drm/i915/intel_tv.c intel_tv_mode_valid(struct drm_connector *connector, · line 903
Quoted 7 lines
drivers/gpu/drm/i915/intel_tv.c +4
-0@@ -897,6 +897,10 @@ intel_tv_mode_valid(struct drm_connector *connector, {struct intel_tv *intel_tv =intel_attached_tv (connector);const struct tv_mode *tv_mode =intel_tv_mode_find (intel_tv); +int max_pixclk =to_i915 (connector->dev)->max_dotclk; + +if (mode->clock > max_pixclk) +return MODE_CLOCK_HIGH ;
The mode handling in intel_tv.c seems to be a mess. But I suppose this should be OK.
Quoted 10 lines
drivers/gpu/drm/i915/intel_tv.c +0
-0/* Ensure TV refresh is close to desired refresh */ if (tv_mode && abs(tv_mode->refresh - drm_mode_vrefresh(mode) * 1000)Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 08/11] drm/i915: TV pixel clock check
Quoted 20 lines · Ville Syrjälä
Quoted 19 lines · Mika Kahola
It is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to TV.
V2:
- removed computation for max pixel clockV3:
- cleanup by removing unnecessary linesSigned-off-by Mika Kahola <[email protected]>--- drivers/gpu/drm/i915/intel_tv.c | 4 ++++ 1 file changed, 4 insertions(+)
Quoted 15 lines
drivers/gpu/drm/i915/intel_tv.c intel_tv_mode_valid(struct drm_connector *connector, · line 903
Quoted 12 lines
drivers/gpu/drm/i915/intel_tv.c +4
-0@@ -897,6 +897,10 @@ intel_tv_mode_valid(struct drm_connector *connector, {struct intel_tv *intel_tv =intel_attached_tv (connector);const struct tv_mode *tv_mode =intel_tv_mode_find (intel_tv); +int max_pixclk =to_i915 (connector->dev)->max_dotclk; + +if (mode->clock > max_pixclk) +return MODE_CLOCK_HIGH ;The mode handling in
intel_tv.cseems to be a mess. But I suppose this should be OK.
We set a fake mode (which is the one userspace asks for) and the hw internally munges it to the actual tv mode with a scaler. Except that the frame-start/dotclock are fed from the actual TV mode (which is why kms_flip has a check for TV modes since the timings are all wrong).
Yup, giant hairball indeed ;-)
-Daniel
Quoted 21 lines
Reviewed-by Ville Syrjälä <[email protected]>Quoted 10 lines
drivers/gpu/drm/i915/intel_tv.c +0
-0/* Ensure TV refresh is close to desired refresh */ if (tv_mode && abs(tv_mode->refresh - drm_mode_vrefresh(mode) * 1000)Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 9/11 drm/i915: DisplayPort-MST pixel clock check
In reply to Mika KaholaIt is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to DisplayPort MST.
V2:
- removed computation for max pixel clock
V3:
- cleanup by removing unnecessary lines
--- drivers/gpu/drm/i915/intel_dp_mst.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_dp_mst.c +5 -0
@@ -347,6 +347,8 @@ static enum drm_mode_status intel_dp_mst_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode) { + int max_pixclk = to_i915(connector->dev)->max_dotclk; +/* TODO - validate mode against available PBN for link */ if (mode->clock <10000 )return MODE_CLOCK_LOW ;
@@ -354,6 +356,9 @@ intel_dp_mst_mode_valid(struct drm_connector *connector,if (mode->flags &DRM_MODE_FLAG_DBLCLK )return MODE_H_ILLEGAL ; +if (mode->clock > max_pixclk) +return MODE_CLOCK_HIGH ; +return MODE_OK ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 09/11] drm/i915: DisplayPort-MST pixel clock check
Quoted 24 lines · Mika Kahola
It is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to DisplayPort MST.
V2:
- removed computation for max pixel clockV3:
- cleanup by removing unnecessary linesSigned-off-by Mika Kahola <[email protected]>--- drivers/gpu/drm/i915/intel_dp_mst.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/gpu/drm/i915/intel_dp_mst.c +0
-0
drivers/gpu/drm/i915/intel_dp_mst.c static enum drm_mode_status · line 350
Quoted 4 lines
drivers/gpu/drm/i915/intel_dp_mst.c +1
-0@@ -347,6 +347,8 @@ static enum drm_mode_status intel_dp_mst_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode) { + int max_pixclk = to_i915(connector->dev)->max_dotclk;
The pixclk vs. dotclk in every patch is tickling my ocd nerves. I'd say pick one and stick to it everywhere. I guess I'm probably to blame here since I've been using dotclock in the .get_config() paths, and pixclk in the cdclk calculations. With grep I can't say which one is winning, so I guess you could pick whichever seems more awesome.
Apart from that this patch looks good so:
Quoted 21 lines
drivers/gpu/drm/i915/intel_dp_mst.c +4
-0+/* TODO - validate mode against available PBN for link */ if (mode->clock <10000 )return MODE_CLOCK_LOW ;@@ -354,6 +356,9 @@ intel_dp_mst_mode_valid(struct drm_connector *connector,if (mode->flags &DRM_MODE_FLAG_DBLCLK )return MODE_H_ILLEGAL ; +if (mode->clock > max_pixclk) +return MODE_CLOCK_HIGH ; +return MODE_OK ; }Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 09/11] drm/i915: DisplayPort-MST pixel clock check
Quoted 20 lines · Ville Syrjälä
Quoted 19 lines · Mika Kahola
It is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to DisplayPort MST.
V2:
- removed computation for max pixel clockV3:
- cleanup by removing unnecessary linesSigned-off-by Mika Kahola <[email protected]>--- drivers/gpu/drm/i915/intel_dp_mst.c | 5 +++++ 1 file changed, 5 insertions(+)
Quoted 15 lines
drivers/gpu/drm/i915/intel_dp_mst.c static enum drm_mode_status · line 350
Quoted 9 lines
drivers/gpu/drm/i915/intel_dp_mst.c +1
-0@@ -347,6 +347,8 @@ static enum drm_mode_status intel_dp_mst_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode) { + int max_pixclk = to_i915(connector->dev)->max_dotclk;The pixclk vs. dotclk in every patch is tickling my ocd nerves. I'd say pick one and stick to it everywhere. I guess I'm probably to blame here since I've been using dotclock in the .get_config() paths, and pixclk in the cdclk calculations. With grep I can't say which one is winning, so I guess you could pick whichever seems more awesome.
+1 from me for a follow-up series to standardize on one and then maybe even add a small DOC: kerneldoc comment explaining what all the different clocks are that we have. We have much improved kerneldoc support now. -Daniel
Quoted 33 lines
Apart from that this patch looks good so:
Reviewed-by Ville Syrjälä <[email protected]>Quoted 21 lines
drivers/gpu/drm/i915/intel_dp_mst.c +4
-0+/* TODO - validate mode against available PBN for link */ if (mode->clock <10000 )return MODE_CLOCK_LOW ;@@ -354,6 +356,9 @@ intel_dp_mst_mode_valid(struct drm_connector *connector,if (mode->flags &DRM_MODE_FLAG_DBLCLK )return MODE_H_ILLEGAL ; +if (mode->clock > max_pixclk) +return MODE_CLOCK_HIGH ; +return MODE_OK ; }Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 10/11 drm/i915: DVO pixel clock check
In reply to Mika KaholaIt is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to DVO.
V2:
- removed computation for max pixel clock
V3:
- cleanup by removing unnecessary lines
--- drivers/gpu/drm/i915/intel_dvo.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/intel_dvo.c +4 -0
@@ -247,6 +247,7 @@ intel_dvo_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode) {struct intel_dvo *intel_dvo =intel_attached_dvo (connector); +int max_pixclk =to_i915 (connector->dev)->max_dotclk;if (mode->flags &DRM_MODE_FLAG_DBLSCAN )return MODE_NO_DBLESCAN ;
@@ -260,6 +261,9 @@ intel_dvo_mode_valid(struct drm_connector *connector,return MODE_PANEL ; } +if (mode->clock > max_pixclk) +return MODE_CLOCK_HIGH ; +return intel_dvo->dev.dev_ops->mode_valid (&intel_dvo->dev, mode); }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 10/11] drm/i915: DVO pixel clock check
Quoted 32 lines · Mika Kahola
It is possible the we request to have a mode that has higher pixel clock than our HW can support. This patch checks if requested pixel clock is lower than the one supported by the HW. The requested mode is discarded if we cannot support the requested pixel clock.
This patch applies to DVO.
V2:
- removed computation for max pixel clockV3:
- cleanup by removing unnecessary linesSigned-off-by Mika Kahola <[email protected]>--- drivers/gpu/drm/i915/intel_dvo.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/gpu/drm/i915/intel_dvo.c +1
-0@@ -247,6 +247,7 @@ intel_dvo_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode) {struct intel_dvo *intel_dvo =intel_attached_dvo (connector); +int max_pixclk =to_i915 (connector->dev)->max_dotclk;if (mode->flags &DRM_MODE_FLAG_DBLSCAN )return MODE_NO_DBLESCAN ;
drivers/gpu/drm/i915/intel_dvo.c intel_dvo_mode_valid(struct drm_connector *connector, · line 265
Quoted 5 lines
drivers/gpu/drm/i915/intel_dvo.c +2
-0@@ -260,6 +261,9 @@ intel_dvo_mode_valid(struct drm_connector *connector,return MODE_PANEL ; } +if (mode->clock > max_pixclk) +return MODE_CLOCK_HIGH ;
I think we'd need to check against the fixed_mode like you did for DP, when it's present that is.
Quoted 11 lines
drivers/gpu/drm/i915/intel_dvo.c +1
-0+return intel_dvo->dev.dev_ops->mode_valid (&intel_dvo->dev, mode); }Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 11/11 drm/i915: Max DOT clock frequency to debugfs
In reply to Mika KaholaInformation on maximum supported DOT clock frequency to i915_frequency_info.
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +2 -0
@@ -1314,6 +1314,8 @@ static int i915_frequency_info(struct seq_file *m, void *unused)seq_puts (m,"no P-state info available\n" ); } +seq_printf (m,"Max pixel clock frequency: %dkHz\n" , dev_priv->max_dotclk); + out:intel_runtime_pm_put (dev_priv);return ret;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 11/11] drm/i915: Max DOT clock frequency to debugfs
Task id: 6910 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
ILK -2 302/302 300/302
SNB 315/315 315/315 IVB 336/336 336/336 BYT 283/283 283/283 HSW 378/378 378/378
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*ILK igt@kms_flip@flip-vs-dpms-interruptible PASS(1) DMESG_WARN(1)
*ILK igt@kms_flip@wf_vblank-vs-modeset-interruptible PASS(1) DMESG_WARN(1)
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