diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-10-27 18:55:05 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-10-28 12:42:59 +0100 |
| commit | 5a3e2b82af47ce43b7ea975c86d36b6f1226025f (patch) | |
| tree | b81ad5aa82e92578d2f4f91bca39fc7dd28c3529 /drivers/gpu/drm/i915/gt | |
| parent | drm/i915/selftests: Use a random engine for GEM coherency tests (diff) | |
| download | linux-5a3e2b82af47ce43b7ea975c86d36b6f1226025f.tar.xz linux-5a3e2b82af47ce43b7ea975c86d36b6f1226025f.zip | |
drm/i915/gt: Tidy up rps irq handler to use intel_gt
Since the rps is tied to its intel_gt, use that backpointer to find the
right engine rather than delving into i915.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Andi Shyti <andi.shyti@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191027175505.25470-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/gt')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_rps.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_rps.c b/drivers/gpu/drm/i915/gt/intel_rps.c index 032a0c6389f9..f6de19456c54 100644 --- a/drivers/gpu/drm/i915/gt/intel_rps.c +++ b/drivers/gpu/drm/i915/gt/intel_rps.c @@ -1555,11 +1555,9 @@ void gen11_rps_irq_handler(struct intel_rps *rps, u32 pm_iir) void gen6_rps_irq_handler(struct intel_rps *rps, u32 pm_iir) { - struct drm_i915_private *i915 = rps_to_i915(rps); + struct intel_gt *gt = rps_to_gt(rps); if (pm_iir & rps->pm_events) { - struct intel_gt *gt = rps_to_gt(rps); - spin_lock(>->irq_lock); gen6_gt_pm_mask_irq(gt, pm_iir & rps->pm_events); rps->pm_iir |= pm_iir & rps->pm_events; @@ -1567,11 +1565,11 @@ void gen6_rps_irq_handler(struct intel_rps *rps, u32 pm_iir) spin_unlock(>->irq_lock); } - if (INTEL_GEN(i915) >= 8) + if (INTEL_GEN(gt->i915) >= 8) return; if (pm_iir & PM_VEBOX_USER_INTERRUPT) - intel_engine_breadcrumbs_irq(i915->engine[VECS0]); + intel_engine_breadcrumbs_irq(gt->engine[VECS0]); if (pm_iir & PM_VEBOX_CS_ERROR_INTERRUPT) DRM_DEBUG("Command parser error, pm_iir 0x%08x\n", pm_iir); |