This is probably already fixed in drm-next by
commit 0ad4dc887d4168448e8c801aa4edd8fe1e0bd534 Author: Hans de Goede hdegoede@redhat.com Date: Thu May 18 13:06:44 2017 +0200
drm/i915: Fix new -Wint-in-bool-context gcc compiler warning
which I also think is a more sensible fix than this one.
Ah, I didn't see that patch. Yeah, you're right.