diff options
| author | Egbert Eich <eich@suse.de> | 2005-05-23 09:50:20 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2005-05-23 09:50:20 +0000 |
| commit | 0845d1db801ae74688464bd4c41a7e40e4b50186 (patch) | |
| tree | 655817fdedffbde8a1d58521b30ccb4fd3a46360 /src/radeon_macros.h | |
| parent | 74b86b036def72e5180a46871b8452ba9eea9bb1 (diff) | |
Explicitely disable DPMS power states during close screen. Fix macro that
takes a value and a mask of bits to modify to be behave evquvalently if
the bits that should remain unchanged are set or unset in the value
(Bugzilla #3369).
Diffstat (limited to 'src/radeon_macros.h')
| -rw-r--r-- | src/radeon_macros.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/radeon_macros.h b/src/radeon_macros.h index 5b173cc0..b121a95b 100644 --- a/src/radeon_macros.h +++ b/src/radeon_macros.h @@ -78,7 +78,7 @@ do { \ CARD32 tmp = INREG(addr); \ tmp &= (mask); \ - tmp |= (val); \ + tmp |= ((val) & ~(mask)); \ OUTREG(addr, tmp); \ } while (0) @@ -90,7 +90,7 @@ do { \ do { \ CARD32 tmp_ = INPLL(pScrn, addr); \ tmp_ &= (mask); \ - tmp_ |= (val); \ + tmp_ |= ((val) & ~(mask)); \ OUTPLL(pScrn, addr, tmp_); \ } while (0) |