Merge branch 'topic/usb-validation' into for-next

[linux-2.6-microblaze.git] / drivers / gpu / drm / drm_vblank.c

diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c
index a1b65d2..603ab10 100644 (file)
--- a/drivers/gpu/drm/drm_vblank.c
+++ b/drivers/gpu/drm/drm_vblank.c
@@ -24,12 +24,18 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <drm/drm_vblank.h>
-#include <drm/drmP.h>
 #include <linux/export.h>
+#include <linux/moduleparam.h>
+
+#include <drm/drm_crtc.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_framebuffer.h>
+#include <drm/drm_print.h>
+#include <drm/drm_os_linux.h>
+#include <drm/drm_vblank.h>
 
-#include "drm_trace.h"
 #include "drm_internal.h"
+#include "drm_trace.h"
 
 /**
  * DOC: vblank handling
@@ -235,12 +241,16 @@ static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe,
                 * on the difference in the timestamps and the
                 * frame/field duration.
                 */
+
+               DRM_DEBUG_VBL("crtc %u: Calculating number of vblanks."
+                             " diff_ns = %lld, framedur_ns = %d)\n",
+                             pipe, (long long) diff_ns, framedur_ns);
+
                diff = DIV_ROUND_CLOSEST_ULL(diff_ns, framedur_ns);
 
                if (diff == 0 && in_vblank_irq)
-                       DRM_DEBUG_VBL("crtc %u: Redundant vblirq ignored."
-                                     " diff_ns = %lld, framedur_ns = %d)\n",
-                                     pipe, (long long) diff_ns, framedur_ns);
+                       DRM_DEBUG_VBL("crtc %u: Redundant vblirq ignored\n",
+                                     pipe);
        } else {
                /* some kind of default for drivers w/o accurate vbl timestamping */
                diff = in_vblank_irq ? 1 : 0;