[1/2] xfree86: pci: remove superfluous vendor and card name logging

Submitted by Tiago Vignatti on June 9, 2010, 8:22 p.m.

Details

Message ID 1276089725-24744-1-git-send-email-tiago.vignatti@nokia.com
State Accepted, archived
Commit 90fd9e40b59e69333d250a795998f44dc3a5dc0c
Headers show

Commit Message

Tiago Vignatti June 9, 2010, 8:22 p.m.
X server suffers in startup time when relying on the pciaccess's linear search
to fetch vendor and video device name from PCI ID file (when existent). Such
names are only used to write the log, which may be superfluous. Users can get
the same information about external tools like lspci or scanpci.

This patch remove the references of those functions from X start up.

Reported-by: Richard Barnette <jrbarnette@chromium.org>
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
---
What about this one guys? Richard, can you please test and see if works for
you?

 hw/xfree86/common/xf86pciBus.c |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

Patch hide | download patch | download mbox

diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index 184f221..8d13266 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -151,18 +151,13 @@  xf86PciProbe(void)
     
     /* Print a summary of the video devices found */
     for (k = 0; k < num; k++) {
-	const char *vendorname = NULL, *chipname = NULL;
 	const char *prim = " ";
 	Bool memdone = FALSE, iodone = FALSE;
 
 
 	info = xf86PciVideoInfo[k];
 
-	vendorname = pci_device_get_vendor_name( info );
-	chipname = pci_device_get_device_name( info );
-
-	if ((!vendorname || !chipname) &&
-	    !PCIALWAYSPRINTCLASSES(info->device_class))
+	if (!PCIALWAYSPRINTCLASSES(info->device_class))
 	    continue;
 
 	if (xf86IsPrimaryPci(info))
@@ -173,12 +168,6 @@  xf86PciProbe(void)
 		info->vendor_id, info->device_id,
 		info->subvendor_id, info->subdevice_id);
 
-	if (vendorname)
-	    xf86ErrorF("%s ", vendorname);
-
-	if (chipname)
-	    xf86ErrorF("%s ", chipname);
-
 	xf86ErrorF("rev %d", info->revision);
 
 	for (i = 0; i < 6; i++) {

Comments

Richard Barnette June 10, 2010, 12:12 a.m.
On Jun 9, 2010, at 6:22 AM, Tiago Vignatti wrote:

> X server suffers in startup time when relying on the pciaccess's  
> linear search
> to fetch vendor and video device name from PCI ID file (when  
> existent). Such
> names are only used to write the log, which may be superfluous.  
> Users can get
> the same information about external tools like lspci or scanpci.
>
> This patch remove the references of those functions from X start up.
>
> Reported-by: Richard Barnette <jrbarnette@chromium.org>
> Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
> ---
> What about this one guys? Richard, can you please test and see if  
> works for
> you?
>
I've applied this patch [1/2], and the follow-on [2/2] to Chromium OS  
and
tested them both together.  I'm pleased to report that they're  
everything
I could hope for!

Thanks!


> hw/xfree86/common/xf86pciBus.c |   13 +------------
> 1 files changed, 1 insertions(+), 12 deletions(-)
>
> diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/ 
> xf86pciBus.c
> index 184f221..8d13266 100644
> --- a/hw/xfree86/common/xf86pciBus.c
> +++ b/hw/xfree86/common/xf86pciBus.c
> @@ -151,18 +151,13 @@ xf86PciProbe(void)
>
>     /* Print a summary of the video devices found */
>     for (k = 0; k < num; k++) {
> -	const char *vendorname = NULL, *chipname = NULL;
> 	const char *prim = " ";
> 	Bool memdone = FALSE, iodone = FALSE;
>
>
> 	info = xf86PciVideoInfo[k];
>
> -	vendorname = pci_device_get_vendor_name( info );
> -	chipname = pci_device_get_device_name( info );
> -
> -	if ((!vendorname || !chipname) &&
> -	    !PCIALWAYSPRINTCLASSES(info->device_class))
> +	if (!PCIALWAYSPRINTCLASSES(info->device_class))
> 	    continue;
>
> 	if (xf86IsPrimaryPci(info))
> @@ -173,12 +168,6 @@ xf86PciProbe(void)
> 		info->vendor_id, info->device_id,
> 		info->subvendor_id, info->subdevice_id);
>
> -	if (vendorname)
> -	    xf86ErrorF("%s ", vendorname);
> -
> -	if (chipname)
> -	    xf86ErrorF("%s ", chipname);
> -
> 	xf86ErrorF("rev %d", info->revision);
>
> 	for (i = 0; i < 6; i++) {
> -- 
> 1.7.1.226.g770c5
>
> _______________________________________________
> xorg-devel@lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel

-- jrb
James Cloos June 10, 2010, 4:10 p.m.
>>>>> "TV" == Tiago Vignatti <tiago.vignatti@nokia.com> writes:

TV> X server suffers in startup time when relying on the pciaccess's linear search
TV> to fetch vendor and video device name from PCI ID file (when existent). Such
TV> names are only used to write the log, which may be superfluous. Users can get
TV> the same information about external tools like lspci or scanpci.

TV> This patch remove the references of those functions from X start up.

TV> Reported-by: Richard Barnette <jrbarnette@chromium.org>
TV> Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>

I'd mention in the commit log that the info often is also provided by
the drivers.

With that, 

Reviewed-by: James Cloos <cloos@jhcloos.com>

-JimC