c779684c3a
"Save and restore the palettes on VT switch." upstream commits: 5efdf514ab0e5439114e8dd7a49105812155eb69 fc7aa6e3bbb86eaa2f34b827629f7e82cde65ac7
96 lines
2.6 KiB
Text
96 lines
2.6 KiB
Text
$NetBSD: patch-aa,v 1.7 2010/10/27 16:48:26 jakllsch Exp $
|
|
|
|
--- src/radeon_driver.c.orig 2009-09-10 23:18:42.000000000 +0000
|
|
+++ src/radeon_driver.c
|
|
@@ -4246,8 +4246,6 @@ static void RADEONSaveMemMapRegisters(Sc
|
|
}
|
|
}
|
|
|
|
-
|
|
-#if 0
|
|
/* Read palette data */
|
|
static void RADEONSavePalette(ScrnInfoPtr pScrn, RADEONSavePtr save)
|
|
{
|
|
@@ -4255,19 +4253,37 @@ static void RADEONSavePalette(ScrnInfoPt
|
|
unsigned char *RADEONMMIO = info->MMIO;
|
|
int i;
|
|
|
|
-#ifdef ENABLE_FLAT_PANEL
|
|
- /* Select palette 0 (main CRTC) if using FP-enabled chip */
|
|
- /* if (info->Port1 == MT_DFP) PAL_SELECT(1); */
|
|
-#endif
|
|
PAL_SELECT(1);
|
|
INPAL_START(0);
|
|
- for (i = 0; i < 256; i++) save->palette2[i] = INPAL_NEXT();
|
|
+ for (i = 0; i < 256; i++) {
|
|
+ save->palette2[i] = INREG(RADEON_PALETTE_30_DATA);
|
|
+ }
|
|
+
|
|
PAL_SELECT(0);
|
|
INPAL_START(0);
|
|
- for (i = 0; i < 256; i++) save->palette[i] = INPAL_NEXT();
|
|
- save->palette_valid = TRUE;
|
|
+ for (i = 0; i < 256; i++) {
|
|
+ save->palette[i] = INREG(RADEON_PALETTE_30_DATA);
|
|
+ }
|
|
+}
|
|
+
|
|
+static void RADEONRestorePalette(ScrnInfoPtr pScrn, RADEONSavePtr restore)
|
|
+{
|
|
+ RADEONInfoPtr info = RADEONPTR(pScrn);
|
|
+ unsigned char *RADEONMMIO = info->MMIO;
|
|
+ int i;
|
|
+
|
|
+ PAL_SELECT(1);
|
|
+ OUTPAL_START(0);
|
|
+ for (i = 0; i < 256; i++) {
|
|
+ OUTREG(RADEON_PALETTE_30_DATA, restore->palette2[i]);
|
|
+ }
|
|
+
|
|
+ PAL_SELECT(0);
|
|
+ OUTPAL_START(0);
|
|
+ for (i = 0; i < 256; i++) {
|
|
+ OUTREG(RADEON_PALETTE_30_DATA, restore->palette[i]);
|
|
+ }
|
|
}
|
|
-#endif
|
|
|
|
static void
|
|
avivo_save(ScrnInfoPtr pScrn, RADEONSavePtr save)
|
|
@@ -5134,6 +5150,8 @@ static void RADEONSave(ScrnInfoPtr pScrn
|
|
RADEONSaveCrtcRegisters(pScrn, save);
|
|
RADEONSaveFPRegisters(pScrn, save);
|
|
RADEONSaveDACRegisters(pScrn, save);
|
|
+ RADEONSavePalette(pScrn, save);
|
|
+
|
|
if (pRADEONEnt->HasCRTC2) {
|
|
RADEONSaveCrtc2Registers(pScrn, save);
|
|
RADEONSavePLL2Registers(pScrn, save);
|
|
@@ -5252,24 +5270,15 @@ static void RADEONRestore(ScrnInfoPtr pS
|
|
if (IS_AVIVO_VARIANT)
|
|
avivo_restore_vga_regs(pScrn, restore);
|
|
|
|
- if (!IS_AVIVO_VARIANT)
|
|
+ if (!IS_AVIVO_VARIANT) {
|
|
+ RADEONRestorePalette(pScrn, restore);
|
|
RADEONRestoreDACRegisters(pScrn, restore);
|
|
-
|
|
+ }
|
|
#if 0
|
|
RADEONWaitForVerticalSync(pScrn);
|
|
#endif
|
|
}
|
|
|
|
-#if 0
|
|
-/* Define initial palette for requested video mode. This doesn't do
|
|
- * anything for XFree86 4.0.
|
|
- */
|
|
-static void RADEONInitPalette(RADEONSavePtr save)
|
|
-{
|
|
- save->palette_valid = FALSE;
|
|
-}
|
|
-#endif
|
|
-
|
|
static Bool RADEONSaveScreen(ScreenPtr pScreen, int mode)
|
|
{
|
|
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
|