From: Paulo Zanoni Date: Thu, 15 Aug 2013 14:51:32 +0000 (-0300) Subject: drm/i915: merge HSW and SNB PM irq handlers X-Git-Tag: v3.12-rc1~136^2~14^2~11 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1403c0d4d46f2eed2ab13b89561c853988ad7513;p=pandora-kernel.git drm/i915: merge HSW and SNB PM irq handlers Because hsw_pm_irq_handler does exactly what gen6_rps_irq_handler does and also processes the 2 additional VEBOX bits. So merge those functions and wrap the VEBOX bits on a HAS_VEBOX check. This check isn't really necessary since the bits are reserved on SNB/IVB/VLV, but it's a good documentation on who uses them. v2: - Change IS_HASWELL check to HAS_VEBOX Signed-off-by: Paulo Zanoni Reviewed-by: Ben Widawsky Signed-off-by: Daniel Vetter --- Reading git-diff-tree failed