drm/i915: Kill check_power_well() calls
Subsystems (2)
PATCH v2 1/1 drm/i915: Kill check_power_well() calls
From: Ville Syrjälä <[email protected]>
pps_{lock,unlock}() call intel_display_power_{get,put}() outside pps_mutes to avoid deadlocks with the power_domain mutex. In theory during aux transfers we should usually have the relevant power domain references already held by some higher level code, so this should not result in much overhead (exception being userspace i2c-dev access). However thanks to the check_power_well() calls in intel_display_power_{get/put}() we end up doing a few Punit reads for each aux transfer. Obviously doing this for each byte transferred via i2c-over-aux is not a good idea.
I can't think of a good way to keep check_power_well() while eliminating the overhead, so let's just remove check_power_well() entirely.
Fixes a driver init time regression introduced by:
commit 773538e86081d146e0020435d614f4b96996c1f9
Author: Ville Syrjälä <[email protected]>
Date: Thu Sep 4 14:54:56 2014 +0300
drm/i915: Reset power sequencer pipe tracking when disp2d is off
Credit goes to Jani for figuring this out.
v2: Add the regression note in the commit message.
Cc: [email protected]
Cc: Egbert Eich <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86201
--- drivers/gpu/drm/i915/intel_runtime_pm.c | 27 --------------------------- 1 file changed, 27 deletions(-)
drivers/gpu/drm/i915/intel_runtime_pm.c +0 -27
@@ -615,29 +615,6 @@ static void chv_pipe_power_well_disable(struct drm_i915_private *dev_priv,vlv_power_sequencer_reset (dev_priv); } -static void check_power_well_state (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -bool enabled = power_well->ops->is_enabled (dev_priv, power_well); - -if (power_well->always_on || !i915.disable_power_well) { -if (!enabled) - goto mismatch; - -return ; - } - -if (enabled != (power_well->count >0 )) - goto mismatch; - -return ; - -mismatch: -I915_STATE_WARN (1 ,"state mismatch for '%s' (always_on %d hw state %d use-count %d disable_power_well %d\n" , - power_well->name, power_well->always_on, enabled, - power_well->count, i915.disable_power_well); -} -/** * intel_display_power_get - grab a power domain reference * @dev_priv: i915 device instance
@@ -669,8 +646,6 @@ void intel_display_power_get(struct drm_i915_private *dev_priv, power_well->ops->enable (dev_priv, power_well); power_well->hw_enabled = true; } - -check_power_well_state (dev_priv, power_well); } power_domains->domain_use_count[domain]++;
@@ -709,8 +684,6 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, power_well->hw_enabled = false; power_well->ops->disable (dev_priv, power_well); } - -check_power_well_state (dev_priv, power_well); }mutex_unlock (&power_domains->lock);
Signature · 1 line
2.0.4
Quoted 24 lines · On Thu, 18 Dec 2014, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
pps_{lock,unlock}() call intel_display_power_{get,put}() outside
pps_mutesto avoid deadlocks with thepower_domainmutex. In theory during aux transfers we should usually have the relevant power domain references already held by some higher level code, so this should not result in much overhead (exception being userspace i2c-dev access). However thanks to thecheck_power_well()calls in intel_display_power_{get/put}() we end up doing a few Punit reads for each aux transfer. Obviously doing this for each byte transferred via i2c-over-aux is not a good idea.I can't think of a good way to keep
check_power_well()while eliminating the overhead, so let's just removecheck_power_well()entirely.Fixes a driver init time regression introduced by:
commit773538e86081d146e0020435d614f4b96996c1f9
Author: Ville Syrjälä <[email protected]>
Date: Thu Sep 4 14:54:56 2014 +0300drm/i915: Reset power sequencer pipe tracking when disp2d is off
Credit goes to Jani for figuring this out.
Quoted 7 lines
v2: Add the regression note in the commit message.
Cc: [email protected]
Cc: Egbert Eich <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86201Tested-by Wendy Wang <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>
Pushed to drm-intel-next-fixes, thanks for the patch.
BR,
Jani.
Quoted 63 lines
--- drivers/gpu/drm/i915/intel_runtime_pm.c | 27 --------------------------- 1 file changed, 27 deletions(-)drivers/gpu/drm/i915/intel_runtime_pm.c +0
-27@@ -615,29 +615,6 @@ static void chv_pipe_power_well_disable(struct drm_i915_private *dev_priv,vlv_power_sequencer_reset (dev_priv); } -static void check_power_well_state (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -bool enabled = power_well->ops->is_enabled (dev_priv, power_well); - -if (power_well->always_on || !i915.disable_power_well) { -if (!enabled) - goto mismatch; - -return ; - } - -if (enabled != (power_well->count >0 )) - goto mismatch; - -return ; - -mismatch: -I915_STATE_WARN (1 ,"state mismatch for '%s' (always_on %d hw state %d use-count %d disable_power_well %d\n" , - power_well->name, power_well->always_on, enabled, - power_well->count, i915.disable_power_well); -} -/** * intel_display_power_get - grab a power domain reference * @dev_priv: i915 device instance @@ -669,8 +646,6 @@ void intel_display_power_get(struct drm_i915_private *dev_priv, power_well->ops->enable (dev_priv, power_well); power_well->hw_enabled = true; } - -check_power_well_state (dev_priv, power_well); } power_domains->domain_use_count[domain]++;@@ -709,8 +684,6 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, power_well->hw_enabled = false; power_well->ops->disable (dev_priv, power_well); } - -check_power_well_state (dev_priv, power_well); }mutex_unlock (&power_domains->lock);Signature · 6 lines
2.0.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -2 364/364 362/364
ILK +1-1 364/366 364/366
SNB -1 448/450 447/450 IVB -1 497/498 496/498 BYT -1 289/289 288/289 HSW -1 563/564 562/564 BDW -3 416/417 413/417 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied PNV igt_gem_exec_blt NRUN(1, M23)PASS(1, M25) NRUN(1, M23) *PNV igt_kms_sysfs_edid_timing PASS(2, M25M23) FAIL(1, M23) ILK igt_gem_exec_blt NRUN(1, M37)PASS(1, M26) NRUN(1, M37) ILK igt_kms_flip_bcs-flip-vs-modeset-interruptible DMESG_WARN(1, M26)PASS(5, M37M26) PASS(1, M37) SNB igt_gem_exec_blt NRUN(3, M35M22)PASS(1, M35) NRUN(1, M35) IVB igt_gem_exec_blt NRUN(3, M34M21M4)PASS(1, M34) NRUN(1, M34) BYT igt_gem_exec_blt NRUN(1, M48)PASS(1, M48) NRUN(1, M48) HSW igt_gem_exec_blt NRUN(2, M40M20)PASS(1, M40) NRUN(1, M40) BDW igt_gem_exec_blt NRUN(1, M30)PASS(1, M28) NRUN(1, M30) BDW igt_gem_render_linear_blits TIMEOUT(1, M30)PASS(1, M28) TIMEOUT(1, M30) *BDW igt_gem_render_tiled_blits PASS(2, M28M30) TIMEOUT(1, M30)
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
Jani Nikula
maintainerQuoted 23 lines · On Thu, 18 Dec 2014, [email protected] wrote:
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -2 364/364 362/364
ILK +1-1 364/366 364/366SNB -1 448/450 447/450 IVB -1 497/498 496/498 BYT -1 289/289 288/289 HSW -1 563/564 562/564 BDW -3 416/417 413/417 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied PNV igt_gem_exec_blt NRUN(1, M23)PASS(1, M25) NRUN(1, M23) *PNV igt_kms_sysfs_edid_timing PASS(2, M25M23) FAIL(1, M23) ILK igt_gem_exec_blt NRUN(1, M37)PASS(1, M26) NRUN(1, M37) ILK igt_kms_flip_bcs-flip-vs-modeset-interruptible DMESG_WARN(1, M26)PASS(5, M37M26) PASS(1, M37) SNB igt_gem_exec_blt NRUN(3, M35M22)PASS(1, M35) NRUN(1, M35) IVB igt_gem_exec_blt NRUN(3, M34M21M4)PASS(1, M34) NRUN(1, M34) BYT igt_gem_exec_blt NRUN(1, M48)PASS(1, M48) NRUN(1, M48) HSW igt_gem_exec_blt NRUN(2, M40M20)PASS(1, M40) NRUN(1, M40) BDW igt_gem_exec_blt NRUN(1, M30)PASS(1, M28) NRUN(1, M30) BDW igt_gem_render_linear_blits TIMEOUT(1, M30)PASS(1, M28) TIMEOUT(1, M30) *BDW igt_gem_render_tiled_blits PASS(2, M28M30) TIMEOUT(1, M30)
Quoted 1 line
Note: You need to pay more attention to line start with '*'
The patch should not affect any of these.
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx