diff options
| author | Alex Deucher <alex@botch2.(none)> | 2007-11-30 16:40:28 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@botch2.(none)> | 2007-11-30 16:40:28 -0500 |
| commit | af0196f7bf0d1d5d211391149c18935d64ed2b06 (patch) | |
| tree | 5d88a8945a06894658dcfeca18f7e1f98b8447cf /src/radeon_crtc.c | |
| parent | d9858a2b3744b99003cfb9f31b743a2d31b322e9 (diff) | |
| parent | 0175b79987ef4d7b0ce8238c3bdde989e504516a (diff) | |
Merge branch 'master' of ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati into atombios-support
merge master and fix conflicts
Diffstat (limited to 'src/radeon_crtc.c')
| -rw-r--r-- | src/radeon_crtc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c index 57fad399..e2883522 100644 --- a/src/radeon_crtc.c +++ b/src/radeon_crtc.c @@ -783,8 +783,8 @@ RADEONInitBIOSRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save) RADEONInfoPtr info = RADEONPTR(pScrn); /* tell the bios not to muck with the hardware on events */ - save->bios_4_scratch = 0; - save->bios_5_scratch = 0xff00; + save->bios_4_scratch = 0x4; /* 0x4 needed for backlight */ + save->bios_5_scratch = (info->SavedReg.bios_5_scratch & 0xff) | 0xff00; /* bits 0-3 keep backlight level */ save->bios_6_scratch = info->SavedReg.bios_6_scratch | 0x40000000; } |