Commit 6ae1ff5b authored by Maggie Chen's avatar Maggie Chen Committed by Commit Bot

Fix a GPU watchdog V1 bug on X11

The GPU watchdog will not crash if we're not on the TTY of our host X11
server. But simply doing return without calling OnAcknowledge() will
stop the watchdog. Add OnAcknowledge() before return to fix this bug.

Bug: 1036444
Change-Id: I6d6ce9ebf57a4d7fa2b6f88162afa3a2cb2689d8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1977307
Commit-Queue: Maggie Chen <magchen@chromium.org>
Reviewed-by: default avatarZhenyao Mo <zmo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726890}
parent 300bf577
......@@ -401,6 +401,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToRecoverFromHang() {
// Don't crash if we're not on the TTY of our host X11 server.
int active_tty = GetActiveTTY();
if (host_tty_ != -1 && active_tty != -1 && host_tty_ != active_tty) {
OnAcknowledge();
return;
}
#endif
......
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