From patchwork Mon Nov 8 18:39:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 308932 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oA8Idgg3012735 for ; Mon, 8 Nov 2010 18:40:03 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4C1689E976 for ; Mon, 8 Nov 2010 10:39:40 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vw0-f49.google.com (mail-vw0-f49.google.com [209.85.212.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 4FEEF9E778 for ; Mon, 8 Nov 2010 10:39:28 -0800 (PST) Received: by vws6 with SMTP id 6so384601vws.36 for ; Mon, 08 Nov 2010 10:39:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=1KdwKKpl/XHjFhtIjkbwTs8RlTVeGD+rXlrNyDr91tA=; b=Kjejx2qgcS/glCn2PyyKktiRUUxAq1kyZR8bkRWQeOwlGdTImHzxRwt4nv4t6Zi+X+ Xue0BV0vww5R7QuAiu3HzwtH+Ksfpcqi8f37yj3+rTph8oID72yMW8HJ/ozUx7TwLLlV 2Khb1aGC8Cn31gIsfkN4WankZAwVrm6NLYhec= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=sjm1cb/ZQBZfr2QAOT44ZT8yiL1xfbzQE4kP61HwiJaLr+OEv/CqdyH8AvUfC5bU3O M+9PKBejOx59AKiqke1ooe9mdcJiY137cc295rUVM2J4zWb9zE7ErN+gj9BWafr8ucMV 2P5IpW0O2NFo7D2aYEq5Yv5bXofVDtWW+7l28= Received: by 10.220.63.10 with SMTP id z10mr1399050vch.90.1289241567536; Mon, 08 Nov 2010 10:39:27 -0800 (PST) Received: from localhost.localdomain (static-74-96-105-7.washdc.fios.verizon.net [74.96.105.7]) by mx.google.com with ESMTPS id l9sm93859vbp.11.2010.11.08.10.39.26 (version=SSLv3 cipher=RC4-MD5); Mon, 08 Nov 2010 10:39:26 -0800 (PST) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: fix thermal sensor reporting on rv6xx Date: Mon, 8 Nov 2010 13:39:18 -0500 Message-Id: <1289241558-8082-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 08 Nov 2010 18:40:03 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 951af00..bd69299 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -106,14 +106,8 @@ u32 rv6xx_get_temp(struct radeon_device *rdev) { u32 temp = (RREG32(CG_THERMAL_STATUS) & ASIC_T_MASK) >> ASIC_T_SHIFT; - u32 actual_temp = 0; - if ((temp >> 7) & 1) - actual_temp = 0; - else - actual_temp = (temp >> 1) & 0xff; - - return actual_temp * 1000; + return temp * 1000; } void r600_pm_get_dynpm_state(struct radeon_device *rdev)