Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Mon Oct 30 11:54:55 CET 2006. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-10-28 13:57:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-10-30 10:09:35.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Oct 30 10:07:07 CET 2006 - sndirsch@suse.de + +- xf86-video-i810-video-debug.diff: + * Make VIDEO_DEBUG into a configure option +- xf86-video-i810-linearalloc.diff: + * Fix manpage to report 8160 instead of 6144 for LinearAlloc. +- xf86-video-i810-setcursorposition.diff: + * Don't crash if SetCursorPosition is called with + pScrn->currentMode == NULL. This allows the driver to work + with servers that don't have the fix for this that was only + recently pushed to git. +- xf86-video-i810-mergedfb-checks.diff: + * Add some MergedFB checks for accelerator limitations +- xf86-video-i810-965g-xv-hang.diff: + * X.Org Bug 8594: Fix Xv hang with G965 + +------------------------------------------------------------------- New: ---- xf86-video-i810-965g-xv-hang.diff xf86-video-i810-linearalloc.diff xf86-video-i810-mergedfb-checks.diff xf86-video-i810-setcursorposition.diff xf86-video-i810-video-debug.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.Sga0PC/_old 2006-10-30 11:54:27.000000000 +0100 +++ /var/tmp/diff_new_pack.Sga0PC/_new 2006-10-30 11:54:27.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 6 +Release: 7 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -80,7 +80,11 @@ Patch16: xf86-video-nsc.diff Patch17: p_i810-refresh.diff Patch18: radeon-vbios-ppc.diff - +Patch19: xf86-video-i810-video-debug.diff +Patch20: xf86-video-i810-linearalloc.diff +Patch21: xf86-video-i810-setcursorposition.diff +Patch22: xf86-video-i810-mergedfb-checks.diff +Patch23: xf86-video-i810-965g-xv-hang.diff %description This package contains X.Org video drivers. @@ -130,22 +134,30 @@ pushd xf86-video-i810-* ### disabled for now #%patch17 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 popd %build -for dir in xf86-video-via-* xf86-video-nv-* \ +for dir in xf86-video-via-* \ + xf86-video-nv-* \ xf86-video-i810-* \ xf86-video-mga-* \ xf86-video-ati-* \ $(ls | grep -v -e xf86-video-impact \ -e xf86-video-via \ - -e xf86-video-i810 \ -e xf86-video-nv \ + -e xf86-video-i810 \ -e xf86-video-mga \ -e xf86-video-ati); do pushd $dir case $dir in - xf86-video-mga-*|xf86-video-nsc-*) autoreconf -fi ;; + xf86-video-i810-* | \ + xf86-video-mga-* | \ + xf86-video-nsc-*) autoreconf -fi ;; *) ;; esac ./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ @@ -180,6 +192,20 @@ %{_mandir}/man4/* %changelog -n xorg-x11-driver-video +* Mon Oct 30 2006 - sndirsch@suse.de +- xf86-video-i810-video-debug.diff: + * Make VIDEO_DEBUG into a configure option +- xf86-video-i810-linearalloc.diff: + * Fix manpage to report 8160 instead of 6144 for LinearAlloc. +- xf86-video-i810-setcursorposition.diff: + * Don't crash if SetCursorPosition is called with + pScrn->currentMode == NULL. This allows the driver to work + with servers that don't have the fix for this that was only + recently pushed to git. +- xf86-video-i810-mergedfb-checks.diff: + * Add some MergedFB checks for accelerator limitations +- xf86-video-i810-965g-xv-hang.diff: + * X.Org Bug 8594: Fix Xv hang with G965 * Sat Oct 28 2006 - sndirsch@suse.de - updated mga driver to release 1.4.4: * Fix initialization issues that led to DRI lock-ups on some G400 ++++++ xf86-video-i810-965g-xv-hang.diff ++++++ commit fbb376bd1a4daad4c86e349df98438989ce173f1 Author: Wang Zhenyu <zhenyu.z.wang@intel.com> Date: Mon Oct 30 14:15:12 2006 +0800 Bug 8594: Fix Xv hang with G965 diff --git a/src/packed_yuv_wm.g4a b/src/packed_yuv_wm.g4a index d312d17..4b6391b 100644 --- a/src/packed_yuv_wm.g4a +++ b/src/packed_yuv_wm.g4a @@ -144,7 +144,7 @@ mac.sat (8) m8<1>F g15<8,8,1>F 1F { alig */ mov (8) m1<1>UD g1<8,8,1>UD { align1 mask_disable }; /* Send framebuffer write message: XXX: acc0? */ -send (16) 0 null g0<8,8,1>UW write ( +send (16) 0 acc0<1>UW g0<8,8,1>UW write ( 0, /* binding table index 0 */ 8, /* pixel scoreboard clear */ 4, /* render target write */ diff --git a/src/wm_prog.h b/src/wm_prog.h index 708e6eb..d72c651 100644 --- a/src/wm_prog.h +++ b/src/wm_prog.h @@ -71,7 +71,7 @@ { 0x00600041, 0x20007fbc, 0x008d0220, 0x40011687 }, { 0x80600048, 0x21007fbe, 0x008d01e0, 0x3f800000 }, { 0x00600201, 0x20200022, 0x008d0020, 0x00000000 }, - { 0x00800031, 0x20001d3c, 0x008d0000, 0x85a04800 }, + { 0x00800031, 0x24001d28, 0x008d0000, 0x85a04800 }, { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 }, { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 }, { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 }, ++++++ xf86-video-i810-linearalloc.diff ++++++ commit 8548fa53746c9886eccfb67d022136471d8f3316 Author: Alan Hourihane <alanh@fairlite.demon.co.uk> Date: Mon Oct 23 14:23:29 2006 +0100 Fix manpage to report 8160 instead of 6144 for LinearAlloc. diff --git a/man/i810.man b/man/i810.man index fcc5dd8..50c2668 100644 --- a/man/i810.man +++ b/man/i810.man @@ -201,7 +201,7 @@ Default: 0 degrees. .BI "Option \*qLinearAlloc\*q \*q" integer \*q Allows more memory for the offscreen allocator. This usually helps in situations where HDTV movies are required to play but not enough offscreen -memory is usually available. Set this to 6144 for upto 1920x1080 HDTV support. +memory is usually available. Set this to 8160 for upto 1920x1080 HDTV support. Default 0KB (off). .SH "SEE ALSO" ++++++ xf86-video-i810-mergedfb-checks.diff ++++++ commit 7d67324fa3a5b5cf0227550316c366752fe4abfb Author: Alan Hourihane <alanh@fairlite.demon.co.uk> Date: Mon Oct 23 17:29:17 2006 +0100 Add some MergedFB checks for accelerator limitations diff --git a/src/i830_driver.c b/src/i830_driver.c index 3cee1c8..432f0cb 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -5468,6 +5468,16 @@ I830BIOSPreInit(ScrnInfoPtr pScrn, int f #endif pI830->disableTiling = TRUE; /* no DRI - so disableTiling */ + if (pScrn->displayWidth >= 4096) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Cannot support > 1024x768 in leftof/rightof configurations. disabling DRI.\n"); + pI830->directRenderingDisabled = TRUE; + } + + if (pScrn->virtualY > 2048) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Cannot support > 2048 vertical lines. disabling acceleration.\n"); + pI830->noAccel = TRUE; + } + pI830->displayWidth = pScrn->displayWidth; SetPipeAccess(pScrn); ++++++ xf86-video-i810-setcursorposition.diff ++++++ commit 5ac927d6f05ba6f9608d7e758cbac66e8b3a9db1 Author: Michel Dänzer <michel@tungstengraphics.com> Date: Tue Oct 17 13:27:40 2006 +0200 Don't crash if SetCursorPosition is called with pScrn->currentMode == NULL. This allows the driver to work with servers that don't have the fix for this that was only recently pushed to git. diff --git a/src/i830_cursor.c b/src/i830_cursor.c index c5c904c..8343b6b 100644 --- a/src/i830_cursor.c +++ b/src/i830_cursor.c @@ -520,11 +520,17 @@ I830SetCursorPosition(ScrnInfoPtr pScrn, x -= pScrn->frameX0; y -= pScrn->frameY0; - /* Clamp the cursor position to the visible screen area */ - if (x >= pScrn->currentMode->HDisplay) x = pScrn->currentMode->HDisplay - 1; - if (y >= pScrn->currentMode->VDisplay) y = pScrn->currentMode->VDisplay - 1; - if (x <= -I810_CURSOR_X) x = -I810_CURSOR_X + 1; - if (y <= -I810_CURSOR_Y) y = -I810_CURSOR_Y + 1; + if (pScrn->currentMode) { + /* Clamp the cursor position to the visible screen area */ + if (x >= pScrn->currentMode->HDisplay) x = pScrn->currentMode->HDisplay - 1; + if (y >= pScrn->currentMode->VDisplay) y = pScrn->currentMode->VDisplay - 1; + if (x <= -I810_CURSOR_X) x = -I810_CURSOR_X + 1; + if (y <= -I810_CURSOR_Y) y = -I810_CURSOR_Y + 1; + } else { + /* Can't ensure the cursor will be visible, so hide it */ + hide = TRUE; + show = FALSE; + } #if 0 /* ++++++ xf86-video-i810-video-debug.diff ++++++ commit adae75ef2f8a655a699e982ca8f26b934dbe950a Author: Alan Hourihane <alanh@fairlite.demon.co.uk> Date: Fri Oct 13 17:10:27 2006 +0100 Make VIDEO_DEBUG into a configure option diff --git a/configure.ac b/configure.ac index 042d67d..c91b1df 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,11 @@ AC_ARG_ENABLE(dri, AC_HELP_STRING([--dis [DRI="$enableval"], [DRI=auto]) +AC_ARG_ENABLE(video-debug, AC_HELP_STRING([--enable-video-debug], + [Enable video debugging support [[default=no]]]), + [VIDEO_DEBUG="$enableval"], + [VIDEO_DEBUG=no]) + # Checks for extensions XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto) @@ -122,6 +127,11 @@ if test "$DRI" = yes; then AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) fi +AM_CONDITIONAL(VIDEO_DEBUG, test x$VIDEO_DEBUG = xyes) +if test "$VIDEO_DEBUG" = yes; then + AC_DEFINE(VIDEO_DEBUG,1,[Enable debug support]) +fi + AC_SUBST([DRI_CFLAGS]) AC_SUBST([XORG_CFLAGS]) AC_SUBST([moduledir]) diff --git a/src/i830_video.c b/src/i830_video.c index db21d87..054d26b 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -1,4 +1,3 @@ -#define VIDEO_DEBUG 0 /*************************************************************************** Copyright 2000 Intel Corporation. All Rights Reserved. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org