From 81e1f36e76823069f2862425b8504a1cd820d15c Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Tue, 20 Mar 2012 17:18:29 -0400 Subject: [PATCH] --- yaml --- r: 293891 b: refs/heads/master c: 5d7486c77d44cb26049f599fdfa46bc548ea5537 h: refs/heads/master i: 293889: d4982cfabcb606773852fc5e6a98ddd6b3aca0b2 293887: 53b5c2fe7b9bb0297dca6201aaead44892fc077e v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_pm.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 87bc11f0272a..3b0b82927034 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8848f759c0de139bada271aa446f48637c98ca1a +refs/heads/master: 5d7486c77d44cb26049f599fdfa46bc548ea5537 diff --git a/trunk/drivers/gpu/drm/radeon/radeon_pm.c b/trunk/drivers/gpu/drm/radeon/radeon_pm.c index a6dbefca56dd..caa55d68f319 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_pm.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_pm.c @@ -518,6 +518,9 @@ static int radeon_hwmon_init(struct radeon_device *rdev) case THERMAL_TYPE_NI: case THERMAL_TYPE_SUMO: case THERMAL_TYPE_SI: + /* No support for TN yet */ + if (rdev->family == CHIP_ARUBA) + return err; rdev->pm.int_hwmon_dev = hwmon_device_register(rdev->dev); if (IS_ERR(rdev->pm.int_hwmon_dev)) { err = PTR_ERR(rdev->pm.int_hwmon_dev);