From owner-svn-src-all@freebsd.org  Wed Apr 20 02:58:23 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4B098B15FD8;
 Wed, 20 Apr 2016 02:58:23 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 18B861FC4;
 Wed, 20 Apr 2016 02:58:23 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3K2wMlV055532;
 Wed, 20 Apr 2016 02:58:22 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3K2wM6d055531;
 Wed, 20 Apr 2016 02:58:22 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201604200258.u3K2wM6d055531@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: "Conrad E. Meyer" <cem@FreeBSD.org>
Date: Wed, 20 Apr 2016 02:58:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298331 - head/sys/dev/drm2/i915
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Apr 2016 02:58:23 -0000

Author: cem
Date: Wed Apr 20 02:58:22 2016
New Revision: 298331
URL: https://svnweb.freebsd.org/changeset/base/298331

Log:
  i915kms intel_pm: Read from actual tsc_freq instead of uninitialized local
  
  The local of the same name would alias the global, but we didn't even include
  the header that defines tsc_freq.  Include it and rename the local.
  
  Reported by:	Coverity
  CID:		1331559
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/dev/drm2/i915/intel_pm.c

Modified: head/sys/dev/drm2/i915/intel_pm.c
==============================================================================
--- head/sys/dev/drm2/i915/intel_pm.c	Wed Apr 20 02:09:38 2016	(r298330)
+++ head/sys/dev/drm2/i915/intel_pm.c	Wed Apr 20 02:58:22 2016	(r298331)
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/drm2/i915/i915_drv.h>
 #include <dev/drm2/i915/intel_drv.h>
 #include <sys/kdb.h>
+#include <machine/clock.h>
 
 #define FORCEWAKE_ACK_TIMEOUT_MS 2
 
@@ -2686,9 +2687,9 @@ static void gen6_update_ring_freq(struct
 	if (!max_ia_freq)
 		max_ia_freq = tsc_khz;
 #else
-	uint64_t tsc_freq;
-	tsc_freq = atomic_load_acq_64(&tsc_freq);
-	max_ia_freq = tsc_freq / 1000;
+	uint64_t freq;
+	freq = atomic_load_acq_64(&tsc_freq);
+	max_ia_freq = freq / 1000;
 #endif /* FREEBSD_WIP */
 
 	/* Convert from kHz to MHz */