drm/i915/vlv: T12 eDP panel timing enforcement during reboot
Subsystems (2)
PATCH 1/1 drm/i915/vlv: T12 eDP panel timing enforcement during reboot
From: Clint Taylor <[email protected]>
The panel power sequencer on vlv doesn't appear to accept changes to its T12 power down duration during warm reboots. This change forces a delay for warm reboots to the T12 panel timing as defined in the VBT table for the connected panel.
Ver2: removed redundant pr_crit(), commented magic value for pp_div_reg
Ver3: moved SYS_RESTART check earlier, new name for pp_div.
Ver4: Minor issue changes
Ver5: Move registration of reboot notifier to edp_connector_init,
Added warning comment to handler about lack of PM notification.
--- drivers/gpu/drm/i915/intel_dp.c | 42 ++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 ++ 2 files changed, 44 insertions(+)
drivers/gpu/drm/i915/intel_dp.c +42 -0
@@ -28,6 +28,8 @@#include <linux/i2c.h> #include <linux/slab.h> #include <linux/export.h> +#include <linux/notifier.h> +#include <linux/reboot.h> #include <drm/drmP.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h>
@@ -336,6 +338,37 @@ static u32 _pp_stat_reg(struct intel_dp *intel_dp)return VLV_PIPE_PP_STATUS (vlv_power_sequencer_pipe (intel_dp)); } +/* Reboot notifier handler to shutdown panel power to guarantee T12 timing +This function only applicable when panel PM state is not to be tracked */ +static int edp_notify_handler (struct notifier_block *this,unsigned long code, +void *unused) +{ +struct intel_dp *intel_dp =container_of (this,typeof (* intel_dp), + edp_notifier); +struct drm_device *dev =intel_dp_to_dev (intel_dp); +struct drm_i915_private *dev_priv = dev->dev_private; +u32 pp_div; +u32 pp_ctrl_reg, pp_div_reg; +enum pipe pipe =vlv_power_sequencer_pipe (intel_dp); + +if (!is_edp (intel_dp) || code !=SYS_RESTART ) +return 0 ; + +if (IS_VALLEYVIEW (dev)) { + pp_ctrl_reg =VLV_PIPE_PP_CONTROL (pipe); + pp_div_reg =VLV_PIPE_PP_DIVISOR (pipe); + pp_div =I915_READ (pp_div_reg); + pp_div &=PP_REFERENCE_DIVIDER_MASK ; + +/* 0x1F write to PP_DIV_REG sets max cycle delay */ +I915_WRITE (pp_div_reg, pp_div |0x1F ); +I915_WRITE (pp_ctrl_reg,PANEL_UNLOCK_REGS |PANEL_POWER_OFF ); +msleep (intel_dp->panel_power_cycle_delay); + } + +return 0 ; +} +static bool edp_have_panel_power (struct intel_dp *intel_dp) {struct drm_device *dev =intel_dp_to_dev (intel_dp);
@@ -3785,6 +3818,10 @@ void intel_dp_encoder_destroy(struct drm_encoder *encoder)drm_modeset_lock (&dev->mode_config.connection_mutex,NULL );edp_panel_vdd_off_sync (intel_dp);drm_modeset_unlock (&dev->mode_config.connection_mutex); +if (intel_dp->edp_notifier.notifier_call) { +unregister_reboot_notifier (&intel_dp->edp_notifier); + intel_dp->edp_notifier.notifier_call =NULL ; + } }kfree (intel_dig_port); }
@@ -4262,6 +4299,11 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, }mutex_unlock (&dev->mode_config.mutex); +if (IS_VALLEYVIEW (dev)) { + intel_dp->edp_notifier.notifier_call = edp_notify_handler; +register_reboot_notifier (&intel_dp->edp_notifier); + } +intel_panel_init (&intel_connector->panel, fixed_mode, downclock_mode);intel_panel_setup_backlight (connector);
drivers/gpu/drm/i915/intel_drv.h +2 -0
@@ -541,6 +541,8 @@ struct intel_dp {unsigned long last_power_cycle;unsigned long last_power_on;unsigned long last_backlight_off; +struct notifier_block edp_notifier; +bool use_tps3;struct intel_connector *attached_connector;
Signature · 1 line
1.7.9.5
2014-07-07 17:01 GMT-03:00 <[email protected]>:
Quoted 7 lines
From: Clint Taylor <[email protected]>
The panel power sequencer on vlv doesn't appear to accept changes to its T12 power down duration during warm reboots. This change forces a delay for warm reboots to the T12 panel timing as defined in the VBT table for the connected panel.
Quoted 8 lines
Ver2: removed redundant
pr_crit(), commented magic value forpp_div_regVer3: moved
SYS_RESTARTcheck earlier, new name forpp_div.Ver4: Minor issue changes
Ver5: Move registration of reboot notifier to
edp_connector_init,
Added warning comment to handler about lack of PM notification.
Not everything I pointed was implemented, but at least the ghost eDP bug was fixed, so the current patch is already an improvement:
Quoted 101 lines
Signed-off-by Clint Taylor <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 42 ++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 ++ 2 files changed, 44 insertions(+)drivers/gpu/drm/i915/intel_dp.c +42
-0@@ -28,6 +28,8 @@#include <linux/i2c.h> #include <linux/slab.h> #include <linux/export.h> +#include <linux/notifier.h> +#include <linux/reboot.h> #include <drm/drmP.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> @@ -336,6 +338,37 @@ static u32 _pp_stat_reg(struct intel_dp *intel_dp)return VLV_PIPE_PP_STATUS (vlv_power_sequencer_pipe (intel_dp)); } +/* Reboot notifier handler to shutdown panel power to guarantee T12 timing +This function only applicable when panel PM state is not to be tracked */ +static int edp_notify_handler (struct notifier_block *this,unsigned long code, +void *unused) +{ +struct intel_dp *intel_dp =container_of (this,typeof (* intel_dp), + edp_notifier); +struct drm_device *dev =intel_dp_to_dev (intel_dp); +struct drm_i915_private *dev_priv = dev->dev_private; +u32 pp_div; +u32 pp_ctrl_reg, pp_div_reg; +enum pipe pipe =vlv_power_sequencer_pipe (intel_dp); + +if (!is_edp (intel_dp) || code !=SYS_RESTART ) +return 0 ; + +if (IS_VALLEYVIEW (dev)) { + pp_ctrl_reg =VLV_PIPE_PP_CONTROL (pipe); + pp_div_reg =VLV_PIPE_PP_DIVISOR (pipe); + pp_div =I915_READ (pp_div_reg); + pp_div &=PP_REFERENCE_DIVIDER_MASK ; + +/* 0x1F write to PP_DIV_REG sets max cycle delay */ +I915_WRITE (pp_div_reg, pp_div |0x1F ); +I915_WRITE (pp_ctrl_reg,PANEL_UNLOCK_REGS |PANEL_POWER_OFF ); +msleep (intel_dp->panel_power_cycle_delay); + } + +return 0 ; +} +static bool edp_have_panel_power (struct intel_dp *intel_dp) {struct drm_device *dev =intel_dp_to_dev (intel_dp);@@ -3785,6 +3818,10 @@ void intel_dp_encoder_destroy(struct drm_encoder *encoder)drm_modeset_lock (&dev->mode_config.connection_mutex,NULL );edp_panel_vdd_off_sync (intel_dp);drm_modeset_unlock (&dev->mode_config.connection_mutex); +if (intel_dp->edp_notifier.notifier_call) { +unregister_reboot_notifier (&intel_dp->edp_notifier); + intel_dp->edp_notifier.notifier_call =NULL ; + } }kfree (intel_dig_port); }@@ -4262,6 +4299,11 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, }mutex_unlock (&dev->mode_config.mutex); +if (IS_VALLEYVIEW (dev)) { + intel_dp->edp_notifier.notifier_call = edp_notify_handler; +register_reboot_notifier (&intel_dp->edp_notifier); + } +intel_panel_init (&intel_connector->panel, fixed_mode, downclock_mode);intel_panel_setup_backlight (connector);drivers/gpu/drm/i915/intel_drv.h +2
-1@@ -541,6 +541,8 @@ struct intel_dp {unsigned long last_power_cycle;unsigned long last_power_on;unsigned long last_backlight_off; +struct notifier_block edp_notifier; +bool use_tps3;struct intel_connector *attached_connector; --1.7.9.5
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Paulo Zanoni
Daniel Vetter
AppliedQuoted 12 lines · Paulo Zanoni
2014-07-07 17:01 GMT-03:00 <[email protected]>:
Quoted 11 lines
From: Clint Taylor <[email protected]>
The panel power sequencer on vlv doesn't appear to accept changes to its T12 power down duration during warm reboots. This change forces a delay for warm reboots to the T12 panel timing as defined in the VBT table for the connected panel.
Ver2: removed redundant
pr_crit(), commented magic value forpp_div_regVer3: moved
SYS_RESTARTcheck earlier, new name forpp_div.
Quoted 8 lines
Quoted 4 lines
Ver4: Minor issue changes
Ver5: Move registration of reboot notifier to
edp_connector_init,
Added warning comment to handler about lack of PM notification.Not everything I pointed was implemented, but at least the ghost eDP bug was fixed, so the current patch is already an improvement:
Reviewed-by Paulo Zanoni <[email protected]>
Picked up for -fixes, thanks for the patch.
-Daniel
Quoted 111 lines
Quoted 102 lines
Signed-off-by Clint Taylor <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 42 ++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 ++ 2 files changed, 44 insertions(+)drivers/gpu/drm/i915/intel_dp.c +42
-0@@ -28,6 +28,8 @@#include <linux/i2c.h> #include <linux/slab.h> #include <linux/export.h> +#include <linux/notifier.h> +#include <linux/reboot.h> #include <drm/drmP.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> @@ -336,6 +338,37 @@ static u32 _pp_stat_reg(struct intel_dp *intel_dp)return VLV_PIPE_PP_STATUS (vlv_power_sequencer_pipe (intel_dp)); } +/* Reboot notifier handler to shutdown panel power to guarantee T12 timing +This function only applicable when panel PM state is not to be tracked */ +static int edp_notify_handler (struct notifier_block *this,unsigned long code, +void *unused) +{ +struct intel_dp *intel_dp =container_of (this,typeof (* intel_dp), + edp_notifier); +struct drm_device *dev =intel_dp_to_dev (intel_dp); +struct drm_i915_private *dev_priv = dev->dev_private; +u32 pp_div; +u32 pp_ctrl_reg, pp_div_reg; +enum pipe pipe =vlv_power_sequencer_pipe (intel_dp); + +if (!is_edp (intel_dp) || code !=SYS_RESTART ) +return 0 ; + +if (IS_VALLEYVIEW (dev)) { + pp_ctrl_reg =VLV_PIPE_PP_CONTROL (pipe); + pp_div_reg =VLV_PIPE_PP_DIVISOR (pipe); + pp_div =I915_READ (pp_div_reg); + pp_div &=PP_REFERENCE_DIVIDER_MASK ; + +/* 0x1F write to PP_DIV_REG sets max cycle delay */ +I915_WRITE (pp_div_reg, pp_div |0x1F ); +I915_WRITE (pp_ctrl_reg,PANEL_UNLOCK_REGS |PANEL_POWER_OFF ); +msleep (intel_dp->panel_power_cycle_delay); + } + +return 0 ; +} +static bool edp_have_panel_power (struct intel_dp *intel_dp) {struct drm_device *dev =intel_dp_to_dev (intel_dp);@@ -3785,6 +3818,10 @@ void intel_dp_encoder_destroy(struct drm_encoder *encoder)drm_modeset_lock (&dev->mode_config.connection_mutex,NULL );edp_panel_vdd_off_sync (intel_dp);drm_modeset_unlock (&dev->mode_config.connection_mutex); +if (intel_dp->edp_notifier.notifier_call) { +unregister_reboot_notifier (&intel_dp->edp_notifier); + intel_dp->edp_notifier.notifier_call =NULL ; + } }kfree (intel_dig_port); }@@ -4262,6 +4299,11 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, }mutex_unlock (&dev->mode_config.mutex); +if (IS_VALLEYVIEW (dev)) { + intel_dp->edp_notifier.notifier_call = edp_notify_handler; +register_reboot_notifier (&intel_dp->edp_notifier); + } +intel_panel_init (&intel_connector->panel, fixed_mode, downclock_mode);intel_panel_setup_backlight (connector);drivers/gpu/drm/i915/intel_drv.h +2
-1@@ -541,6 +541,8 @@ struct intel_dp {unsigned long last_power_cycle;unsigned long last_power_on;unsigned long last_backlight_off; +struct notifier_block edp_notifier; +bool use_tps3;struct intel_connector *attached_connector; --1.7.9.5
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 5 lines
Paulo Zanoni _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch