diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-10-24 21:57:38 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-10-24 21:57:38 +0200 |
| commit | c9ff14d0339a7838b71d9f196bd4244eeb6e2808 (patch) | |
| tree | 42d79b0b794f0b9bb4cedc8426e75d61b73daa7a /drivers/gpu/drm/i915/pxp/intel_pxp.c | |
| parent | Merge tag 'drm-xe-next-2024-10-17' of https://gitlab.freedesktop.org/drm/xe/k... (diff) | |
| parent | drm/i915/gt: Retry RING_HEAD reset until it get sticks (diff) | |
| download | linux-c9ff14d0339a7838b71d9f196bd4244eeb6e2808.tar.xz linux-c9ff14d0339a7838b71d9f196bd4244eeb6e2808.zip | |
Merge tag 'drm-intel-gt-next-2024-10-23' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next
Driver Changes:
Fixes/improvements/new stuff:
- Enable PXP GuC autoteardown flow [guc] (Juston Li)
- Retry RING_HEAD reset until it get sticks [gt] (Nitin Gote)
- Add basic PMU support for gen2 [pmu] (Ville Syrjälä)
Miscellaneous:
- Prevent a possible int overflow in wq offsets [guc] (Nikita Zhandarovich)
- PMU code cleanups (Lucas De Marchi)
- Fixed "CPU" -> "GPU" typo [gt] (Zhang He)
- Gen2/3 interrupt handling cleanup (Ville Syrjälä)
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tursulin@igalia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Zxi-3wkIwI-Y1Qvj@linux
Diffstat (limited to 'drivers/gpu/drm/i915/pxp/intel_pxp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/pxp/intel_pxp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp.c b/drivers/gpu/drm/i915/pxp/intel_pxp.c index da3577149769..9cf169665d7c 100644 --- a/drivers/gpu/drm/i915/pxp/intel_pxp.c +++ b/drivers/gpu/drm/i915/pxp/intel_pxp.c @@ -170,7 +170,7 @@ static struct intel_gt *find_gt_for_required_teelink(struct drm_i915_private *i9 static struct intel_gt *find_gt_for_required_protected_content(struct drm_i915_private *i915) { - if (!IS_ENABLED(CONFIG_DRM_I915_PXP) || !INTEL_INFO(i915)->has_pxp) + if (!HAS_PXP(i915)) return NULL; /* |