drm/i915: differ error message between forcwake timeouts
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 24 Aug 2012 15:26:21 +0000 (17:26 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 3 Sep 2012 08:09:28 +0000 (10:09 +0200)
<ickle> danvet: in the force wake, both DRM_ERRORs have the same string.
<ickle> useful for .txt shrinkage, horrible for debugging

Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_pm.c

Simple merge