Skip to content

Commit eb48d42

Browse files
vsyrjalatursulin
authored andcommitted
drm/i915: Fix oops due to missing stack depot
We call __save_depot_stack() unconditionally so the stack depot must always be initialized or else we'll oops on platforms without runtime pm support. Presumably we've not seen this in CI due to stack_depot_init() already getting called via drm_mm_init()+CONFIG_DRM_DEBUG_MM. Cc: Vlastimil Babka <[email protected]> Cc: Dmitry Vyukov <[email protected]> Cc: Marco Elver <[email protected]> # stackdepot Cc: Chris Wilson <[email protected]> Cc: Imre Deak <[email protected]> Fixes: 2dba5eb ("lib/stackdepot: allow optional init and stack_table allocation by kvmalloc()") Signed-off-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Acked-by: Vlastimil Babka <[email protected]> Reviewed-by: Imre Deak <[email protected]> (cherry picked from commit 751a9d6) Signed-off-by: Tvrtko Ursulin <[email protected]>
1 parent dfd42fa commit eb48d42

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

drivers/gpu/drm/i915/intel_runtime_pm.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,7 @@ static noinline depot_stack_handle_t __save_depot_stack(void)
6868
static void init_intel_runtime_pm_wakeref(struct intel_runtime_pm *rpm)
6969
{
7070
spin_lock_init(&rpm->debug.lock);
71-
72-
if (rpm->available)
73-
stack_depot_init();
71+
stack_depot_init();
7472
}
7573

7674
static noinline depot_stack_handle_t

0 commit comments

Comments
 (0)