On Thu, 04 Sep 2014, Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> wrote: > On Thu, Sep 04, 2014 at 09:36:18AM +0200, Daniel Vetter wrote: >> In >> >> commit 1f83fee08d625f8d0130f9fe5ef7b17c2e022f3c >> Author: Daniel Vetter <daniel.vetter@xxxxxxxx> >> Date: Thu Nov 15 17:17:22 2012 +0100 >> >> drm/i915: clear up wedged transitions >> >> I've accidentally inverted the EIO/wedged handling in the fault >> handler: We want to return the EIO as a SIGBUS only if it's not >> because of the gpu having died, to prevent userspace from unduly >> dying. >> >> In my defence the comment right above is completely misleading, so fix >> both. >> >> v2: Drop the WARN_ON, it's not actually a bug to e.g. receive an -EIO >> when swap-in fails. >> >> v3: Don't remove too much ... oops. >> >> Reported-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> >> Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> >> Cc: stable@xxxxxxxxxxxxxxx >> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> > Reviewed-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> Pushed to drm-intel-fixes, thanks for the patch and review. BR, Jani. > -Chris > > -- > Chris Wilson, Intel Open Source Technology Centre > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html