configure.ac | 14 +++++++++++++- src/vesa.c | 12 ++++++++++++ src/vesa.h | 7 +++++-- 3 files changed, 30 insertions(+), 3 deletions(-)
New commits: commit fdf653a99f53306efcd48658caf657af48ea916d Author: Dave Airlie <[email protected]> Date: Thu Jul 30 12:04:30 2009 +1000 vesa: bump for release 2.2.1 diff --git a/configure.ac b/configure.ac index d63939a..1444d07 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-vesa], - 2.2.0, + 2.2.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-vesa) commit 869a9c8058c16734af5c8771a0c32df0be7bba36 Author: Dave Airlie <[email protected]> Date: Tue Jul 28 15:22:42 2009 +1000 vesa: change to using ABI version check diff --git a/src/vesa.h b/src/vesa.h index 11933f4..d5c69a9 100644 --- a/src/vesa.h +++ b/src/vesa.h @@ -36,7 +36,7 @@ #include "xf86.h" #include "xf86_OSproc.h" -#ifndef XSERVER_LIBPCIACCESS +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" #include "xf86RAC.h" #endif commit aad538f06852e5bf011597a574785d525ed1b0c4 Author: Dave Airlie <[email protected]> Date: Tue Jul 28 13:32:40 2009 +1000 vesa: update for resources/RAC API removal diff --git a/src/vesa.h b/src/vesa.h index 1b8f4e5..11933f4 100644 --- a/src/vesa.h +++ b/src/vesa.h @@ -35,7 +35,11 @@ /* All drivers should typically include these */ #include "xf86.h" #include "xf86_OSproc.h" + +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" +#include "xf86RAC.h" +#endif /* All drivers need this */ @@ -66,8 +70,7 @@ /* Dga definitions */ #include "dgaproc.h" -#include "xf86Resources.h" -#include "xf86RAC.h" + #include "fb.h" commit 49f6a2f902473692f6541ee32e018b64d74e7ece Author: Peter Hutterer <[email protected]> Date: Thu Jul 16 11:58:39 2009 +1000 Update to xextproto 7.1 support. DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers need to include dpmsconst.h if xextproto 7.1 is available. Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 674e985..d63939a 100644 --- a/configure.ac +++ b/configure.ac @@ -54,6 +54,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES) +PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], + HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), + HAVE_XEXTPROTO_71="no") +AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) save_CFLAGS="$CFLAGS" diff --git a/src/vesa.c b/src/vesa.c index 377736b..ff0601c 100644 --- a/src/vesa.c +++ b/src/vesa.c @@ -59,8 +59,13 @@ #include "xf86Modes.h" /* DPMS */ +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + /* Mandatory functions */ static const OptionInfoRec * VESAAvailableOptions(int chipid, int busid); commit 69b3eb4f8a9b93f1b2a73e395d4d7c29c6c18b41 Author: Adam Jackson <[email protected]> Date: Thu Feb 26 14:33:52 2009 -0500 Attempt VBE PanelID if DDC fails diff --git a/configure.ac b/configure.ac index 090be35..674e985 100644 --- a/configure.ac +++ b/configure.ac @@ -66,6 +66,14 @@ CFLAGS="$save_CFLAGS" save_CFLAGS="$CFLAGS" CFLAGS="$XORG_CFLAGS" +AC_CHECK_DECL(VBEReadPanelID, + [AC_DEFINE(HAVE_PANELID, 1, [Have VBE PanelID call])], + [], + [#include "vbe.h"]) +CFLAGS="$save_CFLAGS" + +save_CFLAGS="$CFLAGS" +CFLAGS="$XORG_CFLAGS" AC_CHECK_DECL(XSERVER_LIBPCIACCESS, [XSERVER_LIBPCIACCESS=yes], [XSERVER_LIBPCIACCESS=no], [#include "xorg-server.h"]) diff --git a/src/vesa.c b/src/vesa.c index aee5018..377736b 100644 --- a/src/vesa.c +++ b/src/vesa.c @@ -671,6 +671,13 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags) if ((pScrn->monitor->DDC = pVesa->monitor) != NULL) xf86SetDDCproperties(pScrn, pVesa->monitor); +#ifdef HAVE_PANELID + else { + void *panelid = VBEReadPanelID(pVesa->pVbe); + VBEInterpretPanelID(pScrn->scrnIndex, panelid); + xfree(panelid); + } +#endif xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, DEBUG_VERB, "Searching for matching VESA mode(s):\n"); -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
