diff options
| author |   Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com> | 2021-12-06 18:02:39 -0800 |
|---|---|---|
| committer |   John Harrison <John.C.Harrison@Intel.com> | 2021-12-09 11:51:20 -0800 |
| commit | 1ff9fc708185a94c79d4def79c0a500829297575 (patch) | |
| tree | 2f90ab45d6ef691ee9cdbad7e7a8c07272732d45 /drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | |
| parent | drm/i915/pmu: Wait longer for busyness data to be available from GuC (diff) | |
| download | linux-dev-1ff9fc708185a94c79d4def79c0a500829297575.tar.xz linux-dev-1ff9fc708185a94c79d4def79c0a500829297575.zip | |
drm/i915/pmu: Fix wakeref leak in PMU busyness during reset
GuC PMU busyness gets gt wakeref if awake, but fails to release the
wakeref if a reset is in progress. Release the wakeref if it was
acquried successfully.
v2: Simplify the fix (Ashutosh)
Fixes: 2a67b18e67f3 ("drm/i915/pmu: Fix synchronization of PMU callback with reset")
Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211207020239.43402-1-umesh.nerlige.ramappa@intel.com
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c index 1f9d4fde421f..97311119da6f 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -1206,7 +1206,7 @@ static ktime_t guc_engine_busyness(struct intel_engine_cs *engine, ktime_t *now) * start_gt_clk is derived from GuC state. To get a consistent * view of activity, we query the GuC state only if gt is awake. */ - if (intel_gt_pm_get_if_awake(gt) && !in_reset) { + if (!in_reset && intel_gt_pm_get_if_awake(gt)) { stats_saved = *stats; gt_stamp_saved = guc->timestamp.gt_stamp; guc_update_engine_gt_clks(engine); |