From owner-svn-src-all@FreeBSD.ORG  Sun Jul  1 06:41:39 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E5147106564A;
	Sun,  1 Jul 2012 06:41:39 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CFBF78FC0A;
	Sun,  1 Jul 2012 06:41:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q616fdwW071242;
	Sun, 1 Jul 2012 06:41:39 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q616fdjG071240;
	Sun, 1 Jul 2012 06:41:39 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201207010641.q616fdjG071240@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 1 Jul 2012 06:41:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237882 - stable/9/sys/dev/drm2
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Jul 2012 06:41:40 -0000

Author: mav
Date: Sun Jul  1 06:41:39 2012
New Revision: 237882
URL: http://svn.freebsd.org/changeset/base/237882

Log:
  MFC r237718:
  Fix millisecond to ticks conversion in drm_msleep().
  
  On systems with HZ=100 it caused Intel eDP video output initialization
  (and Xorg startup) to take several minutes instead of several seconds.
  
  Reviewed by:	kib

Modified:
  stable/9/sys/dev/drm2/drmP.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/drm2/drmP.h
==============================================================================
--- stable/9/sys/dev/drm2/drmP.h	Sun Jul  1 06:34:17 2012	(r237881)
+++ stable/9/sys/dev/drm2/drmP.h	Sun Jul  1 06:41:39 2012	(r237882)
@@ -250,7 +250,7 @@ enum {
 #define	msecs_to_jiffies(x)	(((int64_t)(x)) * hz / 1000)
 #define	time_after(a,b)		((long)(b) - (long)(a) < 0)
 #define	time_after_eq(a,b)	((long)(b) - (long)(a) <= 0)
-#define drm_msleep(x, msg)	pause((msg), ((int64_t)(x)) * 1000 / hz)
+#define drm_msleep(x, msg)	pause((msg), ((int64_t)(x)) * hz / 1000)
 
 typedef vm_paddr_t dma_addr_t;
 typedef uint64_t u64;