summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alex@t41p.(none)>2006-10-15 13:10:22 -0400
committerAlex Deucher <alex@t41p.(none)>2006-10-15 13:10:22 -0400
commit4abb5b7afea8d37e95461335e52b16168e555dab (patch)
treeffe265dd6f91bf144a046b02e5bf38e1d58e3ce1
parent2933140b5f1f8a6e270460d8918a14943bd0f174 (diff)
Remove Bioshotkeys option. Leave the bios as configured at boot.
Most distros enable this option by defalt anyway, and with xrandr++ it won't be an issue anyway.
-rw-r--r--src/radeon.h3
-rw-r--r--src/radeon_driver.c4
2 files changed, 2 insertions, 5 deletions
diff --git a/src/radeon.h b/src/radeon.h
index a97fe49e..c234f6d9 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -806,9 +806,6 @@ typedef struct {
/* special handlings for DELL triple-head server */
Bool IsDellServer;
- /* enable bios hotkey output switching */
- Bool BiosHotkeys;
-
Bool VGAAccess;
int MaxSurfaceWidth;
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 0a0d382a..4ee6281e 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -193,7 +193,6 @@ static const OptionInfoRec RADEONOptions[] = {
#endif
{ OPTION_SHOWCACHE, "ShowCache", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_DYNAMIC_CLOCKS, "DynamicClocks", OPTV_BOOLEAN, {0}, FALSE },
- { OPTION_BIOS_HOTKEYS, "BIOSHotkeys", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_VGA_ACCESS, "VGAAccess", OPTV_BOOLEAN, {0}, TRUE },
{ OPTION_REVERSE_DDC, "ReverseDDC", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_LVDS_PROBE_PLL, "LVDSProbePLL", OPTV_BOOLEAN, {0}, FALSE },
@@ -6345,7 +6344,7 @@ static void RADEONInitFPRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save,
save->fp_gen_cntl &= ~RADEON_FP_PANEL_FORMAT;/* 18 bit format */
}
}
-
+#if 0
info->BiosHotkeys = FALSE;
/*
* Allow the bios to toggle outputs. see below for more.
@@ -6394,6 +6393,7 @@ static void RADEONInitFPRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save,
save->bios_5_scratch = 0x01020201;
}
+#endif
}
/* Define CRTC registers for requested video mode */