diff options
| author |   Vinay Belgaumkar <vinay.belgaumkar@intel.com> | 2021-07-30 13:21:11 -0700 |
|---|---|---|
| committer |   John Harrison <John.C.Harrison@Intel.com> | 2021-08-03 16:05:32 -0700 |
| commit | db301cffd8a285bbe73879671e6d666a0b654138 (patch) | |
| tree | 56217077cf232a553c8de8a9623a939437ba1500 | |
| parent | drm/i915/guc/slpc: Enable SLPC and add related H2G events (diff) | |
| download | linux-dev-db301cffd8a285bbe73879671e6d666a0b654138.tar.xz linux-dev-db301cffd8a285bbe73879671e6d666a0b654138.zip | |
drm/i915/guc/slpc: Remove BUG_ON in guc_submission_disable
The assumption when it was added was that GT would not be
holding any gt_pm references. However, uc_init is called
from gt_init_hw, which holds a forcewake ref. If SLPC
enable fails, we will still be holding this ref, which will
result in the BUG_ON.
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210730202119.23810-7-vinay.belgaumkar@intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 |
1 files changed, 0 insertions, 4 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 89ff0e4b4bc7..87d8dc8f51b9 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -2536,10 +2536,6 @@ void intel_guc_submission_enable(struct intel_guc *guc) void intel_guc_submission_disable(struct intel_guc *guc) { - struct intel_gt *gt = guc_to_gt(guc); - - GEM_BUG_ON(gt->awake); /* GT should be parked first */ - /* Note: By the time we're here, GuC may have already been reset */ } |