i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added MMS (multihead cards) support by using primary adaptors BIOS for all cards. Confirmed a G200MMS working OK on all four heads with the Be test harness application. That's one card with four G200 GPU's on it! (thanks Cale Lewis :)

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15081 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rudolf Cornelissen
2005-11-22 21:12:13 +00:00
parent df84e0383c
commit 317806623e
2 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/graphics/matrox/UPDATE.html
+3 -2
View File
@@ -4,9 +4,10 @@
</head> </head>
<body> <body>
<p><h2>Changes done for each driverversion:</h2></p> <p><h2>Changes done for each driverversion:</h2></p>
<p><h1>head (SVN 0.22, Rudolf)</h1></p> <p><h1>head (SVN 0.23, Rudolf)</h1></p>
<ul> <ul>
<li>Several ProposeMode updates and fixes making the Matrox driver better compatible with Dualhead Setup 0.04. <li>Several ProposeMode updates and fixes making the Matrox driver better compatible with Dualhead Setup 0.04;
<li>Added support for MMS cards by letting non-primary adaptors use the BIOS from the primary adaptor if they don't have their own. Confirmed a G200MMS working OK on all four heads using the 'test harness' application from Be's R4 graphics driver kit. A big thanks to Cale Lewis for donating this card!
</ul> </ul>
<p><h1>mga_driver 0.20 (Rudolf)</h1></p> <p><h1>mga_driver 0.20 (Rudolf)</h1></p>
<ul> <ul>
src/add-ons/kernel/drivers/graphics/matrox/driver.c
+40 -5
View File
@@ -4,7 +4,7 @@
Other authors: Other authors:
Mark Watson; Mark Watson;
Rudolf Cornelissen 3/2002-11/2003. Rudolf Cornelissen 3/2002-11/2005.
*/ */
/* standard kernel driver stuff */ /* standard kernel driver stuff */
@@ -304,7 +304,7 @@ static status_t map_device(device_info *di)
// #define G400_DMA_BUFFER_SIZE 1024*1024 // #define G400_DMA_BUFFER_SIZE 1024*1024
/*variables for making copy of ROM*/ /*variables for making copy of ROM*/
char * rom_temp; uint8 *rom_temp;
area_id rom_area; area_id rom_area;
/* MIL1 has frame_buffer in [1], control_regs in [0], and nothing in [2], while /* MIL1 has frame_buffer in [1], control_regs in [0], and nothing in [2], while
@@ -382,9 +382,44 @@ static status_t map_device(device_info *di)
return rom_area; return rom_area;
} }
/* make a copy of ROM for future reference*/ /* if we have a MMS card which only has a BIOS on the primary card, copy the
memcpy (si->rom_mirror, rom_temp, 32768); * primary card's BIOS for our reference too if we aren't primary ourselves.
if (current_settings.dumprom) dumprom (rom_temp, 32768); * (confirmed OK on 'quad' G200MMS.) */
if ((di->pcii.class_base == PCI_display) &&
(di->pcii.class_sub == PCI_display_other) &&
((rom_temp[0] != 0x55) || (rom_temp[1] != 0xaa)) && di->pcii.device)
{
/* locate the main VGA adaptor on our bus, should sit on device #0
* (MMS cards have a own bridge: so there are only graphics cards on it's bus). */
uint8 index = 0;
bool found = false;
for (index = 0; index < pd->count; index++)
{
if ((pd->di[index].pcii.bus == di->pcii.bus) &&
(pd->di[index].pcii.device == 0x00))
{
found = true;
break;
}
}
if (found)
{
/* make the copy from the primary VGA card */
memcpy (si->rom_mirror, pd->di[index].si->rom_mirror, 32768);
}
else
{
/* make a copy of 'non-ok' ROM area for future reference just in case */
memcpy (si->rom_mirror, rom_temp, 32768);
}
}
else
{
/* make a copy of ROM for future reference */
memcpy (si->rom_mirror, rom_temp, 32768);
}
if (current_settings.dumprom) dumprom (si->rom_mirror, 32768);
/*disable ROM and delete the area*/ /*disable ROM and delete the area*/
set_pci(PCI_rom_base,4,0); set_pci(PCI_rom_base,4,0);