From 5da2e4639492406e1411d6e9c4aa6aa3b45889c7 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 11 Jul 2011 17:28:14 +0000 Subject: [PATCH] prevent radeon_hd enumeral mismatch on powerpc/gcc4 git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42407 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/accelerants/radeon_hd/pll.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/add-ons/accelerants/radeon_hd/pll.cpp b/src/add-ons/accelerants/radeon_hd/pll.cpp index 8aa05f97bf..8175212271 100644 --- a/src/add-ons/accelerants/radeon_hd/pll.cpp +++ b/src/add-ons/accelerants/radeon_hd/pll.cpp @@ -190,9 +190,11 @@ PLLPower(uint8 pllIndex, int command) uint16 pllDiffPostReg = (pllIndex == 1) ? RV620_EXT2_DIFF_POST_DIV_CNTL : RV620_EXT1_DIFF_POST_DIV_CNTL; - uint16 pllDiffDriverEnable - = (pllIndex == 1) ? RV62_EXT2_DIFF_DRIVER_ENABLE - : RV62_EXT1_DIFF_DRIVER_ENABLE; + + uint16 pllDiffDriverEnable = (pllIndex == 1) ? 3 << 8 : 1 << 8; + // AKA RV62_EXT2_DIFF_DRIVER_ENABLE : RV62_EXT1_DIFF_DRIVER_ENABLE + // this prevents enumeral mismatch without a long static_cast + // Sometimes we have to keep an unused PLL running. X Bug #18016 if ((Read32(PLL, pllDiffPostReg) & pllDiffDriverEnable) == 0) {