From: Ville Syrjälä Date: Wed, 25 Sep 2013 16:55:26 +0000 (+0300) Subject: drm/i915: Fix pre-CTG vblank counter X-Git-Tag: v3.13-rc1~76^2~68^2~69 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=391f75e2bf13f105d9e4a120736ccdd8e3bc638b;p=pandora-kernel.git drm/i915: Fix pre-CTG vblank counter The old style frame counter increments at the start of active video. However for i915_get_vblank_counter() we want a counter that increments at the start of vblank. Fortunately the low frame counter register also contains the pixel counter for the current frame. We can can compare that against the vblank start pixel count to determine if we need to increment the frame counter by 1 to get the correct answer. Also reorganize the function pointer assignments in intel_irq_init() a bit to avoid confusing people. Cc: Mario Kleiner Signed-off-by: Ville Syrjälä Reviewed-by: Mario Kleiner Signed-off-by: Daniel Vetter --- Reading git-diff-tree failed