r23185 - in trunk/vidix: cyberblade_vid.c mach64_vid.c mga_vid.c pm3_vid.c radeon_vid.c
Author: ben Date: Tue May 1 00:14:29 2007 New Revision: 23185 Log: synced with upstream vidix, prevented some drivers to work on some configs/archs Modified: trunk/vidix/cyberblade_vid.c trunk/vidix/mach64_vid.c trunk/vidix/mga_vid.c trunk/vidix/pm3_vid.c trunk/vidix/radeon_vid.c Modified: trunk/vidix/cyberblade_vid.c ============================================================================== --- trunk/vidix/cyberblade_vid.c (original) +++ trunk/vidix/cyberblade_vid.c Tue May 1 00:14:29 2007 @@ -143,11 +143,13 @@ static int cyberblade_probe(int verbose, dname = pci_device_name(VENDOR_TRIDENT, lst[i].device); dname = dname ? dname : "Unknown chip"; printf("[cyberblade] Found chip: %s\n", dname); - if ((lst[i].command & PCI_COMMAND_IO) == 0) +#if 0 + if ((lst[i].command & PCI_COMMAND_IO) == 0) { printf("[cyberblade] Device is disabled, ignoring\n"); continue; } +#endif cyberblade_cap.device_id = lst[i].device; err = 0; memcpy(&pci_info, &lst[i], sizeof(pciinfo_t)); Modified: trunk/vidix/mach64_vid.c ============================================================================== --- trunk/vidix/mach64_vid.c (original) +++ trunk/vidix/mach64_vid.c Tue May 1 00:14:29 2007 @@ -434,11 +434,13 @@ static int mach64_probe(int verbose,int dname = pci_device_name(VENDOR_ATI,lst[i].device); dname = dname ? dname : "Unknown chip"; printf("[mach64] Found chip: %s\n",dname); +#if 0 if ((lst[i].command & PCI_COMMAND_IO) == 0) { printf("[mach64] Device is disabled, ignoring\n"); continue; } +#endif if(force > PROBE_NORMAL) { printf("[mach64] Driver was forced. Was found %sknown chip\n",idx == -1 ? "un" : ""); Modified: trunk/vidix/mga_vid.c ============================================================================== --- trunk/vidix/mga_vid.c (original) +++ trunk/vidix/mga_vid.c Tue May 1 00:14:29 2007 @@ -1110,11 +1110,13 @@ static int mga_probe(int verbose,int for i, lst[i].vendor, lst[i].device); if (lst[i].vendor == VENDOR_MATROX) { +#if 0 if ((lst[i].command & PCI_COMMAND_IO) == 0) { printf("[mga] Device is disabled, ignoring\n"); continue; } +#endif switch(lst[i].device) { case DEVICE_MATROX_MGA_G550_AGP: Modified: trunk/vidix/pm3_vid.c ============================================================================== --- trunk/vidix/pm3_vid.c (original) +++ trunk/vidix/pm3_vid.c Tue May 1 00:14:29 2007 @@ -108,11 +108,13 @@ static int pm3_probe(int verbose, int fo dname = pci_device_name(VENDOR_3DLABS, lst[i].device); dname = dname ? dname : "Unknown chip"; printf("[pm3] Found chip: %s\n", dname); +#if 0 if ((lst[i].command & PCI_COMMAND_IO) == 0) { printf("[pm3] Device is disabled, ignoring\n"); continue; } +#endif pm3_cap.device_id = lst[i].device; err = 0; memcpy(&pci_info, &lst[i], sizeof(pciinfo_t)); Modified: trunk/vidix/radeon_vid.c ============================================================================== --- trunk/vidix/radeon_vid.c (original) +++ trunk/vidix/radeon_vid.c Tue May 1 00:14:29 2007 @@ -1293,11 +1293,13 @@ static int radeon_probe(int verbose, int dname = pci_device_name(VENDOR_ATI,lst[i].device); dname = dname ? dname : "Unknown chip"; printf(RADEON_MSG" Found chip: %s\n",dname); +#if 0 if ((lst[i].command & PCI_COMMAND_IO) == 0) { printf("[radeon] Device is disabled, ignoring\n"); continue; } +#endif memset(&besr,0,sizeof(bes_registers_t)); if(force > PROBE_NORMAL) {
On Tue, May 01, 2007 at 12:14:29AM +0200, ben wrote:
Log: synced with upstream vidix, prevented some drivers to work on some configs/archs
May I suggest using present tense in commit log messages? This one is highly confusing. Diego
Hello, On Tue, May 01, 2007 at 02:27:54PM +0200, Diego Biurrun wrote:
On Tue, May 01, 2007 at 12:14:29AM +0200, ben wrote:
Log: synced with upstream vidix, prevented some drivers to work on some configs/archs
May I suggest using present tense in commit log messages? This one is highly confusing.
How would "syncs with upstream vidix, prevents some drivers to work on some configs/archs" be any better? I think the missing subjects to "prevented" is actually what makes it confusing (or more precisely, impossible to understand), even more so as one might assume it to refer to the "synced" part (since that's the only other thing there), which gives the completely wrong meaning of "synced with upstream to prevent some drivers to work"... Greetings, Reimar Döffinger
On Tue, May 01, 2007 at 02:51:21PM +0200, Reimar Döffinger wrote:
On Tue, May 01, 2007 at 02:27:54PM +0200, Diego Biurrun wrote:
On Tue, May 01, 2007 at 12:14:29AM +0200, ben wrote:
Log: synced with upstream vidix, prevented some drivers to work on some configs/archs
May I suggest using present tense in commit log messages? This one is highly confusing.
How would "syncs with upstream vidix, prevents some drivers to work on some configs/archs" be any better?
A confusing complaint about a confusing log message.. Ironic, isn't it?
I think the missing subjects to "prevented" is actually what makes it confusing (or more precisely, impossible to understand), even more so as one might assume it to refer to the "synced" part (since that's the only other thing there), which gives the completely wrong meaning of "synced with upstream to prevent some drivers to work"...
Agreed. The log message needs to be changed in any case. Diego
Reimar Döffinger wrote:
Hello, On Tue, May 01, 2007 at 02:27:54PM +0200, Diego Biurrun wrote:
On Tue, May 01, 2007 at 12:14:29AM +0200, ben wrote:
Log: synced with upstream vidix, prevented some drivers to work on some configs/archs
May I suggest using present tense in commit log messages? This one is highly confusing.
How would "syncs with upstream vidix, prevents some drivers to work on some configs/archs" be any better?
I thought the suggestion was for "sync" and "prevent" - although that still leaves it unclear as to whether this change prevents the drivers from working, or the lack of this change prevented them from working. "sync" and e.g. "makes" (and dropping the "to") would probably be better. -- The Wanderer Warning: Simply because I argue an issue does not mean I agree with any side of it. Secrecy is the beginning of tyranny.
participants (4)
-
ben -
Diego Biurrun -
Reimar Döffinger -
The Wanderer