Commit cdc1e6e2 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds

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: 62eaf0ae ("drm/i915/guc: Support request cancellation")
Signed-off-by: default avatarHugh Dickins <hughd@google.com>
Tested-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 53d5fc89
...@@ -362,8 +362,9 @@ static int __intel_context_active(struct i915_active *active) ...@@ -362,8 +362,9 @@ static int __intel_context_active(struct i915_active *active)
return 0; return 0;
} }
static int sw_fence_dummy_notify(struct i915_sw_fence *sf, static int __i915_sw_fence_call
enum i915_sw_fence_notify state) sw_fence_dummy_notify(struct i915_sw_fence *sf,
enum i915_sw_fence_notify state)
{ {
return NOTIFY_DONE; return NOTIFY_DONE;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment