Don't panic on GPU hang #14974
Merged
Don't panic on GPU hang #14974
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cla-bot
bot
added
the
cla-signed
CharlesChen0823
pushed a commit
to CharlesChen0823/zed
that referenced
this pull request
Jul 29, 2024
Fixes: zed-industries#12766 Fixes: zed-industries#14022 Release Notes: - linux: Fix panic when GPU is temporarily unavailable.
|
This actually doesn't solve the issue. Now, instead of crashing, Zed just freezes |
1 task
Vanuan
reviewed
Jan 21, 2025
| @@ -18,7 +18,7 @@ use blade_graphics as gpu; | |||
| use blade_util::{BufferBelt, BufferBeltDescriptor}; | |||
| use std::{mem, sync::Arc}; | |||
|
|
|||
| const MAX_FRAME_TIME_MS: u32 = 1000; | |||
| const MAX_FRAME_TIME_MS: u32 = 10000; | |||
Vanuan
reviewed
Jan 21, 2025
| @@ -412,7 +412,8 @@ impl BladeRenderer { | |||
| fn wait_for_gpu(&mut self) { | |||
| if let Some(last_sp) = self.last_sync_point.take() { | |||
| if !self.gpu.wait_for(&last_sp, MAX_FRAME_TIME_MS) { | |||
| panic!("GPU hung"); | |||
| log::error!("GPU hung"); | |||
| while !self.gpu.wait_for(&last_sp, MAX_FRAME_TIME_MS) {} | |||
|
@Vanuan Happy to work with you on solutions, but comments on old PR's probably won't drive change. |
|
Zed UI freezes after suspend/resume. The only log I see is "GPU hung". I've tried razing issues in blade and Zed, tried proposing a path to the solution but it leads nowhere. I'd be happy to send a crash log, but Zed doesn't crash thanks to your fix. It seems to happy to resume operations just not rendering anything. The only remedy I have is kill zed-editor and restart. If Zed provided at least that, I'd be happy. |
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #12766
Fixes: #14022
Release Notes: