From 7bb49ce523c3db38cadec3d30e9c498c034b4dc8 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Mon, 22 Nov 2010 17:56:22 -0500
Subject: [PATCH] --- yaml --- r: 228495 b: refs/heads/master c:
 2f062fda4f83932b87b3b6c903eeade43422245a h: refs/heads/master i:   228493:
 43978d80331110a393e79a3e54fe53d54079d535   228491:
 42905b31303cea4e0d46a662da6cc03d09762e6e   228487:
 eaab615a891db32a273ad9a36c178704b6c2e1b9   228479:
 2c5fb0a063aba5d51552e14011319b5451ff7a23 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/gpu/drm/radeon/radeon.h        | 1 +
 trunk/drivers/gpu/drm/radeon/radeon_family.h | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 31f0698c8ede..c4f4cc9d9eb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 603a9da37b83c2b4cc4495ecab7916f45cf5837e
+refs/heads/master: 2f062fda4f83932b87b3b6c903eeade43422245a
diff --git a/trunk/drivers/gpu/drm/radeon/radeon.h b/trunk/drivers/gpu/drm/radeon/radeon.h
index 3a7095743d44..cfaf71323491 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon.h
+++ b/trunk/drivers/gpu/drm/radeon/radeon.h
@@ -1269,6 +1269,7 @@ void r100_pll_errata_after_index(struct radeon_device *rdev);
 #define ASIC_IS_DCE3(rdev) ((rdev->family >= CHIP_RV620))
 #define ASIC_IS_DCE32(rdev) ((rdev->family >= CHIP_RV730))
 #define ASIC_IS_DCE4(rdev) ((rdev->family >= CHIP_CEDAR))
+#define ASIC_IS_DCE41(rdev) ((rdev->family >= CHIP_PALM))
 
 /*
  * BIOS helpers.
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_family.h b/trunk/drivers/gpu/drm/radeon/radeon_family.h
index e329066dcabd..4c222d5437d1 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_family.h
+++ b/trunk/drivers/gpu/drm/radeon/radeon_family.h
@@ -80,6 +80,7 @@ enum radeon_family {
 	CHIP_JUNIPER,
 	CHIP_CYPRESS,
 	CHIP_HEMLOCK,
+	CHIP_PALM,
 	CHIP_LAST,
 };