Merge tag 'drm-intel-fixes-2024-10-02' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-fixes

airlied · airlied · commit 240ebf1c9d4c · 2024-10-03T12:02:29.000+10:00
- One fix for bitwise and logical "and" mixup in PM code Signed-off-by: Dave Airlie <airlied@redhat.com> From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/Zv1l75s9Z4Gl4lDH@jlahtine-mobl.ger.corp.intel.com
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
@@ -1131,7 +1131,7 @@ static vm_fault_t vm_fault_ttm(struct vm_fault *vmf)
 		GEM_WARN_ON(!i915_ttm_cpu_maps_iomem(bo->resource));
 	}
 
-	if (wakeref & CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND)
+	if (wakeref && CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND != 0)
 		intel_wakeref_auto(&to_i915(obj->base.dev)->runtime_pm.userfault_wakeref,
 				   msecs_to_jiffies_timeout(CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND));
 

Original file line number	Diff line number	Diff line change
`@@ -1131,7 +1131,7 @@ static vm_fault_t vm_fault_ttm(struct vm_fault *vmf)`
`1131`	`1131`	`GEM_WARN_ON(!i915_ttm_cpu_maps_iomem(bo->resource));`
`1132`	`1132`	`}`
`1133`	`1133`
`1134`		`- if (wakeref & CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND)`
	`1134`	`+ if (wakeref && CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND != 0)`
`1135`	`1135`	`intel_wakeref_auto(&to_i915(obj->base.dev)->runtime_pm.userfault_wakeref,`
`1136`	`1136`	`msecs_to_jiffies_timeout(CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND));`
`1137`	`1137`