From: Daniel Vetter Date: Wed, 4 Jul 2012 20:18:41 +0000 (+0200) Subject: drm/i915: don't hang userspace when the gpu reset is stuck X-Git-Tag: v3.6-rc1~83^2~39^2~8 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a6759c6bacb3998e3d9a7cf690177051238ad87;p=pandora-kernel.git drm/i915: don't hang userspace when the gpu reset is stuck With the gpu reset no longer using a trylock we've increased the chances of userspace getting stuck quite a bit. To make that (hopefully) rare case more paletable time out when waiting for the gpu reset code to complete and signal this little issue to the caller by returning -EIO. This should help userspace to somewhat gracefully fall back and hopefully allow the user to grab some logs and reboot the machine (instead of staring at a frozen X screen in agony). Suggested by Chris Wilson because I've been stubborn about allowing the gpu reset code no to fail, ever (by removing the trylock). Reviewed-by: Chris Wilson Tested-by: Chris Wilson Signed-Off-by: Daniel Vetter --- Reading git-diff-tree failed