drm/i915/guc: Disable PL1 power limit when loading GuC firmware
Subsystems (2)
cover drm/i915/guc: Disable PL1 power limit when loading GuC firmware
Updates to Patch 2/3 and Patch 3/3 in this version.
Ashutosh Dixit (3):
drm/i915/hwmon: Get mutex and rpm ref just once in hwm_power_max_write drm/i915/guc: Disable PL1 power limit when loading GuC firmware drm/i915/hwmon: Block waiting for GuC reset to complete
drivers/gpu/drm/i915/gt/uc/intel_uc.c | 13 +++- drivers/gpu/drm/i915/i915_hwmon.c | 94 +++++++++++++++++++++++---- drivers/gpu/drm/i915/i915_hwmon.h | 7 ++ 3 files changed, 100 insertions(+), 14 deletions(-)
Signature · 1 line
2.38.0
PATCH 1/3 drm/i915/hwmon: Get mutex and rpm ref just once in hwm_power_max_write
In preparation for follow-on patches, refactor hwm_power_max_write to take hwmon_lock and runtime pm wakeref at start of the function and release them at the end, therefore acquiring these just once each.
--- drivers/gpu/drm/i915/i915_hwmon.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/i915_hwmon.c +15 -13
@@ -396,31 +396,33 @@ hwm_power_max_write(struct hwm_drvdata *ddat, long val) {struct i915_hwmon *hwmon = ddat->hwmon;intel_wakeref_t wakeref; +int ret =0 ;u32 nval; +mutex_lock (&hwmon->hwmon_lock); + wakeref =intel_runtime_pm_get (ddat->uncore->rpm); +/* Disable PL1 limit and verify, because the limit cannot be disabled on all platforms */ if (val ==PL1_DISABLE ) { -mutex_lock (&hwmon->hwmon_lock); - with_intel_runtime_pm(ddat->uncore->rpm, wakeref) { -intel_uncore_rmw (ddat->uncore, hwmon->rg.pkg_rapl_limit, -PKG_PWR_LIM_1_EN ,0 ); - nval =intel_uncore_read (ddat->uncore, hwmon->rg.pkg_rapl_limit); - } -mutex_unlock (&hwmon->hwmon_lock); +intel_uncore_rmw (ddat->uncore, hwmon->rg.pkg_rapl_limit, +PKG_PWR_LIM_1_EN ,0 ); + nval =intel_uncore_read (ddat->uncore, hwmon->rg.pkg_rapl_limit);if (nval &PKG_PWR_LIM_1_EN ) -return -ENODEV ; -return 0 ; + ret = -ENODEV ; + goto exit; }/* Computation in 64-bits to avoid overflow. Round to nearest. */ nval =DIV_ROUND_CLOSEST_ULL ((u64 )val << hwmon->scl_shift_power,SF_POWER ); nval =PKG_PWR_LIM_1_EN |REG_FIELD_PREP (PKG_PWR_LIM_1 , nval); -hwm_locked_with_pm_intel_uncore_rmw (ddat, hwmon->rg.pkg_rapl_limit, -PKG_PWR_LIM_1_EN |PKG_PWR_LIM_1 , - nval); -return 0 ; +intel_uncore_rmw (ddat->uncore, hwmon->rg.pkg_rapl_limit, +PKG_PWR_LIM_1_EN |PKG_PWR_LIM_1 , nval); +exit: +intel_runtime_pm_put (ddat->uncore->rpm, wakeref); +mutex_unlock (&hwmon->hwmon_lock); +return ret; } static int
Signature · 1 line
2.38.0
PATCH 2/3 drm/i915/guc: Disable PL1 power limit when loading GuC firmware
In reply to Ashutosh DixitOn 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 allowed by HW when loading GuC firmware.
v2:
- Take mutex (to disallow writes to power1_max) across GuC reset/fw load
- Add hwm_power_max_restore to error return code path
v3 (Jani N):
- Add/remove explanatory comments
- Function renames
- Type corrections
- Locking annotation
v4:
- Don't hold the lock across GuC reset (Rodrigo)
- New locking scheme (suggested by Rodrigo)
- Eliminate rpm_get in power_max_disable/restore, not needed (Tvrtko)
v5:
- Fix uninitialized pl1en variable compile warning reported by kernel build robot by creating new err_rps label
--- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 13 +++++++-- drivers/gpu/drm/i915/i915_hwmon.c | 40 +++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_hwmon.h | 7 +++++ 3 files changed, 58 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_uc.c +11 -2
@@ -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;
@@ -461,6 +462,7 @@ static int __uc_init_hw(struct intel_uc *uc)struct intel_guc *guc = &uc->guc;struct intel_huc *huc = &uc->huc;int ret, attempts; +bool pl1en;GEM_BUG_ON (!intel_uc_supports_guc (uc));GEM_BUG_ON (!intel_uc_wants_guc (uc));
@@ -491,6 +493,9 @@ static int __uc_init_hw(struct intel_uc *uc)else attempts =1 ; +/* Disable a potentially low PL1 power limit to allow freq to be raised */ +i915_hwmon_power_max_disable (gt->i915, &pl1en); +intel_rps_raise_unslice (&uc_to_gt (uc)->rps);while (attempts--) {
@@ -500,7 +505,7 @@ static int __uc_init_hw(struct intel_uc *uc)*/ ret =__uc_sanitize (uc);if (ret) - goto err_out; + goto err_rps;intel_huc_fw_upload (huc);intel_guc_ads_reset (guc);
@@ -547,6 +552,8 @@ static int __uc_init_hw(struct intel_uc *uc)intel_rps_lower_unslice (&uc_to_gt (uc)->rps); } +i915_hwmon_power_max_restore (gt->i915, 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)));
@@ -559,10 +566,12 @@ static int __uc_init_hw(struct intel_uc *uc)intel_guc_submission_disable (guc); err_log_capture:__uc_capture_load_err_log (uc); -err_out: +err_rps:/* Return GT back to RPn */ intel_rps_lower_unslice (&uc_to_gt (uc)->rps); +i915_hwmon_power_max_restore (gt->i915, pl1en); +err_out:__uc_sanitize (uc);if (!ret) {
drivers/gpu/drm/i915/i915_hwmon.c +40 -0
@@ -50,6 +50,7 @@ struct hwm_drvdata {struct hwm_energy_info ei;/* Energy info for energy1_input */ char name[12 ];int gt_n; +bool reset_in_progress; };struct i915_hwmon {
@@ -400,6 +401,10 @@ hwm_power_max_write(struct hwm_drvdata *ddat, long val)u32 nval;mutex_lock (&hwmon->hwmon_lock); +if (hwmon->ddat.reset_in_progress) { + ret = -EAGAIN ; + goto unlock; + } wakeref =intel_runtime_pm_get (ddat->uncore->rpm);/* Disable PL1 limit and verify, because the limit cannot be disabled on all platforms */
@@ -421,6 +426,7 @@ hwm_power_max_write(struct hwm_drvdata *ddat, long val) PKG_PWR_LIM_1_EN | PKG_PWR_LIM_1, nval); exit:intel_runtime_pm_put (ddat->uncore->rpm, wakeref); +unlock:mutex_unlock (&hwmon->hwmon_lock);return ret; }
@@ -472,6 +478,40 @@ hwm_power_write(struct hwm_drvdata *ddat, u32 attr, int chan, long val) } } +void i915_hwmon_power_max_disable (struct drm_i915_private *i915,bool *old) +{ +struct i915_hwmon *hwmon = i915->hwmon; +u32 r; + +if (!hwmon || !i915_mmio_reg_valid (hwmon->rg.pkg_rapl_limit)) +return ; + +mutex_lock (&hwmon->hwmon_lock); + + hwmon->ddat.reset_in_progress = true; + r =intel_uncore_rmw (hwmon->ddat.uncore, hwmon->rg.pkg_rapl_limit, +PKG_PWR_LIM_1_EN ,0 ); + *old = !!(r &PKG_PWR_LIM_1_EN ); + +mutex_unlock (&hwmon->hwmon_lock); +} + +void i915_hwmon_power_max_restore (struct drm_i915_private *i915,bool old) +{ +struct i915_hwmon *hwmon = i915->hwmon; + +if (!hwmon || !i915_mmio_reg_valid (hwmon->rg.pkg_rapl_limit)) +return ; + +mutex_lock (&hwmon->hwmon_lock); + +intel_uncore_rmw (hwmon->ddat.uncore, hwmon->rg.pkg_rapl_limit, +PKG_PWR_LIM_1_EN , old ?PKG_PWR_LIM_1_EN :0 ); + hwmon->ddat.reset_in_progress = false; + +mutex_unlock (&hwmon->hwmon_lock); +} +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 i915_hwmon_power_max_disable (struct drm_i915_private *i915,bool *old); +void i915_hwmon_power_max_restore (struct drm_i915_private *i915,bool old);#else static inline void i915_hwmon_register (struct drm_i915_private *i915) { };static inline void i915_hwmon_unregister (struct drm_i915_private *i915) { }; +static inline void i915_hwmon_power_max_disable (struct drm_i915_private *i915,bool *old) { }; +static inline void i915_hwmon_power_max_restore (struct drm_i915_private *i915,bool old) { };#endif #endif /* __I915_HWMON_H__ */
Signature · 1 line
2.38.0
PATCH 3/3 drm/i915/hwmon: Block waiting for GuC reset to complete
In reply to Ashutosh DixitInstead of erroring out when GuC reset is in progress, block waiting for GuC reset to complete which is a more reasonable uapi behavior.
v2: Avoid race between wake_up_all and waiting for wakeup (Rodrigo)
--- drivers/gpu/drm/i915/i915_hwmon.c | 38 +++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_hwmon.c +33 -5
@@ -51,6 +51,7 @@ struct hwm_drvdata {char name[12 ];int gt_n;bool reset_in_progress; +wait_queue_head_t waitq; };struct i915_hwmon {
@@ -395,16 +396,41 @@ hwm_power_max_read(struct hwm_drvdata *ddat, long *val)static int hwm_power_max_write (struct hwm_drvdata *ddat,long val) { +#define GUC_RESET_TIMEOUT msecs_to_jiffies(2000) + +int ret =0 , timeout =GUC_RESET_TIMEOUT ;struct i915_hwmon *hwmon = ddat->hwmon;intel_wakeref_t wakeref; -int ret =0 ; +DEFINE_WAIT (wait);u32 nval; -mutex_lock (&hwmon->hwmon_lock); -if (hwmon->ddat.reset_in_progress) { - ret = -EAGAIN ; - goto unlock; +/* Block waiting for GuC reset to complete when needed */ +for (;;) { +mutex_lock (&hwmon->hwmon_lock); + +prepare_to_wait (&ddat->waitq, &wait,TASK_INTERRUPTIBLE ); + +if (!hwmon->ddat.reset_in_progress) +break ; + +if (signal_pending (current)) { + ret = -EINTR ; +break ; + } + +if (!timeout) { + ret = -ETIME ; +break ; + } + +mutex_unlock (&hwmon->hwmon_lock); + + timeout =schedule_timeout (timeout); } +finish_wait (&ddat->waitq, &wait); +if (ret) + goto unlock; + wakeref =intel_runtime_pm_get (ddat->uncore->rpm);/* Disable PL1 limit and verify, because the limit cannot be disabled on all platforms */
@@ -508,6 +534,7 @@ void i915_hwmon_power_max_restore(struct drm_i915_private *i915, bool old)intel_uncore_rmw (hwmon->ddat.uncore, hwmon->rg.pkg_rapl_limit,PKG_PWR_LIM_1_EN , old ?PKG_PWR_LIM_1_EN :0 ); hwmon->ddat.reset_in_progress = false; +wake_up_all (&hwmon->ddat.waitq);mutex_unlock (&hwmon->hwmon_lock); }
@@ -784,6 +811,7 @@ void i915_hwmon_register(struct drm_i915_private *i915) ddat->uncore = &i915->uncore;snprintf (ddat->name,sizeof (ddat->name),"i915" ); ddat->gt_n =-1 ; +init_waitqueue_head (&ddat->waitq);for_each_gt (gt, i915, i) { ddat_gt = hwmon->ddat_gt + i;
Signature · 1 line
2.38.0
Rodrigo Vivi
maintainerRe: [PATCH 3/3] drm/i915/hwmon: Block waiting for GuC reset to complete
Quoted 32 lines · Ashutosh Dixit
Instead of erroring out when GuC reset is in progress, block waiting for GuC reset to complete which is a more reasonable uapi behavior.
v2: Avoid race between
wake_up_alland waiting for wakeup (Rodrigo)Signed-off-by Ashutosh Dixit <[email protected]>--- drivers/gpu/drm/i915/i915_hwmon.c | 38 +++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_hwmon.c +4
-1@@ -51,6 +51,7 @@ struct hwm_drvdata {char name[12 ];int gt_n;bool reset_in_progress; +wait_queue_head_t waitq; };struct i915_hwmon {@@ -395,16 +396,41 @@ hwm_power_max_read(struct hwm_drvdata *ddat, long *val)static int hwm_power_max_write (struct hwm_drvdata *ddat,long val) { +#define GUC_RESET_TIMEOUT msecs_to_jiffies(2000) + +int ret =0 , timeout =GUC_RESET_TIMEOUT ;struct i915_hwmon *hwmon = ddat->hwmon;intel_wakeref_t wakeref; -int ret =0 ;
drivers/gpu/drm/i915/i915_hwmon.c hwm_power_max_read(struct hwm_drvdata *ddat, long *val) · line 409
Quoted 10 lines
drivers/gpu/drm/i915/i915_hwmon.c +4
-4+DEFINE_WAIT (wait);u32 nval; -mutex_lock (&hwmon->hwmon_lock); -if (hwmon->ddat.reset_in_progress) { - ret = -EAGAIN ; - goto unlock; +/* Block waiting for GuC reset to complete when needed */ +for (;;) { +mutex_lock (&hwmon->hwmon_lock);
I'm really afraid of how this mutex is handled with the wait queue. some initial thought it looks like it is trying to reimplement ww_mutex?
all other examples of the wait_queue usages like this or didn't use locks or had it in a total different flow that I could not correlate.
drivers/gpu/drm/i915/i915_hwmon.c hwm_power_max_read(struct hwm_drvdata *ddat, long *val) · line 414
Quoted 5 lines
drivers/gpu/drm/i915/i915_hwmon.c +5
-0+ +prepare_to_wait (&ddat->waitq, &wait,TASK_INTERRUPTIBLE ); + +if (!hwmon->ddat.reset_in_progress) +break ;
If this breaks we never unlock it?
drivers/gpu/drm/i915/i915_hwmon.c hwm_power_max_read(struct hwm_drvdata *ddat, long *val) · line 426
Quoted 12 lines
drivers/gpu/drm/i915/i915_hwmon.c +12
-0+ +if (signal_pending (current)) { + ret = -EINTR ; +break ; + } + +if (!timeout) { + ret = -ETIME ; +break ; + } + +mutex_unlock (&hwmon->hwmon_lock);
do we need to lock the signal pending and timeout as well? or only wrapping it around the hwmon->ddat access would be enough?
Quoted 29 lines
drivers/gpu/drm/i915/i915_hwmon.c +8
-0+ + timeout =schedule_timeout (timeout); } +finish_wait (&ddat->waitq, &wait); +if (ret) + goto unlock; + wakeref =intel_runtime_pm_get (ddat->uncore->rpm);/* Disable PL1 limit and verify, because the limit cannot be disabled on all platforms */ @@ -508,6 +534,7 @@ void i915_hwmon_power_max_restore(struct drm_i915_private *i915, bool old)intel_uncore_rmw (hwmon->ddat.uncore, hwmon->rg.pkg_rapl_limit,PKG_PWR_LIM_1_EN , old ?PKG_PWR_LIM_1_EN :0 ); hwmon->ddat.reset_in_progress = false; +wake_up_all (&hwmon->ddat.waitq);mutex_unlock (&hwmon->hwmon_lock); }@@ -784,6 +811,7 @@ void i915_hwmon_register(struct drm_i915_private *i915) ddat->uncore = &i915->uncore;snprintf (ddat->name,sizeof (ddat->name),"i915" ); ddat->gt_n =-1 ; +init_waitqueue_head (&ddat->waitq);for_each_gt (gt, i915, i) { ddat_gt = hwmon->ddat_gt + i;Signature · 1 line
2.38.0
Re: [PATCH 3/3] drm/i915/hwmon: Block waiting for GuC reset to complete
Quoted 1 line · Rodrigo Vivi
Hi Rodrigo,
Quoted 36 lines · Ashutosh Dixit
Quoted 35 lines
Instead of erroring out when GuC reset is in progress, block waiting for GuC reset to complete which is a more reasonable uapi behavior.
v2: Avoid race between
wake_up_alland waiting for wakeup (Rodrigo)Signed-off-by Ashutosh Dixit <[email protected]>--- drivers/gpu/drm/i915/i915_hwmon.c | 38 +++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_hwmon.c +5
-1@@ -51,6 +51,7 @@ struct hwm_drvdata {char name[12 ];int gt_n;bool reset_in_progress; +wait_queue_head_t waitq; };struct i915_hwmon {@@ -395,16 +396,41 @@ hwm_power_max_read(struct hwm_drvdata *ddat, long *val)static int hwm_power_max_write (struct hwm_drvdata *ddat,long val) { +#define GUC_RESET_TIMEOUT msecs_to_jiffies(2000) + +int ret =0 , timeout =GUC_RESET_TIMEOUT ;struct i915_hwmon *hwmon = ddat->hwmon;intel_wakeref_t wakeref; -int ret =0 ; +DEFINE_WAIT (wait);u32 nval;
Quoted 10 lines
drivers/gpu/drm/i915/i915_hwmon.c hwm_power_max_read(struct hwm_drvdata *ddat, long *val) · line 409
Quoted 7 lines
drivers/gpu/drm/i915/i915_hwmon.c +3
-4-mutex_lock (&hwmon->hwmon_lock); -if (hwmon->ddat.reset_in_progress) { - ret = -EAGAIN ; - goto unlock; +/* Block waiting for GuC reset to complete when needed */ +for (;;) { +mutex_lock (&hwmon->hwmon_lock);I'm really afraid of how this mutex is handled with the wait queue. some initial thought it looks like it is trying to reimplement
ww_mutex?
Sorry, but I am missing the relation with ww_mutex. No such relation is intended.
Quoted 2 lines
all other examples of the
wait_queueusages like this or didn't use locks or had it in a total different flow that I could not correlate.
Actually there are several examples of prepare_to_wait/finish_wait sequences with both spinlock and mutex in the kernel. See e.g. rpm_suspend(), wait_for_rtrs_disconnection(), softsynthx_read().
Also, as I mentioned, except for the lock, the sequence here is identical to intel_guc_wait_for_pending_msg().
Quoted 8 lines
drivers/gpu/drm/i915/i915_hwmon.c hwm_power_max_read(struct hwm_drvdata *ddat, long *val) · line 414
Quoted 6 lines
drivers/gpu/drm/i915/i915_hwmon.c +5
-0+ +prepare_to_wait (&ddat->waitq, &wait,TASK_INTERRUPTIBLE ); + +if (!hwmon->ddat.reset_in_progress) +break ;If this breaks we never unlock it?
Correct, this is the original case in Patch 2 where the mutex is acquired in the beginning of the function and released just before the final exit from the function (so the mutex is held for the entire duration of the function).
Quoted 17 lines
drivers/gpu/drm/i915/i915_hwmon.c hwm_power_max_read(struct hwm_drvdata *ddat, long *val) · line 426
Quoted 13 lines
drivers/gpu/drm/i915/i915_hwmon.c +12
-0+ +if (signal_pending (current)) { + ret = -EINTR ; +break ; + } + +if (!timeout) { + ret = -ETIME ; +break ; + } + +mutex_unlock (&hwmon->hwmon_lock);do we need to lock the signal pending and timeout as well? or only wrapping it around the
hwmon->ddataccess would be enough?
Strictly, the mutex is only needed for the hwmon->ddat.reset_in_progress flag. But because this is not a performance path, implementing it as done in the patch simplifies the code flow (since there are several if/else, goto's, mutex lock/unlock and prepare_to_wait/finish_wait to consider).
So if possible I *really* want to not try to over-optimize here (I did try a few other things when writing the patch but it was getting ugly). The only real requirement is to drop the lock before calling schedule_timeout() below (and we are reacquiring the lock as soon as we are scheduled back in, as you can see in the loop above).
Quoted 25 lines
Quoted 25 lines
drivers/gpu/drm/i915/i915_hwmon.c +8
-0+ + timeout =schedule_timeout (timeout); } +finish_wait (&ddat->waitq, &wait); +if (ret) + goto unlock; + wakeref =intel_runtime_pm_get (ddat->uncore->rpm);/* Disable PL1 limit and verify, because the limit cannot be disabled on all platforms */ @@ -508,6 +534,7 @@ void i915_hwmon_power_max_restore(struct drm_i915_private *i915, bool old)intel_uncore_rmw (hwmon->ddat.uncore, hwmon->rg.pkg_rapl_limit,PKG_PWR_LIM_1_EN , old ?PKG_PWR_LIM_1_EN :0 ); hwmon->ddat.reset_in_progress = false; +wake_up_all (&hwmon->ddat.waitq);mutex_unlock (&hwmon->hwmon_lock); }@@ -784,6 +811,7 @@ void i915_hwmon_register(struct drm_i915_private *i915) ddat->uncore = &i915->uncore;snprintf (ddat->name,sizeof (ddat->name),"i915" ); ddat->gt_n =-1 ; +init_waitqueue_head (&ddat->waitq);
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/i915/i915_hwmon.c +0
-1for_each_gt (gt, i915, i) { ddat_gt = hwmon->ddat_gt + i; --2.38.0
From what I understand is the locking above is fine and is not the point. The real race is between schedule_timeout() (which suspends the thread) and wake_up_all() (which schedules it back in). But this prepare_to_wait/finish_wait pattern is so widespread that the kernel guarantees that this works correctly as long as you do things in the correct order (otherwise we'd see a lot more kernel hangs/deadlocks).
Thanks,
Ashutosh
Rodrigo Vivi
maintainerRe: [PATCH 3/3] drm/i915/hwmon: Block waiting for GuC reset to complete
Quoted 74 lines · Ashutosh
Quoted 1 line · Rodrigo Vivi
Hi Rodrigo,
Quoted 36 lines · Ashutosh Dixit
Quoted 35 lines
Instead of erroring out when GuC reset is in progress, block waiting for GuC reset to complete which is a more reasonable uapi behavior.
v2: Avoid race between
wake_up_alland waiting for wakeup (Rodrigo)Signed-off-by Ashutosh Dixit <[email protected]>--- drivers/gpu/drm/i915/i915_hwmon.c | 38 +++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_hwmon.c +5
-1@@ -51,6 +51,7 @@ struct hwm_drvdata {char name[12 ];int gt_n;bool reset_in_progress; +wait_queue_head_t waitq; };struct i915_hwmon {@@ -395,16 +396,41 @@ hwm_power_max_read(struct hwm_drvdata *ddat, long *val)static int hwm_power_max_write (struct hwm_drvdata *ddat,long val) { +#define GUC_RESET_TIMEOUT msecs_to_jiffies(2000) + +int ret =0 , timeout =GUC_RESET_TIMEOUT ;struct i915_hwmon *hwmon = ddat->hwmon;intel_wakeref_t wakeref; -int ret =0 ; +DEFINE_WAIT (wait);u32 nval;Quoted 10 lines
drivers/gpu/drm/i915/i915_hwmon.c hwm_power_max_read(struct hwm_drvdata *ddat, long *val) · line 409
Quoted 7 lines
drivers/gpu/drm/i915/i915_hwmon.c +3
-4-mutex_lock (&hwmon->hwmon_lock); -if (hwmon->ddat.reset_in_progress) { - ret = -EAGAIN ; - goto unlock; +/* Block waiting for GuC reset to complete when needed */ +for (;;) { +mutex_lock (&hwmon->hwmon_lock);I'm really afraid of how this mutex is handled with the wait queue. some initial thought it looks like it is trying to reimplement
ww_mutex?Sorry, but I am missing the relation with
ww_mutex. No such relation is intended.Quoted 2 lines
all other examples of the
wait_queueusages like this or didn't use locks or had it in a total different flow that I could not correlate.Actually there are several examples of prepare_to_wait/finish_wait sequences with both spinlock and mutex in the kernel. See e.g.
rpm_suspend(),wait_for_rtrs_disconnection(),softsynthx_read().Also, as I mentioned, except for the lock, the sequence here is identical to
intel_guc_wait_for_pending_msg().Quoted 8 lines
drivers/gpu/drm/i915/i915_hwmon.c hwm_power_max_read(struct hwm_drvdata *ddat, long *val) · line 414
Quoted 6 lines
drivers/gpu/drm/i915/i915_hwmon.c +5
-0+ +prepare_to_wait (&ddat->waitq, &wait,TASK_INTERRUPTIBLE ); + +if (!hwmon->ddat.reset_in_progress) +break ;If this breaks we never unlock it?
Quoted 4 lines
Correct, this is the original case in Patch 2 where the mutex is acquired in the beginning of the function and released just before the final exit from the function (so the mutex is held for the entire duration of the function).
I got really confused here... I looked at the patch 2 again and I don't see any place where the lock remains outside of the function. What was what I asked to remove on the initial versions.
But now with this one I'm even more confused because I couldn't follow to understand who will remove the lock and when.
Quoted 70 lines
Quoted 18 lines
Quoted 4 lines
drivers/gpu/drm/i915/i915_hwmon.c +2
-0+ +if (signal_pending (current)) {drivers/gpu/drm/i915/i915_hwmon.c hwm_power_max_read(struct hwm_drvdata *ddat, long *val) · line 426
Quoted 10 lines
drivers/gpu/drm/i915/i915_hwmon.c +10
-0+ ret = -EINTR ; +break ; + } + +if (!timeout) { + ret = -ETIME ; +break ; + } + +mutex_unlock (&hwmon->hwmon_lock);do we need to lock the signal pending and timeout as well? or only wrapping it around the
hwmon->ddataccess would be enough?Strictly, the mutex is only needed for the
hwmon->ddat.reset_in_progressflag. But because this is not a performance path, implementing it as done in the patch simplifies the code flow (since there are several if/else, goto's, mutex lock/unlock and prepare_to_wait/finish_wait to consider).So if possible I *really* want to not try to over-optimize here (I did try a few other things when writing the patch but it was getting ugly). The only real requirement is to drop the lock before calling
schedule_timeout()below (and we are reacquiring the lock as soon as we are scheduled back in, as you can see in the loop above).Quoted 25 lines
Quoted 25 lines
drivers/gpu/drm/i915/i915_hwmon.c +8
-0+ + timeout =schedule_timeout (timeout); } +finish_wait (&ddat->waitq, &wait); +if (ret) + goto unlock; + wakeref =intel_runtime_pm_get (ddat->uncore->rpm);/* Disable PL1 limit and verify, because the limit cannot be disabled on all platforms */ @@ -508,6 +534,7 @@ void i915_hwmon_power_max_restore(struct drm_i915_private *i915, bool old)intel_uncore_rmw (hwmon->ddat.uncore, hwmon->rg.pkg_rapl_limit,PKG_PWR_LIM_1_EN , old ?PKG_PWR_LIM_1_EN :0 ); hwmon->ddat.reset_in_progress = false; +wake_up_all (&hwmon->ddat.waitq);mutex_unlock (&hwmon->hwmon_lock); }@@ -784,6 +811,7 @@ void i915_hwmon_register(struct drm_i915_private *i915) ddat->uncore = &i915->uncore;snprintf (ddat->name,sizeof (ddat->name),"i915" ); ddat->gt_n =-1 ; +init_waitqueue_head (&ddat->waitq);Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/i915/i915_hwmon.c +0
-1for_each_gt (gt, i915, i) { ddat_gt = hwmon->ddat_gt + i; --2.38.0
From what I understand is the locking above is fine and is not the point. The real race is between
schedule_timeout()(which suspends the thread) andwake_up_all()(which schedules it back in). But this prepare_to_wait/finish_wait pattern is so widespread that the kernel guarantees that this works correctly as long as you do things in the correct order (otherwise we'd see a lot more kernel hangs/deadlocks).Thanks,
Ashutosh
Re: [PATCH 3/3] drm/i915/hwmon: Block waiting for GuC reset to complete
Quoted 1 line · Rodrigo Vivi
Hi Rodrigo,
Quoted 75 lines · Ashutosh
Quoted 74 lines · Rodrigo Vivi
Quoted 1 line
Hi Rodrigo,
Quoted 36 lines · Ashutosh Dixit
Quoted 35 lines
Instead of erroring out when GuC reset is in progress, block waiting for GuC reset to complete which is a more reasonable uapi behavior.
v2: Avoid race between
wake_up_alland waiting for wakeup (Rodrigo)Signed-off-by Ashutosh Dixit <[email protected]>--- drivers/gpu/drm/i915/i915_hwmon.c | 38 +++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_hwmon.c +5
-1@@ -51,6 +51,7 @@ struct hwm_drvdata {char name[12 ];int gt_n;bool reset_in_progress; +wait_queue_head_t waitq; };struct i915_hwmon {@@ -395,16 +396,41 @@ hwm_power_max_read(struct hwm_drvdata *ddat, long *val)static int hwm_power_max_write (struct hwm_drvdata *ddat,long val) { +#define GUC_RESET_TIMEOUT msecs_to_jiffies(2000) + +int ret =0 , timeout =GUC_RESET_TIMEOUT ;struct i915_hwmon *hwmon = ddat->hwmon;intel_wakeref_t wakeref; -int ret =0 ; +DEFINE_WAIT (wait);u32 nval;Quoted 10 lines
drivers/gpu/drm/i915/i915_hwmon.c hwm_power_max_read(struct hwm_drvdata *ddat, long *val) · line 409
Quoted 7 lines
drivers/gpu/drm/i915/i915_hwmon.c +3
-4-mutex_lock (&hwmon->hwmon_lock); -if (hwmon->ddat.reset_in_progress) { - ret = -EAGAIN ; - goto unlock; +/* Block waiting for GuC reset to complete when needed */ +for (;;) { +mutex_lock (&hwmon->hwmon_lock);I'm really afraid of how this mutex is handled with the wait queue. some initial thought it looks like it is trying to reimplement
ww_mutex?Sorry, but I am missing the relation with
ww_mutex. No such relation is intended.Quoted 2 lines
all other examples of the
wait_queueusages like this or didn't use locks or had it in a total different flow that I could not correlate.Actually there are several examples of prepare_to_wait/finish_wait sequences with both spinlock and mutex in the kernel. See e.g.
rpm_suspend(),wait_for_rtrs_disconnection(),softsynthx_read().Also, as I mentioned, except for the lock, the sequence here is identical to
intel_guc_wait_for_pending_msg().Quoted 8 lines
drivers/gpu/drm/i915/i915_hwmon.c hwm_power_max_read(struct hwm_drvdata *ddat, long *val) · line 414
Quoted 6 lines
drivers/gpu/drm/i915/i915_hwmon.c +5
-0+ +prepare_to_wait (&ddat->waitq, &wait,TASK_INTERRUPTIBLE ); + +if (!hwmon->ddat.reset_in_progress) +break ;If this breaks we never unlock it?
Quoted 6 lines
Quoted 4 lines
Correct, this is the original case in Patch 2 where the mutex is acquired in the beginning of the function and released just before the final exit from the function (so the mutex is held for the entire duration of the function).
I got really confused here...
Sorry, the patch is a little confusing/tricky but I thought I'd better stick to the standard 'for (;;)' loop pattern otherwise it will also be hard to review.
Quoted 3 lines
I looked at the patch 2 again and I don't see any place where the lock remains outside of the function. What was what I asked to remove on the initial versions.
So it was in Patch 1 where we changed the code to take the lock in the beginning of the function and release it at the end of the function (you can see it Patch 1).
In Patch 2 the 'unlock' label and 'goto unlock' is introduced and the lock is released at the 'unlock' label (it is visible in Patch 2).
Quoted 2 lines
But now with this one I'm even more confused because I couldn't follow to understand who will remove the lock and when.
In Patch 3 again the lock is released at the the 'unlock' label (i.e. the destination of 'goto unlock', not visible in Patch 3). But we execute 'goto unlock' only when 'ret != 0' in the 'for (;;)' loop. But when 'ret == 0' (when 'ddat.reset_in_progress' flag is clear) we hold the mutex, execute the entire function and finally release the lock at the end of the function.
Hopefully this helps.
Thanks.
--
Ashutosh
Quoted 71 lines
Quoted 71 lines
Quoted 19 lines
Quoted 5 lines
drivers/gpu/drm/i915/i915_hwmon.c +2
-0+ +if (signal_pending (current)) {drivers/gpu/drm/i915/i915_hwmon.c hwm_power_max_read(struct hwm_drvdata *ddat, long *val) · line 426
Quoted 10 lines
drivers/gpu/drm/i915/i915_hwmon.c +10
-0+ ret = -EINTR ; +break ; + } + +if (!timeout) { + ret = -ETIME ; +break ; + } + +mutex_unlock (&hwmon->hwmon_lock);do we need to lock the signal pending and timeout as well? or only wrapping it around the
hwmon->ddataccess would be enough?Strictly, the mutex is only needed for the
hwmon->ddat.reset_in_progressflag. But because this is not a performance path, implementing it as done in the patch simplifies the code flow (since there are several if/else, goto's, mutex lock/unlock and prepare_to_wait/finish_wait to consider).So if possible I *really* want to not try to over-optimize here (I did try a few other things when writing the patch but it was getting ugly). The only real requirement is to drop the lock before calling
schedule_timeout()below (and we are reacquiring the lock as soon as we are scheduled back in, as you can see in the loop above).Quoted 25 lines
Quoted 25 lines
drivers/gpu/drm/i915/i915_hwmon.c +8
-0+ + timeout =schedule_timeout (timeout); } +finish_wait (&ddat->waitq, &wait); +if (ret) + goto unlock; + wakeref =intel_runtime_pm_get (ddat->uncore->rpm);/* Disable PL1 limit and verify, because the limit cannot be disabled on all platforms */ @@ -508,6 +534,7 @@ void i915_hwmon_power_max_restore(struct drm_i915_private *i915, bool old)intel_uncore_rmw (hwmon->ddat.uncore, hwmon->rg.pkg_rapl_limit,PKG_PWR_LIM_1_EN , old ?PKG_PWR_LIM_1_EN :0 ); hwmon->ddat.reset_in_progress = false; +wake_up_all (&hwmon->ddat.waitq);mutex_unlock (&hwmon->hwmon_lock); }@@ -784,6 +811,7 @@ void i915_hwmon_register(struct drm_i915_private *i915) ddat->uncore = &i915->uncore;snprintf (ddat->name,sizeof (ddat->name),"i915" ); ddat->gt_n =-1 ; +init_waitqueue_head (&ddat->waitq);Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/i915/i915_hwmon.c +0
-1for_each_gt (gt, i915, i) { ddat_gt = hwmon->ddat_gt + i; --2.38.0
From what I understand is the locking above is fine and is not the point. The real race is between
schedule_timeout()(which suspends the thread) andwake_up_all()(which schedules it back in). But this prepare_to_wait/finish_wait pattern is so widespread that the kernel guarantees that this works correctly as long as you do things in the correct order (otherwise we'd see a lot more kernel hangs/deadlocks).Thanks,
Ashutosh
Re: [Intel-gfx] [PATCH 3/3] drm/i915/hwmon: Block waiting for GuC reset to complete
Quoted 105 lines · Ashutosh
Quoted 1 line · Rodrigo Vivi
Hi Rodrigo,
Quoted 75 lines · Ashutosh
Quoted 74 lines · Rodrigo Vivi
Quoted 1 line
Hi Rodrigo,
Quoted 36 lines · Ashutosh Dixit
Quoted 35 lines
Instead of erroring out when GuC reset is in progress, block waiting for GuC reset to complete which is a more reasonable uapi behavior.
v2: Avoid race between
wake_up_alland waiting for wakeup (Rodrigo)Signed-off-by Ashutosh Dixit <[email protected]>--- drivers/gpu/drm/i915/i915_hwmon.c | 38 +++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_hwmon.c +5
-1@@ -51,6 +51,7 @@ struct hwm_drvdata {char name[12 ];int gt_n;bool reset_in_progress; +wait_queue_head_t waitq; };struct i915_hwmon {@@ -395,16 +396,41 @@ hwm_power_max_read(struct hwm_drvdata *ddat, long *val)static int hwm_power_max_write (struct hwm_drvdata *ddat,long val) { +#define GUC_RESET_TIMEOUT msecs_to_jiffies(2000) + +int ret =0 , timeout =GUC_RESET_TIMEOUT ;struct i915_hwmon *hwmon = ddat->hwmon;intel_wakeref_t wakeref; -int ret =0 ; +DEFINE_WAIT (wait);u32 nval;Quoted 10 lines
drivers/gpu/drm/i915/i915_hwmon.c hwm_power_max_read(struct hwm_drvdata *ddat, long *val) · line 409
Quoted 7 lines
drivers/gpu/drm/i915/i915_hwmon.c +3
-4-mutex_lock (&hwmon->hwmon_lock); -if (hwmon->ddat.reset_in_progress) { - ret = -EAGAIN ; - goto unlock; +/* Block waiting for GuC reset to complete when needed */ +for (;;) { +mutex_lock (&hwmon->hwmon_lock);I'm really afraid of how this mutex is handled with the wait queue. some initial thought it looks like it is trying to reimplement
ww_mutex?Sorry, but I am missing the relation with
ww_mutex. No such relation is intended.Quoted 2 lines
all other examples of the
wait_queueusages like this or didn't use locks or had it in a total different flow that I could not correlate.Actually there are several examples of prepare_to_wait/finish_wait sequences with both spinlock and mutex in the kernel. See e.g.
rpm_suspend(),wait_for_rtrs_disconnection(),softsynthx_read().Also, as I mentioned, except for the lock, the sequence here is identical to
intel_guc_wait_for_pending_msg().Quoted 8 lines
drivers/gpu/drm/i915/i915_hwmon.c hwm_power_max_read(struct hwm_drvdata *ddat, long *val) · line 414
Quoted 6 lines
drivers/gpu/drm/i915/i915_hwmon.c +5
-0+ +prepare_to_wait (&ddat->waitq, &wait,TASK_INTERRUPTIBLE ); + +if (!hwmon->ddat.reset_in_progress) +break ;If this breaks we never unlock it?
Quoted 6 lines
Quoted 4 lines
Correct, this is the original case in Patch 2 where the mutex is acquired in the beginning of the function and released just before the final exit from the function (so the mutex is held for the entire duration of the function).
I got really confused here...
Sorry, the patch is a little confusing/tricky but I thought I'd better stick to the standard 'for (;;)' loop pattern otherwise it will also be hard to review.
Quoted 3 lines
I looked at the patch 2 again and I don't see any place where the lock remains outside of the function. What was what I asked to remove on the initial versions.
So it was in Patch 1 where we changed the code to take the lock in the beginning of the function and release it at the end of the function (you can see it Patch 1).
In Patch 2 the 'unlock' label and 'goto unlock' is introduced and the lock is released at the 'unlock' label (it is visible in Patch 2).
Quoted 2 lines
But now with this one I'm even more confused because I couldn't follow to understand who will remove the lock and when.
Quoted 8 lines
In Patch 3 again the lock is released at the the 'unlock' label (i.e. the destination of 'goto unlock', not visible in Patch 3). But we execute 'goto unlock' only when 'ret != 0' in the 'for (;;)' loop. But when 'ret == 0' (when 'ddat.reset_in_progress' flag is clear) we hold the mutex, execute the entire function and finally release the lock at the end of the function.
Hopefully this helps.
more coffee also helped! I'm sorry for the noise.
with the timeout thing sorted out:
Quoted 76 lines
Thanks.
--
AshutoshQuoted 71 lines
Quoted 71 lines
Quoted 19 lines
Quoted 5 lines
drivers/gpu/drm/i915/i915_hwmon.c +2
-0+ +if (signal_pending (current)) {drivers/gpu/drm/i915/i915_hwmon.c hwm_power_max_read(struct hwm_drvdata *ddat, long *val) · line 426
Quoted 10 lines
drivers/gpu/drm/i915/i915_hwmon.c +10
-0+ ret = -EINTR ; +break ; + } + +if (!timeout) { + ret = -ETIME ; +break ; + } + +mutex_unlock (&hwmon->hwmon_lock);do we need to lock the signal pending and timeout as well? or only wrapping it around the
hwmon->ddataccess would be enough?Strictly, the mutex is only needed for the
hwmon->ddat.reset_in_progressflag. But because this is not a performance path, implementing it as done in the patch simplifies the code flow (since there are several if/else, goto's, mutex lock/unlock and prepare_to_wait/finish_wait to consider).So if possible I *really* want to not try to over-optimize here (I did try a few other things when writing the patch but it was getting ugly). The only real requirement is to drop the lock before calling
schedule_timeout()below (and we are reacquiring the lock as soon as we are scheduled back in, as you can see in the loop above).Quoted 25 lines
Quoted 25 lines
drivers/gpu/drm/i915/i915_hwmon.c +8
-0+ + timeout =schedule_timeout (timeout); } +finish_wait (&ddat->waitq, &wait); +if (ret) + goto unlock; + wakeref =intel_runtime_pm_get (ddat->uncore->rpm);/* Disable PL1 limit and verify, because the limit cannot be disabled on all platforms */ @@ -508,6 +534,7 @@ void i915_hwmon_power_max_restore(struct drm_i915_private *i915, bool old)intel_uncore_rmw (hwmon->ddat.uncore, hwmon->rg.pkg_rapl_limit,PKG_PWR_LIM_1_EN , old ?PKG_PWR_LIM_1_EN :0 ); hwmon->ddat.reset_in_progress = false; +wake_up_all (&hwmon->ddat.waitq);mutex_unlock (&hwmon->hwmon_lock); }@@ -784,6 +811,7 @@ void i915_hwmon_register(struct drm_i915_private *i915) ddat->uncore = &i915->uncore;snprintf (ddat->name,sizeof (ddat->name),"i915" ); ddat->gt_n =-1 ; +init_waitqueue_head (&ddat->waitq);Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/i915/i915_hwmon.c +0
-1for_each_gt (gt, i915, i) { ddat_gt = hwmon->ddat_gt + i; --2.38.0
From what I understand is the locking above is fine and is not the point. The real race is between
schedule_timeout()(which suspends the thread) andwake_up_all()(which schedules it back in). But this prepare_to_wait/finish_wait pattern is so widespread that the kernel guarantees that this works correctly as long as you do things in the correct order (otherwise we'd see a lot more kernel hangs/deadlocks).Thanks,
Ashutosh
Re: [PATCH 3/3] drm/i915/hwmon: Block waiting for GuC reset to complete
In reply to Ashutosh DixitQuoted 23 lines · Ashutosh Dixit
Instead of erroring out when GuC reset is in progress, block waiting for GuC reset to complete which is a more reasonable uapi behavior.
v2: Avoid race between
wake_up_alland waiting for wakeup (Rodrigo)Signed-off-by Ashutosh Dixit <[email protected]>--- drivers/gpu/drm/i915/i915_hwmon.c | 38 +++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_hwmon.c +1
-0@@ -51,6 +51,7 @@ struct hwm_drvdata {char name[12 ];int gt_n;bool reset_in_progress; +wait_queue_head_t waitq; };struct i915_hwmon {
drivers/gpu/drm/i915/i915_hwmon.c hwm_power_max_read(struct hwm_drvdata *ddat, long *val) · line 401
Quoted 6 lines
drivers/gpu/drm/i915/i915_hwmon.c +3
-0@@ -395,16 +396,41 @@ hwm_power_max_read(struct hwm_drvdata *ddat, long *val)static int hwm_power_max_write (struct hwm_drvdata *ddat,long val) { +#define GUC_RESET_TIMEOUT msecs_to_jiffies(2000) + +int ret =0 , timeout =GUC_RESET_TIMEOUT ;
Patch looks good to me apart that I am not sure what is the purpose of the timeout? This is just the sysfs write path or has more callers? If the former perhaps it would be better to just use interruptible everything (mutex and sleep) and wait for as long as it takes or until user presses Ctrl-C?
Regards,
Tvrtko
Quoted 56 lines
drivers/gpu/drm/i915/i915_hwmon.c +29
-5struct i915_hwmon *hwmon = ddat->hwmon;intel_wakeref_t wakeref; -int ret =0 ; +DEFINE_WAIT (wait);u32 nval; -mutex_lock (&hwmon->hwmon_lock); -if (hwmon->ddat.reset_in_progress) { - ret = -EAGAIN ; - goto unlock; +/* Block waiting for GuC reset to complete when needed */ +for (;;) { +mutex_lock (&hwmon->hwmon_lock); + +prepare_to_wait (&ddat->waitq, &wait,TASK_INTERRUPTIBLE ); + +if (!hwmon->ddat.reset_in_progress) +break ; + +if (signal_pending (current)) { + ret = -EINTR ; +break ; + } + +if (!timeout) { + ret = -ETIME ; +break ; + } + +mutex_unlock (&hwmon->hwmon_lock); + + timeout =schedule_timeout (timeout); } +finish_wait (&ddat->waitq, &wait); +if (ret) + goto unlock; + wakeref =intel_runtime_pm_get (ddat->uncore->rpm);/* Disable PL1 limit and verify, because the limit cannot be disabled on all platforms */ @@ -508,6 +534,7 @@ void i915_hwmon_power_max_restore(struct drm_i915_private *i915, bool old)intel_uncore_rmw (hwmon->ddat.uncore, hwmon->rg.pkg_rapl_limit,PKG_PWR_LIM_1_EN , old ?PKG_PWR_LIM_1_EN :0 ); hwmon->ddat.reset_in_progress = false; +wake_up_all (&hwmon->ddat.waitq);mutex_unlock (&hwmon->hwmon_lock); }@@ -784,6 +811,7 @@ void i915_hwmon_register(struct drm_i915_private *i915) ddat->uncore = &i915->uncore;snprintf (ddat->name,sizeof (ddat->name),"i915" ); ddat->gt_n =-1 ; +init_waitqueue_head (&ddat->waitq);for_each_gt (gt, i915, i) { ddat_gt = hwmon->ddat_gt + i;
Re: [PATCH 3/3] drm/i915/hwmon: Block waiting for GuC reset to complete
Quoted 1 line · Tvrtko Ursulin
Hi Tvrtko,
Quoted 23 lines · Ashutosh Dixit
Quoted 22 lines
Instead of erroring out when GuC reset is in progress, block waiting for GuC reset to complete which is a more reasonable uapi behavior.
v2: Avoid race between
wake_up_alland waiting for wakeup (Rodrigo)Signed-off-by Ashutosh Dixit <[email protected]>--- drivers/gpu/drm/i915/i915_hwmon.c | 38 +++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_hwmon.c +1
-0@@ -51,6 +51,7 @@ struct hwm_drvdata {char name[12 ];int gt_n;bool reset_in_progress; +wait_queue_head_t waitq; };struct i915_hwmon {@@ -395,16 +396,41 @@ hwm_power_max_read(struct hwm_drvdata *ddat, long *val)
Quoted 8 lines
drivers/gpu/drm/i915/i915_hwmon.c hwm_power_max_read(struct hwm_drvdata *ddat, long *val) · line 401
Quoted 6 lines
drivers/gpu/drm/i915/i915_hwmon.c +3
-0static int hwm_power_max_write (struct hwm_drvdata *ddat,long val) { +#define GUC_RESET_TIMEOUT msecs_to_jiffies(2000) + +int ret =0 , timeout =GUC_RESET_TIMEOUT ;Patch looks good to me
Great, thanks :)
Quoted 2 lines
apart that I am not sure what is the purpose of the timeout? This is just the sysfs write path or has more callers?
It is just the sysfs path, but the sysfs is accessed also by the oneAPI stack (Level 0). In the initial version I also didn't have the timeout thinking that the app can send a signal to the blocked thread to unblock it. I introduced the timeout after Rodrigo brought it up and I am now thinking maybe it's better to have the timeout in the driver since the app has no knowledge of how long GuC resets can take. But I can remove it if you think it's not needed.
Quoted 4 lines
If the
former perhaps it would be better to just use interruptible everything (mutex and sleep) and wait for as long as it takes or until user presses Ctrl-C?
Now we are not holding the mutexes for long, just long enough do register rmw's. So not holding the mutex across GuC reset as we were originally. Therefore I am thinking mutex_lock_interruptible is not needed? The sleep is already interruptible (TASK_INTERRUPTIBLE).
Anyway please let me know if you think we need to change anything.
Thanks.
--
Ashutosh
Quoted 53 lines
Quoted 53 lines
drivers/gpu/drm/i915/i915_hwmon.c +27
-4struct i915_hwmon *hwmon = ddat->hwmon;intel_wakeref_t wakeref; -int ret =0 ; +DEFINE_WAIT (wait);u32 nval; -mutex_lock (&hwmon->hwmon_lock); -if (hwmon->ddat.reset_in_progress) { - ret = -EAGAIN ; - goto unlock; +/* Block waiting for GuC reset to complete when needed */ +for (;;) { +mutex_lock (&hwmon->hwmon_lock); + +prepare_to_wait (&ddat->waitq, &wait,TASK_INTERRUPTIBLE ); + +if (!hwmon->ddat.reset_in_progress) +break ; + +if (signal_pending (current)) { + ret = -EINTR ; +break ; + } + +if (!timeout) { + ret = -ETIME ; +break ; + } + +mutex_unlock (&hwmon->hwmon_lock); + + timeout =schedule_timeout (timeout); } +finish_wait (&ddat->waitq, &wait); +if (ret) + goto unlock; + wakeref =intel_runtime_pm_get (ddat->uncore->rpm);/* Disable PL1 limit and verify, because the limit cannot be disabled on all platforms */
drivers/gpu/drm/i915/i915_hwmon.c +2
-0@@ -508,6 +534,7 @@ void i915_hwmon_power_max_restore(struct drm_i915_private *i915, bool old)intel_uncore_rmw (hwmon->ddat.uncore, hwmon->rg.pkg_rapl_limit,PKG_PWR_LIM_1_EN , old ?PKG_PWR_LIM_1_EN :0 ); hwmon->ddat.reset_in_progress = false; +wake_up_all (&hwmon->ddat.waitq);mutex_unlock (&hwmon->hwmon_lock); }@@ -784,6 +811,7 @@ void i915_hwmon_register(struct drm_i915_private *i915) ddat->uncore = &i915->uncore;snprintf (ddat->name,sizeof (ddat->name),"i915" ); ddat->gt_n =-1 ; +init_waitqueue_head (&ddat->waitq);for_each_gt (gt, i915, i) { ddat_gt = hwmon->ddat_gt + i;
Re: [PATCH 3/3] drm/i915/hwmon: Block waiting for GuC reset to complete
Quoted 42 lines · Ashutosh
Quoted 1 line · Tvrtko Ursulin
Hi Tvrtko,
Quoted 23 lines · Ashutosh Dixit
Quoted 22 lines
Instead of erroring out when GuC reset is in progress, block waiting for GuC reset to complete which is a more reasonable uapi behavior.
v2: Avoid race between
wake_up_alland waiting for wakeup (Rodrigo)Signed-off-by Ashutosh Dixit <[email protected]>--- drivers/gpu/drm/i915/i915_hwmon.c | 38 +++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_hwmon.c +1
-0@@ -51,6 +51,7 @@ struct hwm_drvdata {char name[12 ];int gt_n;bool reset_in_progress; +wait_queue_head_t waitq; };struct i915_hwmon {@@ -395,16 +396,41 @@ hwm_power_max_read(struct hwm_drvdata *ddat, long *val)Quoted 8 lines
drivers/gpu/drm/i915/i915_hwmon.c hwm_power_max_read(struct hwm_drvdata *ddat, long *val) · line 401
Quoted 6 lines
drivers/gpu/drm/i915/i915_hwmon.c +3
-0static int hwm_power_max_write (struct hwm_drvdata *ddat,long val) { +#define GUC_RESET_TIMEOUT msecs_to_jiffies(2000) + +int ret =0 , timeout =GUC_RESET_TIMEOUT ;Patch looks good to me
Great, thanks :)
Quoted 2 lines
apart that I am not sure what is the purpose of the timeout? This is just the sysfs write path or has more callers?
Quoted 7 lines
It is just the sysfs path, but the sysfs is accessed also by the oneAPI stack (Level 0). In the initial version I also didn't have the timeout thinking that the app can send a signal to the blocked thread to unblock it. I introduced the timeout after Rodrigo brought it up and I am now thinking maybe it's better to have the timeout in the driver since the app has no knowledge of how long GuC resets can take. But I can remove it if you think it's not needed.
Maybe I am missing something but I don't get why we would need to provide a timeout facility in sysfs? If the library writes here to configure something it already has to expect a blocking write by the nature of a a write(2) and sysfs contract. It can take long for any reason so I hope we are not guaranteeing some latency number to someone? Or the concern is just about things getting stuck? In which case I think Ctrl-C is the answer because ETIME is not even listed as an errno for write(2).
Quoted 9 lines
Quoted 4 lines
If the
former perhaps it would be better to just use interruptible everything (mutex and sleep) and wait for as long as it takes or until user presses Ctrl-C?Now we are not holding the mutexes for long, just long enough do register rmw's. So not holding the mutex across GuC reset as we were originally. Therefore I am thinking
mutex_lock_interruptibleis not needed? The sleep is already interruptible (TASK_INTERRUPTIBLE).
Ah yes, you are right.
Regards,
Tvrtko
Quoted 59 lines
Anyway please let me know if you think we need to change anything.
Thanks.
--
AshutoshQuoted 53 lines
Quoted 53 lines
drivers/gpu/drm/i915/i915_hwmon.c +27
-4struct i915_hwmon *hwmon = ddat->hwmon;intel_wakeref_t wakeref; -int ret =0 ; +DEFINE_WAIT (wait);u32 nval; -mutex_lock (&hwmon->hwmon_lock); -if (hwmon->ddat.reset_in_progress) { - ret = -EAGAIN ; - goto unlock; +/* Block waiting for GuC reset to complete when needed */ +for (;;) { +mutex_lock (&hwmon->hwmon_lock); + +prepare_to_wait (&ddat->waitq, &wait,TASK_INTERRUPTIBLE ); + +if (!hwmon->ddat.reset_in_progress) +break ; + +if (signal_pending (current)) { + ret = -EINTR ; +break ; + } + +if (!timeout) { + ret = -ETIME ; +break ; + } + +mutex_unlock (&hwmon->hwmon_lock); + + timeout =schedule_timeout (timeout); } +finish_wait (&ddat->waitq, &wait); +if (ret) + goto unlock; + wakeref =intel_runtime_pm_get (ddat->uncore->rpm);/* Disable PL1 limit and verify, because the limit cannot be disabled on all platforms */
drivers/gpu/drm/i915/i915_hwmon.c +2
-0@@ -508,6 +534,7 @@ void i915_hwmon_power_max_restore(struct drm_i915_private *i915, bool old)intel_uncore_rmw (hwmon->ddat.uncore, hwmon->rg.pkg_rapl_limit,PKG_PWR_LIM_1_EN , old ?PKG_PWR_LIM_1_EN :0 ); hwmon->ddat.reset_in_progress = false; +wake_up_all (&hwmon->ddat.waitq);mutex_unlock (&hwmon->hwmon_lock); }@@ -784,6 +811,7 @@ void i915_hwmon_register(struct drm_i915_private *i915) ddat->uncore = &i915->uncore;snprintf (ddat->name,sizeof (ddat->name),"i915" ); ddat->gt_n =-1 ; +init_waitqueue_head (&ddat->waitq);for_each_gt (gt, i915, i) { ddat_gt = hwmon->ddat_gt + i;
Rodrigo Vivi
maintainerRe: [PATCH 3/3] drm/i915/hwmon: Block waiting for GuC reset to complete
Quoted 52 lines · Tvrtko Ursulin
Quoted 42 lines · Ashutosh
Quoted 1 line · Tvrtko Ursulin
Hi Tvrtko,
Quoted 23 lines · Ashutosh Dixit
Quoted 22 lines
Instead of erroring out when GuC reset is in progress, block waiting for GuC reset to complete which is a more reasonable uapi behavior.
v2: Avoid race between
wake_up_alland waiting for wakeup (Rodrigo)Signed-off-by Ashutosh Dixit <[email protected]>--- drivers/gpu/drm/i915/i915_hwmon.c | 38 +++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_hwmon.c +1
-0@@ -51,6 +51,7 @@ struct hwm_drvdata {char name[12 ];int gt_n;bool reset_in_progress; +wait_queue_head_t waitq; };struct i915_hwmon {@@ -395,16 +396,41 @@ hwm_power_max_read(struct hwm_drvdata *ddat, long *val)Quoted 8 lines
drivers/gpu/drm/i915/i915_hwmon.c hwm_power_max_read(struct hwm_drvdata *ddat, long *val) · line 401
Quoted 6 lines
drivers/gpu/drm/i915/i915_hwmon.c +3
-0static int hwm_power_max_write (struct hwm_drvdata *ddat,long val) { +#define GUC_RESET_TIMEOUT msecs_to_jiffies(2000) + +int ret =0 , timeout =GUC_RESET_TIMEOUT ;Patch looks good to me
Great, thanks :)
Quoted 2 lines
apart that I am not sure what is the purpose of the timeout? This is just the sysfs write path or has more callers?
Quoted 7 lines
It is just the sysfs path, but the sysfs is accessed also by the oneAPI stack (Level 0). In the initial version I also didn't have the timeout thinking that the app can send a signal to the blocked thread to unblock it. I introduced the timeout after Rodrigo brought it up and I am now thinking maybe it's better to have the timeout in the driver since the app has no knowledge of how long GuC resets can take. But I can remove it if you think it's not needed.
Quoted 7 lines
Maybe I am missing something but I don't get why we would need to provide a timeout facility in sysfs? If the library writes here to configure something it already has to expect a blocking write by the nature of a a write(2) and sysfs contract. It can take long for any reason so I hope we are not guaranteeing some latency number to someone? Or the concern is just about things getting stuck? In which case I think Ctrl-C is the answer because ETIME is not even listed as an errno for write(2).
I suggested the timeout on the other version because of that race, which is fixed now with this approach. It is probably better to remove it now to avoid confusions. I'm sorry about that.
Quoted 76 lines
Quoted 10 lines
Quoted 5 lines
If the
former perhaps it would be better to just use interruptible everything (mutex and sleep) and wait for as long as it takes or until user presses Ctrl-C?Now we are not holding the mutexes for long, just long enough do register rmw's. So not holding the mutex across GuC reset as we were originally. Therefore I am thinking
mutex_lock_interruptibleis not needed? The sleep is already interruptible (TASK_INTERRUPTIBLE).Ah yes, you are right.
Regards,
Tvrtko
Quoted 59 lines
Anyway please let me know if you think we need to change anything.
Thanks.
--
AshutoshQuoted 53 lines
Quoted 53 lines
drivers/gpu/drm/i915/i915_hwmon.c +27
-4struct i915_hwmon *hwmon = ddat->hwmon;intel_wakeref_t wakeref; -int ret =0 ; +DEFINE_WAIT (wait);u32 nval; -mutex_lock (&hwmon->hwmon_lock); -if (hwmon->ddat.reset_in_progress) { - ret = -EAGAIN ; - goto unlock; +/* Block waiting for GuC reset to complete when needed */ +for (;;) { +mutex_lock (&hwmon->hwmon_lock); + +prepare_to_wait (&ddat->waitq, &wait,TASK_INTERRUPTIBLE ); + +if (!hwmon->ddat.reset_in_progress) +break ; + +if (signal_pending (current)) { + ret = -EINTR ; +break ; + } + +if (!timeout) { + ret = -ETIME ; +break ; + } + +mutex_unlock (&hwmon->hwmon_lock); + + timeout =schedule_timeout (timeout); } +finish_wait (&ddat->waitq, &wait); +if (ret) + goto unlock; + wakeref =intel_runtime_pm_get (ddat->uncore->rpm);/* Disable PL1 limit and verify, because the limit cannot be disabled on all platforms */
drivers/gpu/drm/i915/i915_hwmon.c +2
-0@@ -508,6 +534,7 @@ void i915_hwmon_power_max_restore(struct drm_i915_private *i915, bool old)intel_uncore_rmw (hwmon->ddat.uncore, hwmon->rg.pkg_rapl_limit,PKG_PWR_LIM_1_EN , old ?PKG_PWR_LIM_1_EN :0 ); hwmon->ddat.reset_in_progress = false; +wake_up_all (&hwmon->ddat.waitq);mutex_unlock (&hwmon->hwmon_lock); }@@ -784,6 +811,7 @@ void i915_hwmon_register(struct drm_i915_private *i915) ddat->uncore = &i915->uncore;snprintf (ddat->name,sizeof (ddat->name),"i915" ); ddat->gt_n =-1 ; +init_waitqueue_head (&ddat->waitq);for_each_gt (gt, i915, i) { ddat_gt = hwmon->ddat_gt + i;
Re: [PATCH 3/3] drm/i915/hwmon: Block waiting for GuC reset to complete
Quoted 1 line · Rodrigo Vivi
Hi Rodrigo,
Quoted 53 lines · Tvrtko Ursulin
Quoted 52 lines · Ashutosh
Quoted 49 lines · Tvrtko Ursulin
Quoted 1 line
Hi Tvrtko,
Quoted 23 lines · Ashutosh Dixit
Quoted 22 lines
Instead of erroring out when GuC reset is in progress, block waiting for GuC reset to complete which is a more reasonable uapi behavior.
v2: Avoid race between
wake_up_alland waiting for wakeup (Rodrigo)Signed-off-by Ashutosh Dixit <[email protected]>--- drivers/gpu/drm/i915/i915_hwmon.c | 38 +++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_hwmon.c +1
-0@@ -51,6 +51,7 @@ struct hwm_drvdata {char name[12 ];int gt_n;bool reset_in_progress; +wait_queue_head_t waitq; };struct i915_hwmon {@@ -395,16 +396,41 @@ hwm_power_max_read(struct hwm_drvdata *ddat, long *val)Quoted 8 lines
drivers/gpu/drm/i915/i915_hwmon.c hwm_power_max_read(struct hwm_drvdata *ddat, long *val) · line 401
Quoted 6 lines
drivers/gpu/drm/i915/i915_hwmon.c +3
-0static int hwm_power_max_write (struct hwm_drvdata *ddat,long val) { +#define GUC_RESET_TIMEOUT msecs_to_jiffies(2000) + +int ret =0 , timeout =GUC_RESET_TIMEOUT ;Patch looks good to me
Great, thanks :)
Quoted 2 lines
apart that I am not sure what is the purpose of the timeout? This is just the sysfs write path or has more callers?
It is just the sysfs path, but the sysfs is accessed also by the oneAPI stack (Level 0). In the initial version I also didn't have the timeout thinking that the app can send a signal to the blocked thread to unblock it. I introduced the timeout after Rodrigo brought it up and I am now thinking maybe it's better to have the timeout in the driver since the app has no knowledge of how long GuC resets can take. But I can remove it if you think it's not needed.
Quoted 7 lines
Quoted 7 lines
Maybe I am missing something but I don't get why we would need to provide a timeout facility in sysfs? If the library writes here to configure something it already has to expect a blocking write by the nature of a a write(2) and sysfs contract. It can take long for any reason so I hope we are not guaranteeing some latency number to someone? Or the concern is just about things getting stuck? In which case I think Ctrl-C is the answer because ETIME is not even listed as an errno for write(2).
Hmm, good point.
Quoted 3 lines
I suggested the timeout on the other version because of that race, which is fixed now with this approach. It is probably better to remove it now to avoid confusions. I'm sorry about that.
No problem, I've removed the timeout in the latest version.
Thanks for the R-b.
Ashutosh
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915/guc: Disable PL1 power limit when loading GuC firmware
In reply to Ashutosh Dixit== Series Details ==
== Series Details ==
Series: drm/i915/guc: Disable PL1 power limit when loading GuC firmware
URL : https://patchwork.freedesktop.org/series/116285/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately. +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:117:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:148:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:150:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:154:26: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:156:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:174:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:176:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:180:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:182:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:186:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:188:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:188:9: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:192:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:192:35: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:195:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:195:16: warning: unreplaced symbol 'oldbit' +./arch/x86/include/asm/bitops.h:195:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:195:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:237:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:237:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:239:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:239:9: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:66:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:66:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:92:1: warning: unreplaced symbol 'return' +./arch/x86/include/asm/bitops.h:92:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:100:17: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:100:17: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:100:23: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:100:23: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:100:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:100:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:105:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:105:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:107:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:107:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:108:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:108:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:109:9: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:109:9: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:111:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:111:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:111:14: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:111:14: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:111:20: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:111:20: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:112:17: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:112:17: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:112:23: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:112:23: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:112:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:112:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:121:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:121:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:128:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:128:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:166:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:166:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:168:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:168:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:169:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:169:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:170:9: warning: unreplaced symbol 'val' +./include/asm-generic/bitops/generic-non-atomic.h:170:9: warning: unreplaced symbol 'val' +./include/asm-generic/bitops/generic-non-atomic.h:172:19: warning: unreplaced symbol 'val' +./include/asm-generic/bitops/generic-non-atomic.h:172:19: warning: unreplaced symbol 'val' +./include/asm-generic/bitops/generic-non-atomic.h:172:25: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:172:25: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:172:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:172:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:28:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:28:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:30:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:30:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:31:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:31:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:33:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:33:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:33:16: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:33:16: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:37:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:37:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:39:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:39:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:40:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:40:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:42:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:42:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:42:16: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:42:16: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:55:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:55:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:57:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:57:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:58:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:58:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:60:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:60:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:60:15: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:60:15: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:73:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:73:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:75:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:75:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:76:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:76:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:77:9: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:77:9: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:79:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:79:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:79:14: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:79:14: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:79:20: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:79:20: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:80:17: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:80:17: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:80:23: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:80:23: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:80:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:80:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:93:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:93:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/generic-non-atomic.h:95:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:95:9: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:96:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:96:9: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:97:9: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:97:9: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:99:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:99:10: warning: unreplaced symbol 'p' +./include/asm-generic/bitops/generic-non-atomic.h:99:14: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:99:14: warning: unreplaced symbol 'old' +./include/asm-generic/bitops/generic-non-atomic.h:99:21: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/generic-non-atomic.h:99:21: warning: unreplaced symbol 'mask' +./include/asm-generic/bitops/instrumented-non-atomic.h:100:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:100:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:112:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:112:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:115:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:115:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:127:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:127:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:130:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:130:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:139:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:139:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:142:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:142:9: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:26:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:26:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:42:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:42:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:58:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:58:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:97:1: warning: unreplaced symbol 'return' +./include/asm-generic/bitops/instrumented-non-atomic.h:97:1: warning: unreplaced symbol 'return'
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/guc: Disable PL1 power limit when loading GuC firmware
In reply to Ashutosh Dixit== Series Details ==
== Series Details ==
Series: drm/i915/guc: Disable PL1 power limit when loading GuC firmware
URL : https://patchwork.freedesktop.org/series/116285/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12984 -> Patchwork_116285v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/index.html
Participating hosts (36 -> 34)
------------------------------
Missing (2): fi-snb-2520m fi-pnv-d510
Known issues
------------
Here are the changes found in Patchwork_116285v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s3@smem:
- bat-rpls-1: NOTRUN -> [ABORT][1] ([i915#6687] / [i915#7978])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-rpls-1/igt@gem_exec_suspend@[email protected]
* igt@gem_mmap@basic:
- bat-dg2-9: NOTRUN -> [SKIP][2] ([i915#4083])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-dg2-9/igt@[email protected]
* igt@gem_mmap_gtt@basic:
- bat-dg2-9: NOTRUN -> [SKIP][3] ([i915#4077]) +2 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-dg2-9/igt@[email protected]
* igt@gem_render_tiled_blits@basic:
- bat-dg2-9: NOTRUN -> [SKIP][4] ([i915#4079]) +1 similar issue
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-dg2-9/igt@[email protected]
* igt@i915_pm_backlight@basic-brightness:
- bat-dg2-9: NOTRUN -> [SKIP][5] ([i915#5354] / [i915#7561])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-dg2-9/igt@[email protected]
* igt@i915_selftest@live@slpc:
- bat-rpls-1: NOTRUN -> [DMESG-FAIL][6] ([i915#6367] / [i915#7996])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-rpls-1/igt@i915_selftest@[email protected]
* igt@kms_addfb_basic@addfb25-y-tiled-small-legacy:
- bat-dg2-9: NOTRUN -> [SKIP][7] ([i915#5190])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-dg2-9/igt@[email protected]
* igt@kms_addfb_basic@basic-y-tiled-legacy:
- bat-dg2-9: NOTRUN -> [SKIP][8] ([i915#4215] / [i915#5190])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-dg2-9/igt@[email protected]
* igt@kms_addfb_basic@framebuffer-vs-set-tiling:
- bat-dg2-9: NOTRUN -> [SKIP][9] ([i915#4212]) +7 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-dg2-9/igt@[email protected]
* igt@kms_chamelium_hpd@vga-hpd-fast:
- bat-dg2-9: NOTRUN -> [SKIP][10] ([i915#7828]) +8 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-dg2-9/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- bat-dg2-9: NOTRUN -> [SKIP][11] ([i915#4103] / [i915#4213]) +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-dg2-9/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- bat-dg2-9: NOTRUN -> [SKIP][12] ([fdo#109285])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-dg2-9/igt@[email protected]
* igt@kms_force_connector_basic@prune-stale-modes:
- bat-dg2-9: NOTRUN -> [SKIP][13] ([i915#5274])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-dg2-9/igt@[email protected]
* igt@kms_pipe_crc_basic@nonblocking-crc@pipe-c-dp-1:
- bat-dg2-8: [PASS][14] -> [FAIL][15] ([i915#7932])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/bat-dg2-8/igt@kms_pipe_crc_basic@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-dg2-8/igt@kms_pipe_crc_basic@[email protected]
* igt@kms_psr@sprite_plane_onoff:
- bat-dg2-9: NOTRUN -> [SKIP][16] ([i915#1072]) +3 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-dg2-9/igt@kms_psr@sprite_plane_onoff.html
* igt@kms_setmode@basic-clone-single-crtc:
- bat-dg2-9: NOTRUN -> [SKIP][17] ([i915#3555] / [i915#4579])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-dg2-9/igt@[email protected]
* igt@prime_vgem@basic-fence-flip:
- bat-dg2-9: NOTRUN -> [SKIP][18] ([i915#3708])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-dg2-9/igt@[email protected]
* igt@prime_vgem@basic-fence-mmap:
- bat-dg2-9: NOTRUN -> [SKIP][19] ([i915#3708] / [i915#4077]) +1 similar issue
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-dg2-9/igt@[email protected]
* igt@prime_vgem@basic-userptr:
- bat-dg2-9: NOTRUN -> [SKIP][20] ([i915#3708] / [i915#4873])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-dg2-9/igt@[email protected]
* igt@prime_vgem@basic-write:
- bat-dg2-9: NOTRUN -> [SKIP][21] ([i915#3291] / [i915#3708]) +2 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-dg2-9/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live@gt_heartbeat:
- fi-apl-guc: [DMESG-FAIL][22] ([i915#5334]) -> [PASS][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
* igt@i915_selftest@live@requests:
- bat-rpls-1: [ABORT][24] ([i915#7911] / [i915#7982]) -> [PASS][25]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/bat-rpls-1/igt@i915_selftest@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-rpls-1/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@slpc:
- bat-rplp-1: [DMESG-FAIL][26] ([i915#6367] / [i915#7913]) -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/bat-rplp-1/igt@i915_selftest@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-rplp-1/igt@i915_selftest@[email protected]
#### Warnings ####
* igt@kms_setmode@basic-clone-single-crtc:
- bat-adls-5: [SKIP][28] ([i915#3555]) -> [SKIP][29] ([i915#3555] / [i915#4579])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/bat-adls-5/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-adls-5/igt@[email protected]
- bat-rpls-1: [SKIP][30] ([i915#3555]) -> [SKIP][31] ([i915#3555] / [i915#4579])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/bat-rpls-1/igt@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-rpls-1/igt@[email protected]
- bat-rpls-2: [SKIP][32] ([i915#3555]) -> [SKIP][33] ([i915#3555] / [i915#4579])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/bat-rpls-2/igt@[email protected]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/bat-rpls-2/igt@[email protected]
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213
[i915#4215]: https://gitlab.freedesktop.org/drm/intel/issues/4215
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4873]: https://gitlab.freedesktop.org/drm/intel/issues/4873
[i915#5190]: https://gitlab.freedesktop.org/drm/intel/issues/5190
[i915#5274]: https://gitlab.freedesktop.org/drm/intel/issues/5274
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7911]: https://gitlab.freedesktop.org/drm/intel/issues/7911
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7932]: https://gitlab.freedesktop.org/drm/intel/issues/7932
[i915#7978]: https://gitlab.freedesktop.org/drm/intel/issues/7978
[i915#7982]: https://gitlab.freedesktop.org/drm/intel/issues/7982
[i915#7996]: https://gitlab.freedesktop.org/drm/intel/issues/7996
Build changes
-------------
* Linux: CI_DRM_12984 -> Patchwork_116285v1
CI-20190529: 20190529
CI_DRM_12984: 936e01d4b5d0a82f06f95c736cff42dfa20c72aa @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7246: b4252c86f4470e6b2d1201b1cf11d991bc5710eb @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_116285v1: 936e01d4b5d0a82f06f95c736cff42dfa20c72aa @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
58cc6b97f85e drm/i915/hwmon: Block waiting for GuC reset to complete 4299e0447c8c drm/i915/guc: Disable PL1 power limit when loading GuC firmware 66c2a90427cc drm/i915/hwmon: Get mutex and rpm ref just once in hwm_power_max_write
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/index.html
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/guc: Disable PL1 power limit when loading GuC firmware
In reply to Ashutosh Dixit== Series Details ==
== Series Details ==
Series: drm/i915/guc: Disable PL1 power limit when loading GuC firmware
URL : https://patchwork.freedesktop.org/series/116285/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12984_full -> Patchwork_116285v1_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Participating hosts (7 -> 7)
------------------------------
No changes in participating hosts
Known issues
------------
Here are the changes found in Patchwork_116285v1_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-apl: [PASS][1] -> [FAIL][2] ([i915#2842])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/shard-apl2/igt@gem_exec_fair@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/shard-apl3/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [PASS][3] -> [FAIL][4] ([i915#2842])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/shard-glk4/igt@gem_exec_fair@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/shard-glk8/igt@gem_exec_fair@[email protected]
* igt@gem_lmem_swapping@smem-oom:
- shard-glk: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#4613])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/shard-glk3/igt@[email protected]
* igt@i915_selftest@live@gt_heartbeat:
- shard-apl: [PASS][6] -> [DMESG-FAIL][7] ([i915#5334])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/shard-apl1/igt@i915_selftest@live@gt_heartbeat.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/shard-apl1/igt@i915_selftest@live@gt_heartbeat.html
* igt@kms_ccs@pipe-a-random-ccs-data-y_tiled_gen12_mc_ccs:
- shard-glk: NOTRUN -> [SKIP][8] ([fdo#109271] / [i915#3886])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/shard-glk3/igt@kms_ccs@pipe-a-random-ccs-data-y_tiled_gen12_mc_ccs.html
* igt@kms_flip@plain-flip-ts-check-interruptible@a-hdmi-a2:
- shard-glk: [PASS][9] -> [FAIL][10] ([i915#2122]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/shard-glk9/igt@kms_flip@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/shard-glk5/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-indfb-draw-blt:
- shard-glk: NOTRUN -> [SKIP][11] ([fdo#109271]) +21 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/shard-glk3/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-indfb-draw-blt.html
#### Possible fixes ####
* igt@gem_barrier_race@remote-request@rcs0:
- shard-glk: [ABORT][12] ([i915#8211]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/shard-glk3/igt@gem_barrier_race@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/shard-glk3/igt@gem_barrier_race@[email protected]
* igt@gem_ctx_exec@basic-nohangcheck:
- {shard-rkl}: [FAIL][14] ([i915#6268]) -> [PASS][15]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/shard-rkl-2/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/shard-rkl-2/igt@[email protected]
* igt@gem_exec_fair@basic-deadline:
- shard-apl: [FAIL][16] ([i915#2846]) -> [PASS][17]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/shard-apl7/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/shard-apl7/igt@[email protected]
* igt@gem_exec_fair@basic-none@bcs0:
- {shard-rkl}: [FAIL][18] ([i915#2842]) -> [PASS][19]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/shard-rkl-1/igt@gem_exec_fair@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/shard-rkl-7/igt@gem_exec_fair@[email protected]
* igt@gen9_exec_parse@allowed-single:
- shard-glk: [ABORT][20] ([i915#5566]) -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/shard-glk2/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/shard-glk3/igt@[email protected]
* igt@i915_pm_dc@dc6-dpms:
- {shard-tglu}: [FAIL][22] ([i915#3989] / [i915#454]) -> [PASS][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/shard-tglu-3/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/shard-tglu-9/igt@[email protected]
* igt@i915_pm_dc@dc9-dpms:
- {shard-tglu}: [SKIP][24] ([i915#4281]) -> [PASS][25]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/shard-tglu-7/igt@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/shard-tglu-10/igt@[email protected]
* igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-hdmi-a:
- {shard-rkl}: [SKIP][26] ([i915#1937]) -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/shard-rkl-1/igt@i915_pm_lpsp@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/shard-rkl-7/igt@i915_pm_lpsp@[email protected]
* igt@i915_pm_rc6_residency@rc6-idle@vcs0:
- {shard-dg1}: [FAIL][28] ([i915#3591]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/shard-dg1-18/igt@i915_pm_rc6_residency@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/shard-dg1-15/igt@i915_pm_rc6_residency@[email protected]
* igt@i915_pm_rpm@dpms-mode-unset-non-lpsp:
- {shard-dg1}: [SKIP][30] ([i915#1397]) -> [PASS][31] +2 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/shard-dg1-14/igt@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/shard-dg1-16/igt@[email protected]
* igt@i915_pm_rpm@dpms-non-lpsp:
- {shard-rkl}: [SKIP][32] ([i915#1397]) -> [PASS][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/shard-rkl-7/igt@[email protected]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/shard-rkl-2/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-varying-size:
- {shard-tglu}: [FAIL][34] ([i915#2346]) -> [PASS][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/shard-tglu-10/igt@[email protected]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/shard-tglu-6/igt@[email protected]
* igt@kms_cursor_legacy@forked-move@pipe-b:
- {shard-dg1}: [INCOMPLETE][36] ([i915#8011]) -> [PASS][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/shard-dg1-14/igt@kms_cursor_legacy@[email protected]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/shard-dg1-16/igt@kms_cursor_legacy@[email protected]
* igt@perf_pmu@idle@rcs0:
- {shard-rkl}: [FAIL][38] ([i915#4349]) -> [PASS][39]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12984/shard-rkl-7/igt@perf_pmu@[email protected]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/shard-rkl-6/igt@perf_pmu@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109307]: https://bugs.freedesktop.org/show_bug.cgi?id=109307
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#1902]: https://gitlab.freedesktop.org/drm/intel/issues/1902
[i915#1937]: https://gitlab.freedesktop.org/drm/intel/issues/1937
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2433]: https://gitlab.freedesktop.org/drm/intel/issues/2433
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[i915#3023]: https://gitlab.freedesktop.org/drm/intel/issues/3023
[i915#315]: https://gitlab.freedesktop.org/drm/intel/issues/315
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3361]: https://gitlab.freedesktop.org/drm/intel/issues/3361
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3989]: https://gitlab.freedesktop.org/drm/intel/issues/3989
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4281]: https://gitlab.freedesktop.org/drm/intel/issues/4281
[i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4771]: https://gitlab.freedesktop.org/drm/intel/issues/4771
[i915#4812]: https://gitlab.freedesktop.org/drm/intel/issues/4812
[i915#4818]: https://gitlab.freedesktop.org/drm/intel/issues/4818
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#4852]: https://gitlab.freedesktop.org/drm/intel/issues/4852
[i915#4860]: https://gitlab.freedesktop.org/drm/intel/issues/4860
[i915#4881]: https://gitlab.freedesktop.org/drm/intel/issues/4881
[i915#4936]: https://gitlab.freedesktop.org/drm/intel/issues/4936
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#5431]: https://gitlab.freedesktop.org/drm/intel/issues/5431
[i915#5493]: https://gitlab.freedesktop.org/drm/intel/issues/5493
[i915#5563]: https://gitlab.freedesktop.org/drm/intel/issues/5563
[i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6245]: https://gitlab.freedesktop.org/drm/intel/issues/6245
[i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268
[i915#6301]: https://gitlab.freedesktop.org/drm/intel/issues/6301
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6590]: https://gitlab.freedesktop.org/drm/intel/issues/6590
[i915#6946]: https://gitlab.freedesktop.org/drm/intel/issues/6946
[i915#6953]: https://gitlab.freedesktop.org/drm/intel/issues/6953
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697
[i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7975]: https://gitlab.freedesktop.org/drm/intel/issues/7975
[i915#8011]: https://gitlab.freedesktop.org/drm/intel/issues/8011
[i915#8211]: https://gitlab.freedesktop.org/drm/intel/issues/8211
[i915#8213]: https://gitlab.freedesktop.org/drm/intel/issues/8213
[i915#8228]: https://gitlab.freedesktop.org/drm/intel/issues/8228
[i915#8292]: https://gitlab.freedesktop.org/drm/intel/issues/8292
[i915#8347]: https://gitlab.freedesktop.org/drm/intel/issues/8347
Build changes
-------------
* Linux: CI_DRM_12984 -> Patchwork_116285v1
CI-20190529: 20190529
CI_DRM_12984: 936e01d4b5d0a82f06f95c736cff42dfa20c72aa @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7246: b4252c86f4470e6b2d1201b1cf11d991bc5710eb @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_116285v1: 936e01d4b5d0a82f06f95c736cff42dfa20c72aa @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116285v1/index.html