Skip to content

Commit 240ebf1

Browse files
committed
Merge tag 'drm-intel-fixes-2024-10-02' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-fixes
- One fix for bitwise and logical "and" mixup in PM code Signed-off-by: Dave Airlie <[email protected]> From: Joonas Lahtinen <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 475be51 + 394b524 commit 240ebf1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpu/drm/i915/gem/i915_gem_ttm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1131,7 +1131,7 @@ static vm_fault_t vm_fault_ttm(struct vm_fault *vmf)
11311131
GEM_WARN_ON(!i915_ttm_cpu_maps_iomem(bo->resource));
11321132
}
11331133

1134-
if (wakeref & CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND)
1134+
if (wakeref && CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND != 0)
11351135
intel_wakeref_auto(&to_i915(obj->base.dev)->runtime_pm.userfault_wakeref,
11361136
msecs_to_jiffies_timeout(CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND));
11371137

0 commit comments

Comments
 (0)