xserver: Branch 'master' - 9 commits
Keith Packard
keithp at kemper.freedesktop.org
Fri Feb 18 12:05:38 PST 2011
fb/Makefile.am | 4 --
hw/xfree86/common/xf86VidMode.c | 2 -
hw/xfree86/fbdevhw/fbdevhw.c | 56 +---------------------------------------
hw/xfree86/int10/helper_exec.c | 2 -
hw/xfree86/modes/xf86Crtc.c | 1
miext/damage/Makefile.am | 2 -
miext/rootless/Makefile.am | 1
miext/shadow/Makefile.am | 2 -
8 files changed, 5 insertions(+), 65 deletions(-)
New commits:
commit 0bc9b15a622377c57e617411ccd26c4b5bf8cba4
Merge: d1123b6... 93cd4b1...
Author: Keith Packard <keithp at keithp.com>
Date: Fri Feb 18 12:04:41 2011 -0800
Merge remote branch 'ajax/for-keithp'
commit 93cd4b1034e3c8bed32c5acd391eadd7605e10f0
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Jan 20 00:27:00 2011 -0500
shadow: Remove hw/xfree86/ from includes
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Julien Cristau <jcristau at debian.org>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/miext/shadow/Makefile.am b/miext/shadow/Makefile.am
index a73d0ec..30f7bda 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
commit 0c230728f3af2c4250e93a070c0851a597069447
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Jan 20 00:25:57 2011 -0500
rootless: Remove hw/xfree86/ from includes
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Julien Cristau <jcristau at debian.org>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/miext/rootless/Makefile.am b/miext/rootless/Makefile.am
index f09300d..c97bebe 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 = \
commit 505defd270e49cfbcbe6a04d1de817d305edb3c2
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Jan 20 00:24:20 2011 -0500
damage: Remove hw/xfree86/ from includes
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Julien Cristau <jcristau at debian.org>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/miext/damage/Makefile.am b/miext/damage/Makefile.am
index 5958357..767a65a 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
commit 59d8e3cbdba032c7354c28c86cbd155e9da6447a
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Jan 20 00:23:07 2011 -0500
fb: Remove hw/xfree86/ from includes
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Julien Cristau <jcristau at debian.org>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/fb/Makefile.am b/fb/Makefile.am
index f9f34c4..89f3bab 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
commit 994b7b3dc97f9afa713fe636af45a78002a4366f
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Jan 20 00:17:52 2011 -0500
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 <anonymous>'
xf86Crtc.c:1562:33: warning: comparison between 'enum det_monrec_source' and 'enum <anonymous>'
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Julien Cristau <jcristau at debian.org>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 47d3ad1..b5e9dc2 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;
commit ae16c5796fdb22fb6b2f680fe5123bfd2c89a825
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Jan 20 00:14:11 2011 -0500
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 <mattst88 at gmail.com>
Reviewed-by: Julien Cristau <jcristau at debian.org>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index a5b59e7..17fba36 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;
}
commit f1b7c9cead94b520e6b96774d605d63d3f341b50
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Jan 20 00:09:19 2011 -0500
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 <mattst88 at gmail.com>
Reviewed-by: Julien Cristau <jcristau at debian.org>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
index b9af473..ec84200 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;
commit be186586e504197623c69637b8122fb814f59429
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Jan 20 00:06:48 2011 -0500
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 <mattst88 at gmail.com>
Reviewed-by: Julien Cristau <jcristau at debian.org>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c
index 1788fa1..4dd454d 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:
More information about the xorg-commit
mailing list