Skip to content

Commit cdc1e6e

Browse files
Hugh Dickinstorvalds
authored andcommitted
drm/i915: fix blank screen booting crashes
5.15-rc1 crashes with blank screen when booting up on two ThinkPads using i915. Bisections converge convincingly, but arrive at different and suprising "culprits", none of them the actual culprit. netconsole (with init_netconsole() hacked to call i915_init() when logging has started, instead of by module_init()) tells the story: kernel BUG at drivers/gpu/drm/i915/i915_sw_fence.c:245! with RSI: ffffffff814d408b pointing to sw_fence_dummy_notify(). I've been building with CONFIG_CC_OPTIMIZE_FOR_SIZE=y, and that function needs to be 4-byte aligned. Fixes: 62eaf0a ("drm/i915/guc: Support request cancellation") Signed-off-by: Hugh Dickins <[email protected]> Tested-by: Steven Rostedt (VMware) <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 53d5fc8 commit cdc1e6e

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/gpu/drm/i915/gt/intel_context.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,9 @@ static int __intel_context_active(struct i915_active *active)
362362
return 0;
363363
}
364364

365-
static int sw_fence_dummy_notify(struct i915_sw_fence *sf,
366-
enum i915_sw_fence_notify state)
365+
static int __i915_sw_fence_call
366+
sw_fence_dummy_notify(struct i915_sw_fence *sf,
367+
enum i915_sw_fence_notify state)
367368
{
368369
return NOTIFY_DONE;
369370
}

0 commit comments

Comments
 (0)