drm/i915: edp resume/On time optimization.
Subsystems (2)
PATCH 1/1 drm/i915: edp resume/On time optimization.
From: Abhay Kumar <[email protected]>
Make resume codepath not to wait for panel_power_cycle_delay(t11_t12) if this time is already spent in suspend/poweron time.
--- drivers/gpu/drm/i915/intel_ddi.c | 3 +++ drivers/gpu/drm/i915/intel_dp.c | 21 +++++++++++++-------- drivers/gpu/drm/i915/intel_drv.h | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +3 -0
@@ -2347,6 +2347,9 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder)intel_dp_sink_dpms (intel_dp,DRM_MODE_DPMS_OFF );intel_edp_panel_vdd_on (intel_dp);intel_edp_panel_off (intel_dp); + +/* storing panel power off time */ + intel_dp->panel_power_off_time =ktime_get_with_offset (TK_OFFS_BOOT ); }if (IS_SKYLAKE (dev))
drivers/gpu/drm/i915/intel_dp.c +13 -8
@@ -38,7 +38,6 @@#include "intel_drv.h" #include <drm/i915_drm.h> #include "i915_drv.h" -#define DP_LINK_CHECK_TIMEOUT (10 * 1000)/* Compliance test status bits */
@@ -1654,13 +1653,21 @@ static void wait_panel_off(struct intel_dp *intel_dp)static void wait_panel_power_cycle (struct intel_dp *intel_dp) { +ktime_t panel_power_on_time; +u32 panel_power_off_duration; +DRM_DEBUG_KMS ("Wait for panel power cycle\n" ); -/* When we disable the VDD override bit last we have to do the manual -* wait. */ -wait_remaining_ms_from_jiffies (intel_dp->last_power_cycle, - intel_dp->panel_power_cycle_delay); +/* take the diffrence of currrent time and panel power off time +and then make panel wait for t11_t12 if needed */ + panel_power_on_time =ktime_get_with_offset (TK_OFFS_BOOT ); + panel_power_off_duration = (panel_power_on_time.tv64 - intel_dp->panel_power_off_time.tv64) /1000000 ; +/* When we disable the VDD override bit last we have to do the manual +* wait */ +if (panel_power_off_duration < intel_dp->panel_power_cycle_delay) +wait_remaining_ms_from_jiffies (jiffies, + (intel_dp->panel_power_cycle_delay - panel_power_off_duration));wait_panel_status (intel_dp,IDLE_CYCLE_MASK ,IDLE_CYCLE_VALUE ); }
@@ -1811,7 +1818,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp) I915_READ(pp_stat_reg), I915_READ(pp_ctrl_reg));if ((pp &POWER_TARGET_ON ) ==0 ) - intel_dp->last_power_cycle = jiffies; + intel_dp->panel_power_off_time =ktime_get_with_offset (TK_OFFS_BOOT ); power_domain =intel_display_port_power_domain (intel_encoder);intel_display_power_put (dev_priv, power_domain);
@@ -1960,7 +1967,6 @@ static void edp_panel_off(struct intel_dp *intel_dp)I915_WRITE (pp_ctrl_reg, pp);POSTING_READ (pp_ctrl_reg); - intel_dp->last_power_cycle = jiffies;wait_panel_off (intel_dp);/* We got a reference when we enabled the VDD. */
@@ -5196,7 +5202,6 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connectstatic void intel_dp_init_panel_power_timestamps (struct intel_dp *intel_dp) { - intel_dp->last_power_cycle = jiffies; intel_dp->last_power_on = jiffies; intel_dp->last_backlight_off = jiffies; }
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -722,9 +722,9 @@ struct intel_dp {int backlight_off_delay;struct delayed_work panel_vdd_work;bool want_panel_vdd; -unsigned long last_power_cycle;unsigned long last_power_on;unsigned long last_backlight_off; +ktime_t panel_power_off_time;struct notifier_block edp_notifier;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
kbuild test robot
build botreproduce:
Hi Abhay,
[auto build test ERROR on v4.4-rc3]
[also build test ERROR on next-20151217]
[cannot apply to drm-intel/for-linux-next v4.4-rc5 v4.4-rc4]
url: https://github.com/0day-ci/linux/commits/abhay-kumar-intel-com/drm-i915-edp-resume-On-time-optimization/20151218-143043 config: i386-randconfig-i0-201550 (attached as .config) reproduce: # save the attached .config to linux build tree make ARCH=i386
All errors (new ones prefixed by >>):
drivers/built-in.o: In function `wait_panel_power_cycle':
>> intel_dp.c:(.text+0x306552): undefined reference to `__divdi3'
intel_dp.c:(.text+0x3065b9): undefined reference to `__divdi3'
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ failure: Fi.CI.BAT
In reply to [email protected]== Summary ==
== Summary ==
HEAD is now at ac2305b drm-intel-nightly: 2015y-12m-17d-16h-19m-23s UTC integration manifest
Applying: drm/i915: edp resume/On time optimization.
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 drm/i915: edp resume/On time optimization.
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx