gen7 appears to be totally broken at the moment -- GL apps are GPU hanging, and I've been using piglit fdo23670-drawpix_stencil (approximately the first failing test) trying to track it down. Here are a couple of little fixes, but they don't actually fix the problem.