rpms/xorg-x11-drv-i810/F-9 intel-update.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.94, 1.95 intel-2.1.1-efi.patch, 1.1, NONE intel-2.1.1-pciaccess-version.patch, 1.1, NONE intel-backlight.patch, 1.1, NONE intel-quirk-dvo.patch, 1.1, NONE
Dave Airlie (airlied)
fedora-extras-commits at redhat.com
Tue Apr 22 21:10:51 UTC 2008
Author: airlied
Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7208
Modified Files:
xorg-x11-drv-i810.spec
Added Files:
intel-update.patch
Removed Files:
intel-2.1.1-efi.patch intel-2.1.1-pciaccess-version.patch
intel-backlight.patch intel-quirk-dvo.patch
Log Message:
* Mon Apr 21 2008 Dave Airlie <airlied at redhat.com> 2.2.1-21
- include some updates to 2.3 rc, remove lots of patches
- fixes EXA to work without DRI properly
intel-update.patch:
--- NEW FILE intel-update.patch ---
diff --git a/configure.ac b/configure.ac
index 5278f0b..170d59b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-intel],
- 2.2.1,
+ 2.2.99.903,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-intel)
@@ -66,6 +66,10 @@ AC_ARG_WITH(xserver-source,AC_HELP_STRING([--with-xserver-source=XSERVER_SOURCE]
[ XSERVER_SOURCE="$withval" ],
[ XSERVER_SOURCE="" ])
+AC_ARG_ENABLE(xvmc, AC_HELP_STRING([--disable-xvmc],
+ [Disable XvMC support [[default=auto]]]),
+ [XVMC="$enableval"],
+ [XVMC=auto])
# Checks for extensions
XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
@@ -83,7 +87,8 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for header files.
AC_HEADER_STDC
-if test "$DRI" != no; then
+AC_MSG_CHECKING([whether to include DRI support])
+if test x$DRI = xauto; then
AC_CHECK_FILE([${sdkdir}/dri.h],
[have_dri_h="yes"], [have_dri_h="no"])
AC_CHECK_FILE([${sdkdir}/sarea.h],
@@ -92,10 +97,7 @@ if test "$DRI" != no; then
[have_dristruct_h="yes"], [have_dristruct_h="no"])
AC_CHECK_FILE([${sdkdir}/damage.h],
[have_damage_h="yes"], [have_damage_h="no"])
-fi
-AC_MSG_CHECKING([whether to include DRI support])
-if test x$DRI = xauto; then
if test "$have_dri_h" = yes -a \
"$have_sarea_h" = yes -a \
"$have_dristruct_h" = yes; then
@@ -115,9 +117,9 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
CFLAGS="$save_CFLAGS"
if test x$XSERVER_LIBPCIACCESS = xyes; then
- PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10.0])
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10])
else
- PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10.0],
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10],
have_libpciaccess=yes,
have_libpciaccess=no)
fi
@@ -140,16 +142,16 @@ if test -d "$XSERVER_SOURCE"; then
XSERVER_SOURCE="`cd $XSERVER_SOURCE && pwd`"
;;
esac
- if test -f src/modes/xf86Modes.h; then
+ if test -f $srcdir/src/modes/xf86Modes.h; then
:
else
- ln -sf $XSERVER_SOURCE/hw/xfree86/modes src/modes
+ ln -sf $XSERVER_SOURCE/hw/xfree86/modes $srcdir/src/modes
fi
- if test -f src/parser/xf86Parser.h; then
+ if test -f $srcdir/src/parser/xf86Parser.h; then
:
else
- ln -sf $XSERVER_SOURCE/hw/xfree86/parser src/parser
+ ln -sf $XSERVER_SOURCE/hw/xfree86/parser $srcdir/src/parser
fi
fi
@@ -158,7 +160,7 @@ if test "x$XMODES" = xyes; then
AC_DEFINE(XMODES, 1,[X server has built-in mode code])
XMODES_CFLAGS=
else
- if test -f src/modes/xf86Modes.h -a -f src/parser/xf86Parser.h; then
+ if test -f $srcdir/src/modes/xf86Modes.h -a -f $srcdir/src/parser/xf86Parser.h; then
AC_MSG_NOTICE([X server is missing new mode code, using local copy])
else
AC_MSG_ERROR([Must have X server >= 1.3 source tree for mode setting code. Please specify --with-xserver-source])
@@ -208,6 +210,20 @@ if test "$VIDEO_DEBUG" = yes; then
AC_DEFINE(VIDEO_DEBUG,1,[Enable debug support])
fi
+AC_MSG_CHECKING([whether to include XvMC support])
+if test "$XVMC" = auto; then
+ XVMC="$DRI"
+fi
+if test "$XVMC" = yes && test "$DRI" = no; then
+ AC_MSG_ERROR([XvMC can't be enabled without DRI])
+fi
+AC_MSG_RESULT([$XVMC])
+AM_CONDITIONAL(XVMC, test x$XVMC = xyes)
+if test "$XVMC" = yes; then
+ AC_DEFINE(ENABLE_XVMC,1,[Enable XvMC support])
+fi
+
+
AC_SUBST([DRI_CFLAGS])
AC_SUBST([XORG_CFLAGS])
AC_SUBST([WARN_CFLAGS])
diff --git a/man/Makefile.am b/man/Makefile.am
index b5510e8..7432d5a 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff --git a/man/intel.man b/man/intel.man
index e5736e5..8a8b7a0 100644
--- a/man/intel.man
+++ b/man/intel.man
@@ -182,6 +182,28 @@ where the BIOS accesses pipe registers during display hotswitch or lid close,
causing a crash. If you find that your platform needs this option, please file
a bug against xf86-video-intel at http://bugs.freedesktop.org which includes
the output of 'lspci -v' and 'lspci -vn'.
+.TP
+.BI "Option \*qLVDS24Bit\*q \*q" boolean \*q
+Specify 24 bit pixel format (i.e. 8 bits per color) to be used for the
+LVDS output. Some newer LCD panels expect pixels to be formatted and
+sent as 8 bits per color channel instead of the more common 6 bits per
+color channel. Set this option to true to enable the newer format.
+Note that this concept is entirely different and independent from the
+frame buffer color depth - which is still controlled in the usual way
+within the X server. This option instead selects the physical format
+/ sequencing of the digital bits sent to the display. Setting the
+frame buffer color depth is really a matter of preference by the user,
+while setting the pixel format here is a requirement of the connected
+hardware. Leaving this unset implies the default value of false,
+which is almost always going to be right choice. If your
+LVDS-connected display on the other hand is extremely washed out
+(e.g. white on a lighter white), trying this option might clear the
+problem.
+.TP
+.BI "Option \*qXvMC\*q \*q" boolean \*q
+Enable XvMC driver. Current support MPEG2 MC on 915/945 and G33 series.
+User should provide absolute path to libIntelXvMC.so in XvMCConfig file.
+Default: Disabled.
.SH OUTPUT CONFIGURATION
On 830M and better chipsets, the driver supports runtime configuration of
@@ -209,22 +231,40 @@ By adjusting the BACKLIGHT property, the brightness on the LVDS output can be ad
.TP 2
The driver will attempt to automatically detect the backlight control method for your platform. If this fails however, you can select another method which may allow you to control your backlight. Available methods include:
.PP
-.B NATIVE
+.B native
.TP 4
Intel chipsets include backlight control registers, which on some platforms may be wired to control the backlight directly. This method uses those registers.
.PP
-.B LEGACY
+.B legacy
.TP 4
The legacy backlight control registers exist in PCI configuration space, and have fewer available backlight levels than the native registers. However, some platforms are wired this way and so need to use this method.
.PP
-.B COMBO
+.B combo
.TP 4
This method attempts to use the native registers where possible, resorting to the legacy, configuration space registers only to enable the backlight if needed. On platforms that have both wired this can be a good choice as it allows the fine grained backlight control of the native interface.
.PP
-.B KERNEL
+.B kernel
.TP 4
On some system, the kernel may provide a backlight control driver. In that case, using the kernel interfaces is preferable, as the same driver may respond to hotkey events or external APIs.
+.PP
+.B PANEL_FITTING
+- control LCD panel fitting
+.TP 2
+By default, the driver will attempt to upscale resolutions smaller than the LCD's native size while preserving the aspect ratio. Other modes are available however:
+.PP
+.B center
+.TP 4
+Simply center the image on-screen, without scaling.
+.PP
+.B full_aspect
+.TP 4
+The default mode. Try to upscale the image to the screen size, while preserving aspect ratio. May result in letterboxing or pillar-boxing with some resolutions.
+.PP
+.B full
+.TP 4
+Upscale the image to the native screen size without regard to aspect ratio. In this mode, the full screen image may appear distorted in some resolutions.
+
.SS "TV"
Integrated TV output. Available properties include:
diff --git a/src/Makefile.am b/src/Makefile.am
index 118d4b1..6049a9c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
[...22243 lines suppressed...]
+ CARD32 length B32;
+ CARD32 ddxDriverMajorVersion B32;
+ CARD32 ddxDriverMinorVersion B32;
+ CARD32 ddxDriverPatchVersion B32;
+ CARD32 clientDriverNameLength B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
+} xXF86DRIGetClientDriverNameReply;
+
+#define sz_xXF86DRIGetClientDriverNameReply 32
+
+typedef struct _XF86DRICreateContext
+{
+ CARD8 reqType; /* always DRIReqCode */
+ CARD8 driReqType; /* always X_DRICreateContext */
+ CARD16 length B16;
+ CARD32 screen B32;
+ CARD32 visual B32;
+ CARD32 context B32;
+} xXF86DRICreateContextReq;
+
+#define sz_xXF86DRICreateContextReq 16
+
+typedef struct
+{
+ BYTE type; /* X_Reply */
+ BOOL pad1;
+ CARD16 sequenceNumber B16;
+ CARD32 length B32;
+ CARD32 hHWContext B32;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
+} xXF86DRICreateContextReply;
+
+#define sz_xXF86DRICreateContextReply 32
+
+typedef struct _XF86DRIDestroyContext
+{
+ CARD8 reqType; /* always DRIReqCode */
+ CARD8 driReqType; /* always X_DRIDestroyContext */
+ CARD16 length B16;
+ CARD32 screen B32;
+ CARD32 context B32;
+} xXF86DRIDestroyContextReq;
+
+#define sz_xXF86DRIDestroyContextReq 12
+
+typedef struct _XF86DRICreateDrawable
+{
+ CARD8 reqType; /* always DRIReqCode */
+ CARD8 driReqType; /* always X_DRICreateDrawable */
+ CARD16 length B16;
+ CARD32 screen B32;
+ CARD32 drawable B32;
+} xXF86DRICreateDrawableReq;
+
+#define sz_xXF86DRICreateDrawableReq 12
+
+typedef struct
+{
+ BYTE type; /* X_Reply */
+ BOOL pad1;
+ CARD16 sequenceNumber B16;
+ CARD32 length B32;
+ CARD32 hHWDrawable B32;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
+} xXF86DRICreateDrawableReply;
+
+#define sz_xXF86DRICreateDrawableReply 32
+
+typedef struct _XF86DRIDestroyDrawable
+{
+ CARD8 reqType; /* always DRIReqCode */
+ CARD8 driReqType; /* always X_DRIDestroyDrawable */
+ CARD16 length B16;
+ CARD32 screen B32;
+ CARD32 drawable B32;
+} xXF86DRIDestroyDrawableReq;
+
+#define sz_xXF86DRIDestroyDrawableReq 12
+
+typedef struct _XF86DRIGetDrawableInfo
+{
+ CARD8 reqType; /* always DRIReqCode */
+ CARD8 driReqType; /* always X_DRIGetDrawableInfo */
+ CARD16 length B16;
+ CARD32 screen B32;
+ CARD32 drawable B32;
+} xXF86DRIGetDrawableInfoReq;
+
+#define sz_xXF86DRIGetDrawableInfoReq 12
+
+typedef struct
+{
+ BYTE type; /* X_Reply */
+ BOOL pad1;
+ CARD16 sequenceNumber B16;
+ CARD32 length B32;
+ CARD32 drawableTableIndex B32;
+ CARD32 drawableTableStamp B32;
+ INT16 drawableX B16;
+ INT16 drawableY B16;
+ INT16 drawableWidth B16;
+ INT16 drawableHeight B16;
+ CARD32 numClipRects B32;
+ INT16 backX B16;
+ INT16 backY B16;
+ CARD32 numBackClipRects B32;
+} xXF86DRIGetDrawableInfoReply;
+
+#define sz_xXF86DRIGetDrawableInfoReply 36
+
+typedef struct _XF86DRIGetDeviceInfo
+{
+ CARD8 reqType; /* always DRIReqCode */
+ CARD8 driReqType; /* always X_DRIGetDeviceInfo */
+ CARD16 length B16;
+ CARD32 screen B32;
+} xXF86DRIGetDeviceInfoReq;
+
+#define sz_xXF86DRIGetDeviceInfoReq 8
+
+typedef struct
+{
+ BYTE type; /* X_Reply */
+ BOOL pad1;
+ CARD16 sequenceNumber B16;
+ CARD32 length B32;
+ CARD32 hFrameBufferLow B32;
+ CARD32 hFrameBufferHigh B32;
+ CARD32 framebufferOrigin B32;
+ CARD32 framebufferSize B32;
+ CARD32 framebufferStride B32;
+ CARD32 devPrivateSize B32;
+} xXF86DRIGetDeviceInfoReply;
+
+#define sz_xXF86DRIGetDeviceInfoReply 32
+
+typedef struct _XF86DRIOpenFullScreen
+{
+ CARD8 reqType; /* always DRIReqCode */
+ CARD8 driReqType; /* always X_DRIOpenFullScreen */
+ CARD16 length B16;
+ CARD32 screen B32;
+ CARD32 drawable B32;
+} xXF86DRIOpenFullScreenReq;
+
+#define sz_xXF86DRIOpenFullScreenReq 12
+
+typedef struct
+{
+ BYTE type;
+ BOOL pad1;
+ CARD16 sequenceNumber B16;
+ CARD32 length B32;
+ CARD32 isFullScreen B32;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
+} xXF86DRIOpenFullScreenReply;
+
+#define sz_xXF86DRIOpenFullScreenReply 32
+
+typedef struct _XF86DRICloseFullScreen
+{
+ CARD8 reqType; /* always DRIReqCode */
+ CARD8 driReqType; /* always X_DRICloseFullScreen */
+ CARD16 length B16;
+ CARD32 screen B32;
+ CARD32 drawable B32;
+} xXF86DRICloseFullScreenReq;
+
+#define sz_xXF86DRICloseFullScreenReq 12
+
+typedef struct
+{
+ BYTE type;
+ BOOL pad1;
+ CARD16 sequenceNumber B16;
+ CARD32 length B32;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
+ CARD32 pad7 B32;
+} xXF86DRICloseFullScreenReply;
+
+#define sz_xXF86DRICloseFullScreenReply 32
+
+#endif /* _XF86DRISTR_H_ */
Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/F-9/xorg-x11-drv-i810.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- xorg-x11-drv-i810.spec 8 Apr 2008 18:47:04 -0000 1.94
+++ xorg-x11-drv-i810.spec 22 Apr 2008 21:10:15 -0000 1.95
@@ -6,7 +6,7 @@
Summary: Xorg X11 Intel video driver(s)
Name: xorg-x11-drv-i810
Version: 2.2.1
-Release: 20%{?dist}
+Release: 21%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -20,18 +20,14 @@
Source2: i810.xinf
Source3: intel-stub.c
+Patch1: intel-update.patch
Patch2: intel-2.1.1-fix-vt-switch.patch
Patch3: intel-2.1.1-fix-xv-reset.patch
Patch4: intel-2.1.1-fix-xv-compiz.patch
-Patch5: intel-2.1.1-efi.patch
-Patch6: intel-2.1.1-pciaccess-version.patch
-Patch7: intel-quirk-dvo.patch
Patch8: intel-2.1.1-disable-ttm.patch
# EXA on 965 without DRI is broken - fix for now so installer can run
-Patch9: intel-2.2.0-xaadefault.patch
-
-Patch10: intel-backlight.patch
+#Patch9: intel-2.2.0-xaadefault.patch
# Framebuffer compression causes artifacts, display blanking
# https://bugs.freedesktop.org/show_bug.cgi?id=13326
@@ -72,15 +68,11 @@
cd xf86-video-intel-%{version}
# XXX rebase me plz
+%patch1 -p1 -b .2.3
#patch2 -p1 -b .vtswitch
%patch3 -p1 -b .xvfix
#patch4 -p1 -b .xv-compiz
-%patch5 -p1 -b .efi
-%patch6 -p1 -b .pciaccessvers
-%patch7 -p1 -b .quirk
%patch8 -p1 -b .disablettm
-%patch9 -p1 -b .xaadefault
-%patch10 -p1 -b .backlight
%patch11 -p1 -b .fbc
%patch100 -p1 -b .intel-master
@@ -144,13 +136,20 @@
%{_datadir}/hwdata/videoaliases/i810.xinf
%{_libdir}/libI810XvMC.so.1
%{_libdir}/libI810XvMC.so.1.0.0
+%{_libdir}/libIntelXvMC.so.1
+%{_libdir}/libIntelXvMC.so.1.0.0
%{_mandir}/man4/i*
%files devel
%defattr(-,root,root,-)
%{_libdir}/libI810XvMC.so
+%{_libdir}/libIntelXvMC.so
%changelog
+* Mon Apr 21 2008 Dave Airlie <airlied at redhat.com> 2.2.1-21
+- include some updates to 2.3 rc, remove lots of patches
+- fixes EXA to work without DRI properly
+
* Tue Apr 8 2008 Bill Nottingham <notting at redhat.com> - 2.2.1-20
- disable framebuffer compression by default (fdo #13326)
--- intel-2.1.1-efi.patch DELETED ---
--- intel-2.1.1-pciaccess-version.patch DELETED ---
--- intel-backlight.patch DELETED ---
--- intel-quirk-dvo.patch DELETED ---
More information about the fedora-extras-commits
mailing list