Commit 240ebf1c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2024-10-02' of... 

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: default avatarDave 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
parents 475be514 394b5246

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

+1 −1
Original line number Diff line number Diff line
@@ -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));