Below patches aim to fix https://bugs.freedesktop.org/show_bug.cgi?id=35462. With them I've been able to run many cycles of S3 tests on two SNB/CPT boards here, which would hang immediately after S3 resume with upstream kernel. It still needs more testing, I'd like to get them reviewed first. Thanks.