UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915/guc: Drop guc->interrupts.enabled 

Drop the variable guc->interrupts.enabled as this variable is just
leading to bugs creeping into the code.

e.g. A full GPU reset disables the GuC interrupts but forgot to clear
guc->interrupts.enabled, guc->interrupts.enabled being true suppresses
interrupts from getting re-enabled and now we are broken.

It is harmless to enable interrupt while already enabled so let's just
delete this variable to avoid bugs like this going forward.

Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210603051630.2635-7-matthew.brost@intel.com
This commit is contained in:
Matthew Brost 2021-06-02 22:16:16 -07:00 committed by Daniel Vetter
parent 0a8e247dc1
commit ded32d381c
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/gpu/drm/i915/gt/uc/intel_guc.c
View File

@ -96,12 +96,9 @@ static void gen9_enable_guc_interrupts(struct intel_guc *guc)
assert_rpm_wakelock_held(&gt->i915->runtime_pm); assert_rpm_wakelock_held(&gt->i915->runtime_pm);
spin_lock_irq(&gt->irq_lock); spin_lock_irq(&gt->irq_lock);
if (!guc->interrupts.enabled) { WARN_ON_ONCE(intel_uncore_read(gt->uncore, GEN8_GT_IIR(2)) &
WARN_ON_ONCE(intel_uncore_read(gt->uncore, GEN8_GT_IIR(2)) & gt->pm_guc_events);
gt->pm_guc_events); gen6_gt_pm_enable_irq(gt, gt->pm_guc_events);
guc->interrupts.enabled = true;
gen6_gt_pm_enable_irq(gt, gt->pm_guc_events);
}
spin_unlock_irq(&gt->irq_lock); spin_unlock_irq(&gt->irq_lock);
} }
@ -112,7 +109,6 @@ static void gen9_disable_guc_interrupts(struct intel_guc *guc)
assert_rpm_wakelock_held(&gt->i915->runtime_pm); assert_rpm_wakelock_held(&gt->i915->runtime_pm);
spin_lock_irq(&gt->irq_lock); spin_lock_irq(&gt->irq_lock);
guc->interrupts.enabled = false;
gen6_gt_pm_disable_irq(gt, gt->pm_guc_events); gen6_gt_pm_disable_irq(gt, gt->pm_guc_events);
@ -134,18 +130,14 @@ static void gen11_reset_guc_interrupts(struct intel_guc *guc)
static void gen11_enable_guc_interrupts(struct intel_guc *guc) static void gen11_enable_guc_interrupts(struct intel_guc *guc)
{ {
struct intel_gt *gt = guc_to_gt(guc); struct intel_gt *gt = guc_to_gt(guc);
u32 events = REG_FIELD_PREP(ENGINE1_MASK, GUC_INTR_GUC2HOST);
spin_lock_irq(&gt->irq_lock); spin_lock_irq(&gt->irq_lock);
if (!guc->interrupts.enabled) { WARN_ON_ONCE(gen11_gt_reset_one_iir(gt, 0, GEN11_GUC));
u32 events = REG_FIELD_PREP(ENGINE1_MASK, GUC_INTR_GUC2HOST); intel_uncore_write(gt->uncore,
GEN11_GUC_SG_INTR_ENABLE, events);
WARN_ON_ONCE(gen11_gt_reset_one_iir(gt, 0, GEN11_GUC)); intel_uncore_write(gt->uncore,
intel_uncore_write(gt->uncore, GEN11_GUC_SG_INTR_MASK, ~events);
GEN11_GUC_SG_INTR_ENABLE, events);
intel_uncore_write(gt->uncore,
GEN11_GUC_SG_INTR_MASK, ~events);
guc->interrupts.enabled = true;
}
spin_unlock_irq(&gt->irq_lock); spin_unlock_irq(&gt->irq_lock);
} }
@ -154,7 +146,6 @@ static void gen11_disable_guc_interrupts(struct intel_guc *guc)
struct intel_gt *gt = guc_to_gt(guc); struct intel_gt *gt = guc_to_gt(guc);
spin_lock_irq(&gt->irq_lock); spin_lock_irq(&gt->irq_lock);
guc->interrupts.enabled = false;
intel_uncore_write(gt->uncore, GEN11_GUC_SG_INTR_MASK, ~0); intel_uncore_write(gt->uncore, GEN11_GUC_SG_INTR_MASK, ~0);
intel_uncore_write(gt->uncore, GEN11_GUC_SG_INTR_ENABLE, 0); intel_uncore_write(gt->uncore, GEN11_GUC_SG_INTR_ENABLE, 0);

1
drivers/gpu/drm/i915/gt/uc/intel_guc.h
View File

@ -33,7 +33,6 @@ struct intel_guc {
unsigned int msg_enabled_mask; unsigned int msg_enabled_mask;
struct { struct {
bool enabled;
void (*reset)(struct intel_guc *guc); void (*reset)(struct intel_guc *guc);
void (*enable)(struct intel_guc *guc); void (*enable)(struct intel_guc *guc);
void (*disable)(struct intel_guc *guc); void (*disable)(struct intel_guc *guc);