summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Deucher <alex@botch2.(none)>2007-11-18 17:56:51 -0500
committerAlex Deucher <alex@botch2.(none)>2007-11-18 17:56:51 -0500
commit679e7a2e0d1b213524b8109193483bc9840fb116 (patch)
tree60fcb39649a9998076b17650102cf781e38651e5 /src
parent1cd7cc3e6758ab1012f3ced6e958a1517f45557f (diff)
Few fixes from the last commit.
Update parser works fine on r4xx.
Diffstat (limited to 'src')
-rw-r--r--src/radeon_atombios.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 15612fb9..46ceea85 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -65,8 +65,8 @@ static AtomBiosResult rhdAtomGPIOI2CInfoQuery(atomBiosHandlePtr handle,
AtomBiosRequestID func, AtomBiosArgPtr data);
static AtomBiosResult rhdAtomFirmwareInfoQuery(atomBiosHandlePtr handle,
AtomBiosRequestID func, AtomBiosArgPtr data);
-static AtomBiosResult rhdAtomConnectorInfo(atomBiosHandlePtr handle,
- AtomBiosRequestID unused, AtomBiosArgPtr data);
+/*static AtomBiosResult rhdAtomConnectorInfo(atomBiosHandlePtr handle,
+ AtomBiosRequestID unused, AtomBiosArgPtr data);*/
# ifdef ATOM_BIOS_PARSER
static AtomBiosResult rhdAtomExec(atomBiosHandlePtr handle,
AtomBiosRequestID unused, AtomBiosArgPtr data);
@@ -98,8 +98,8 @@ struct atomBIOSRequests {
#endif
{ATOMBIOS_ALLOCATE_FB_SCRATCH, rhdAtomAllocateFbScratch,
"AtomBIOS Set FB Space", MSG_FORMAT_NONE},
- {ATOMBIOS_GET_CONNECTORS, rhdAtomConnectorInfo,
- "AtomBIOS Get Connectors", MSG_FORMAT_NONE},
+ /*{ATOMBIOS_GET_CONNECTORS, rhdAtomConnectorInfo,
+ "AtomBIOS Get Connectors", MSG_FORMAT_NONE},*/
{ATOMBIOS_GET_PANEL_MODE, rhdAtomLvdsGetTimings,
"AtomBIOS Get Panel Mode", MSG_FORMAT_NONE},
{ATOMBIOS_GET_PANEL_EDID, rhdAtomLvdsGetTimings,
@@ -382,7 +382,7 @@ rhdAtomGetDataTable(int scrnIndex,
__func__);
}
- if (cmd_offset + sizeof (ATOM_MASTER_COMMAND_TABLE) > BIOSImageSize) {
+ if (*cmd_offset + sizeof (ATOM_MASTER_COMMAND_TABLE) > BIOSImageSize) {
xf86DrvMsg(scrnIndex,X_ERROR,"%s: Atom command table outside of BIOS\n",
__func__);
}
@@ -2278,7 +2278,7 @@ atombios_get_command_table_version(atomBiosHandlePtr atomBIOS, int index, int *m
ATOM_MASTER_LIST_OF_COMMAND_TABLES *table_start;
ATOM_COMMON_ROM_COMMAND_TABLE_HEADER *table_hdr;
- unsigned short *ptr;
+ //unsigned short *ptr;
unsigned short offset;
table_start = &cmd_table->ListOfCommandTables;