From be186586e504197623c69637b8122fb814f59429 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 20 Jan 2011 00:06:48 -0500 Subject: [PATCH 1/8] xf86vidmode: warning fix xf86VidMode.c: In function 'VidModeGetMonitorValue': xf86VidMode.c:637:19: warning: 'ret.i' may be used uninitialized in this function Reviewed-by: Matt Turner Reviewed-by: Julien Cristau Signed-off-by: Adam Jackson --- hw/xfree86/common/xf86VidMode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c index 1788fa192..4dd454d8b 100644 --- a/hw/xfree86/common/xf86VidMode.c +++ b/hw/xfree86/common/xf86VidMode.c @@ -634,7 +634,7 @@ VidModeSetModeValue(pointer mode, int valtyp, int val) vidMonitorValue VidModeGetMonitorValue(pointer monitor, int valtyp, int indx) { - vidMonitorValue ret; + vidMonitorValue ret = { NULL, }; switch (valtyp) { case VIDMODE_MON_VENDOR: From f1b7c9cead94b520e6b96774d605d63d3f341b50 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 20 Jan 2011 00:09:19 -0500 Subject: [PATCH 2/8] int10: warning fix helper_exec.c: In function 'pciCfg1in': helper_exec.c:507:4: warning: passing argument 2 of 'pci_device_cfg_read_u32' from incompatible pointer type /usr/include/pciaccess.h:153:5: note: expected 'uint32_t *' but argument is of type 'CARD32 *' Reviewed-by: Matt Turner Reviewed-by: Julien Cristau Signed-off-by: Adam Jackson --- hw/xfree86/int10/helper_exec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c index b9af473b1..ec8420040 100644 --- a/hw/xfree86/int10/helper_exec.c +++ b/hw/xfree86/int10/helper_exec.c @@ -504,7 +504,7 @@ pciCfg1in(CARD16 addr, CARD32 *val) } if (addr == 0xCFC) { pci_device_cfg_read_u32(pci_device_for_cfg_address(PciCfg1Addr), - val, PCI_OFFSET(PciCfg1Addr)); + (uint32_t *)val, PCI_OFFSET(PciCfg1Addr)); if (PRINT_PORT && DEBUG_IO_TRACE()) ErrorF(" cfg_inl(%#lx) = %8.8lx\n", PciCfg1Addr, *val); return 1; From ae16c5796fdb22fb6b2f680fe5123bfd2c89a825 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 20 Jan 2011 00:14:11 -0500 Subject: [PATCH 3/8] fbdevhw: Remove the non-sysfs hack for mapping from PCI to fbdev It's broken for devices with BARs above 4G, and the sysfs method should work everywhere anyway. As a pleasant side effect, this fixes some warnings: fbdevhw.c: In function 'fbdev_open_pci': fbdevhw.c:333:4: warning: cast from pointer to integer of different size fbdevhw.c:334:4: warning: cast from pointer to integer of different size fbdevhw.c:336:4: warning: cast from pointer to integer of different size fbdevhw.c:337:4: warning: cast from pointer to integer of different size Reviewed-by: Matt Turner Reviewed-by: Julien Cristau Signed-off-by: Adam Jackson --- hw/xfree86/fbdevhw/fbdevhw.c | 56 ++---------------------------------- 1 file changed, 2 insertions(+), 54 deletions(-) diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c index a5b59e762..17fba36d0 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.c +++ b/hw/xfree86/fbdevhw/fbdevhw.c @@ -264,14 +264,7 @@ fbdev_open_pci(struct pci_device * pPci, char **namep) { struct fb_fix_screeninfo fix; char filename[256]; - int fd,i,j; - - - /* There are two ways to that we can determine which fb device is - * associated with this PCI device. The more modern way is to look in - * the sysfs directory for the PCI device for a file named - * "graphics/fb*" - */ + int fd, i; for (i = 0; i < 8; i++) { sprintf(filename, @@ -304,55 +297,10 @@ fbdev_open_pci(struct pci_device * pPci, char **namep) } } - - /* The other way is to examine the resources associated with each fb - * device and see if there is a match with the PCI device. This technique - * has some problems on certain mixed 64-bit / 32-bit architectures. - * There is a flaw in the fb_fix_screeninfo structure in that it only - * returns the low 32-bits of the address of the resources associated with - * a device. However, on a mixed architecture the base addresses of PCI - * devices, even for 32-bit applications, may be higher than 0x0f0000000. - */ - - for (i = 0; i < 8; i++) { - sprintf(filename,"/dev/fb%d",i); - if (-1 == (fd = open(filename,O_RDWR,0))) { - xf86DrvMsg(-1, X_WARNING, - "open %s: %s\n", filename, strerror(errno)); - continue; - } - if (-1 == ioctl(fd,FBIOGET_FSCREENINFO,(void*)&fix)) { - close(fd); - continue; - } - for (j = 0; j < 6; j++) { - const pciaddr_t res_start = pPci->regions[j].base_addr; - const pciaddr_t res_end = res_start + pPci->regions[j].size; - - if ((0 != fix.smem_len && - (pciaddr_t) fix.smem_start >= res_start && - (pciaddr_t) fix.smem_start < res_end) || - (0 != fix.mmio_len && - (pciaddr_t) fix.mmio_start >= res_start && - (pciaddr_t) fix.mmio_start < res_end)) - break; - } - if (j == 6) { - close(fd); - continue; - } - if (namep) { - *namep = xnfalloc(16); - strncpy(*namep,fix.id,16); - } - return fd; - } - if (namep) *namep = NULL; - xf86DrvMsg(-1, X_ERROR, - "Unable to find a valid framebuffer device\n"); + xf86DrvMsg(-1, X_ERROR, "Unable to find a valid framebuffer device\n"); return -1; } From 994b7b3dc97f9afa713fe636af45a78002a4366f Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 20 Jan 2011 00:17:52 -0500 Subject: [PATCH 4/8] xfree86: warning fix Did you know that anonymous enums with function scope will not only override the enum values from global scope, but will be treated as entirely different types? C's type system just rules. xf86Crtc.c: In function 'handle_detailed_monrec': xf86Crtc.c:1555:33: warning: comparison between 'enum det_monrec_source' and 'enum ' xf86Crtc.c:1562:33: warning: comparison between 'enum det_monrec_source' and 'enum ' Reviewed-by: Matt Turner Reviewed-by: Julien Cristau Signed-off-by: Adam Jackson --- hw/xfree86/modes/xf86Crtc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c index 47d3ad14c..b5e9dc26f 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -1542,7 +1542,6 @@ struct det_monrec_parameter { static void handle_detailed_monrec(struct detailed_monitor_section *det_mon, void *data) { - enum { sync_config, sync_edid, sync_default }; struct det_monrec_parameter *p; p = (struct det_monrec_parameter *)data; From 59d8e3cbdba032c7354c28c86cbd155e9da6447a Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 20 Jan 2011 00:23:07 -0500 Subject: [PATCH 5/8] fb: Remove hw/xfree86/ from includes Reviewed-by: Matt Turner Reviewed-by: Julien Cristau Signed-off-by: Adam Jackson --- fb/Makefile.am | 4 ---- 1 file changed, 4 deletions(-) diff --git a/fb/Makefile.am b/fb/Makefile.am index f9f34c44c..89f3babb1 100644 --- a/fb/Makefile.am +++ b/fb/Makefile.am @@ -1,9 +1,5 @@ noinst_LTLIBRARIES = libfb.la libwfb.la -INCLUDES = \ - -I$(top_srcdir)/hw/xfree86/os-support \ - -I$(top_srcdir)/hw/xfree86/os-support/bus \ - -I$(top_srcdir)/hw/xfree86/common AM_CFLAGS = $(DIX_CFLAGS) if XORG From 505defd270e49cfbcbe6a04d1de817d305edb3c2 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 20 Jan 2011 00:24:20 -0500 Subject: [PATCH 6/8] damage: Remove hw/xfree86/ from includes Reviewed-by: Matt Turner Reviewed-by: Julien Cristau Signed-off-by: Adam Jackson --- miext/damage/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/miext/damage/Makefile.am b/miext/damage/Makefile.am index 595835731..767a65aee 100644 --- a/miext/damage/Makefile.am +++ b/miext/damage/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libdamage.la AM_CFLAGS = $(DIX_CFLAGS) -INCLUDES = -I$(srcdir)/../cw -I$(top_srcdir)/hw/xfree86/os-support +INCLUDES = -I$(srcdir)/../cw if XORG sdk_HEADERS = damage.h damagestr.h From 0c230728f3af2c4250e93a070c0851a597069447 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 20 Jan 2011 00:25:57 -0500 Subject: [PATCH 7/8] rootless: Remove hw/xfree86/ from includes Reviewed-by: Matt Turner Reviewed-by: Julien Cristau Signed-off-by: Adam Jackson --- miext/rootless/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/miext/rootless/Makefile.am b/miext/rootless/Makefile.am index f09300d5c..c97bebebe 100644 --- a/miext/rootless/Makefile.am +++ b/miext/rootless/Makefile.am @@ -1,5 +1,4 @@ AM_CFLAGS = $(DIX_CFLAGS) $(XSERVER_CFLAGS) -AM_CPPFLAGS = -I$(top_srcdir)/hw/xfree86/os-support noinst_LTLIBRARIES = librootless.la librootless_la_SOURCES = \ From 93cd4b1034e3c8bed32c5acd391eadd7605e10f0 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 20 Jan 2011 00:27:00 -0500 Subject: [PATCH 8/8] shadow: Remove hw/xfree86/ from includes Reviewed-by: Matt Turner Reviewed-by: Julien Cristau Signed-off-by: Adam Jackson --- miext/shadow/Makefile.am | 2 -- 1 file changed, 2 deletions(-) diff --git a/miext/shadow/Makefile.am b/miext/shadow/Makefile.am index a73d0ec78..30f7bda96 100644 --- a/miext/shadow/Makefile.am +++ b/miext/shadow/Makefile.am @@ -2,8 +2,6 @@ noinst_LTLIBRARIES = libshadow.la AM_CFLAGS = $(DIX_CFLAGS) -INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support - if XORG sdk_HEADERS = shadow.h endif