drm/i915/guc: Disable PL1 power limit when loading GuC firmware
Subsystems (2)
PATCH 1/1 drm/i915/guc: Disable PL1 power limit when loading GuC firmware
On dGfx, the PL1 power limit being enabled and set to a low value results in a low GPU operating freq. It also negates the freq raise operation which is done before GuC firmware load. As a result GuC firmware load can time out. Such timeouts were seen in the GL #8062 bug below (where the PL1 power limit was enabled and set to a low value). Therefore disable the PL1 power limit when possible when loading GuC firmware.
--- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 9 ++++++- drivers/gpu/drm/i915/i915_hwmon.c | 34 +++++++++++++++++++++++++-- drivers/gpu/drm/i915/i915_hwmon.h | 7 ++++++ 3 files changed, 47 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_uc.c +8 -1
@@ -18,6 +18,7 @@#include "intel_uc.h" #include "i915_drv.h" +#include "i915_hwmon.h" static const struct intel_uc_ops uc_ops_off;static const struct intel_uc_ops uc_ops_on;
@@ -460,7 +461,7 @@ static int __uc_init_hw(struct intel_uc *uc)struct drm_i915_private *i915 = gt->i915;struct intel_guc *guc = &uc->guc;struct intel_huc *huc = &uc->huc; -int ret, attempts; +int ret, attempts, pl1en;GEM_BUG_ON (!intel_uc_supports_guc (uc));GEM_BUG_ON (!intel_uc_wants_guc (uc));
@@ -491,6 +492,9 @@ static int __uc_init_hw(struct intel_uc *uc)else attempts =1 ; +/* Disable PL1 limit before raising freq when possible */ +hwm_power_max_disable (gt, &pl1en); +intel_rps_raise_unslice (&uc_to_gt (uc)->rps);while (attempts--) {
@@ -544,6 +548,9 @@ static int __uc_init_hw(struct intel_uc *uc)intel_rps_lower_unslice (&uc_to_gt (uc)->rps); } +/* Restore PL1 limit */ +hwm_power_max_restore (gt, pl1en); +guc_info (guc,"submission %s\n" ,str_enabled_disabled (intel_uc_uses_guc_submission (uc)));guc_info (guc,"SLPC %s\n" ,str_enabled_disabled (intel_uc_uses_guc_slpc (uc)));
drivers/gpu/drm/i915/i915_hwmon.c +32 -2
@@ -62,20 +62,23 @@ struct i915_hwmon {int scl_shift_time; }; -static void +static u32 hwm_locked_with_pm_intel_uncore_rmw (struct hwm_drvdata *ddat,i915_reg_t reg,u32 clear,u32 set) {struct i915_hwmon *hwmon = ddat->hwmon;struct intel_uncore *uncore = ddat->uncore;intel_wakeref_t wakeref; +u32 old;mutex_lock (&hwmon->hwmon_lock);with_intel_runtime_pm (uncore->rpm, wakeref) -intel_uncore_rmw (uncore, reg, clear, set); + old = intel_uncore_rmw(uncore, reg, clear, set);mutex_unlock (&hwmon->hwmon_lock); + +return old; }/*
@@ -444,6 +447,33 @@ hwm_power_write(struct hwm_drvdata *ddat, u32 attr, int chan, long val) } } +void hwm_power_max_disable (struct intel_gt *gt,u32 *old) +{ +struct i915_hwmon *hwmon = gt->i915->hwmon; +u32 r; + +if (!hwmon || !i915_mmio_reg_valid (hwmon->rg.pkg_rapl_limit)) +return ; + + r =hwm_locked_with_pm_intel_uncore_rmw (&hwmon->ddat, + hwmon->rg.pkg_rapl_limit, +PKG_PWR_LIM_1_EN ,0 ); + *old = !!(r &PKG_PWR_LIM_1_EN ); +} + +void hwm_power_max_restore (struct intel_gt *gt,u32 old) +{ +struct i915_hwmon *hwmon = gt->i915->hwmon; + +if (!hwmon || !i915_mmio_reg_valid (hwmon->rg.pkg_rapl_limit)) +return ; + +hwm_locked_with_pm_intel_uncore_rmw (&hwmon->ddat, + hwmon->rg.pkg_rapl_limit, +PKG_PWR_LIM_1_EN , + old ?PKG_PWR_LIM_1_EN :0 ); +} +static umode_t hwm_energy_is_visible (const struct hwm_drvdata *ddat,u32 attr) {
drivers/gpu/drm/i915/i915_hwmon.h +7 -0
@@ -7,14 +7,21 @@#ifndef __I915_HWMON_H__#define __I915_HWMON_H__ +#include <linux/types.h> +struct drm_i915_private ; +struct intel_gt ;#if IS_REACHABLE (CONFIG_HWMON )void i915_hwmon_register (struct drm_i915_private *i915);void i915_hwmon_unregister (struct drm_i915_private *i915); +void hwm_power_max_disable (struct intel_gt *gt,u32 *old); +void hwm_power_max_restore (struct intel_gt *gt,u32 old);#else static inline void i915_hwmon_register (struct drm_i915_private *i915) { };static inline void i915_hwmon_unregister (struct drm_i915_private *i915) { }; +void hwm_power_max_disable (struct intel_gt *gt,u32 *old) { }; +void hwm_power_max_restore (struct intel_gt *gt,u32 old) { };#endif #endif /* __I915_HWMON_H__ */
Signature · 1 line
2.38.0
Quoted 7 lines · Ashutosh Dixit
On dGfx, the PL1 power limit being enabled and set to a low value results in a low GPU operating freq. It also negates the freq raise operation which is done before GuC firmware load. As a result GuC firmware load can time out. Such timeouts were seen in the GL #8062 bug below (where the PL1 power limit was enabled and set to a low value). Therefore disable the PL1 power limit when possible when loading GuC firmware.
There are a couple of bugs in the patch. Please don't review yet, will post a v2. Thanks.