Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Fri Oct 13 16:38:13 CEST 2006. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-10-11 18:14:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-10-13 15:14:37.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Oct 13 15:14:06 CEST 2006 - sndirsch@suse.de + +- update i810 driver to release 1.7.2 + * Turn off debugging. + +------------------------------------------------------------------- +Fri Oct 13 14:21:15 CEST 2006 - sndirsch@suse.de + +- update i810 driver to release 1.7.1 + * Fix bug #8553 & #8542 - suspend/resume regression from ... + * Fix some warnings + * Fix server regeneration problem mapping the aperture + * Fix bug #5795, VT switching fails because of a bad ... + * silence warning xf86-video-intel-1.7.0 / xf86-video-i810-1.7.0 + * Enable XV_PORT attribute even when not in Clone mode. + +------------------------------------------------------------------- Old: ---- xf86-video-i810-1.7.0.tar.bz2 New: ---- xf86-video-i810-1.7.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.bhEreo/_old 2006-10-13 16:36:57.000000000 +0200 +++ /var/tmp/diff_new_pack.bhEreo/_new 2006-10-13 16:36:57.000000000 +0200 @@ -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.1 -Release: 26 +Release: 28 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -33,7 +33,7 @@ Source9: xf86-video-glint-X11R7.1-1.1.1.tar.bz2 Source10: xf86-video-i128-X11R7.1-1.1.0.5.tar.bz2 Source11: xf86-video-i740-X11R7.1-1.1.0.tar.bz2 -Source12: xf86-video-i810-1.7.0.tar.bz2 +Source12: xf86-video-i810-1.7.2.tar.bz2 Source13: xf86-video-imstt-X11R7.1-1.1.0.tar.bz2 Source14: xf86-video-mga-1.4.2.tar.bz2 Source15: xf86-video-neomagic-X11R7.1-1.1.1.tar.bz2 @@ -184,6 +184,17 @@ %{_mandir}/man4/* %changelog -n xorg-x11-driver-video +* Fri Oct 13 2006 - sndirsch@suse.de +- update i810 driver to release 1.7.2 + * Turn off debugging. +* Fri Oct 13 2006 - sndirsch@suse.de +- update i810 driver to release 1.7.1 + * Fix bug #8553 & #8542 - suspend/resume regression from ... + * Fix some warnings + * Fix server regeneration problem mapping the aperture + * Fix bug #5795, VT switching fails because of a bad ... + * silence warning xf86-video-intel-1.7.0 / xf86-video-i810-1.7.0 + * Enable XV_PORT attribute even when not in Clone mode. * Wed Oct 11 2006 - sndirsch@suse.de - fixed build of via driver (build enabled again, Bug #207118) * Mon Oct 09 2006 - sndirsch@suse.de ++++++ xf86-video-i810-1.7.0.tar.bz2 -> xf86-video-i810-1.7.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-i810-1.7.0/configure new/xf86-video-i810-1.7.2/configure --- old/xf86-video-i810-1.7.0/configure 2006-10-02 12:13:12.000000000 +0200 +++ new/xf86-video-i810-1.7.2/configure 2006-10-13 14:56:21.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for xf86-video-i810 1.7.0. +# Generated by GNU Autoconf 2.59 for xf86-video-i810 1.7.2. # # Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg. # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='xf86-video-i810' PACKAGE_TARNAME='xf86-video-i810' -PACKAGE_VERSION='1.7.0' -PACKAGE_STRING='xf86-video-i810 1.7.0' +PACKAGE_VERSION='1.7.2' +PACKAGE_STRING='xf86-video-i810 1.7.2' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -974,7 +974,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xf86-video-i810 1.7.0 to adapt to many kinds of systems. +\`configure' configures xf86-video-i810 1.7.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1040,7 +1040,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-video-i810 1.7.0:";; + short | recursive ) echo "Configuration of xf86-video-i810 1.7.2:";; esac cat <<\_ACEOF @@ -1192,7 +1192,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -xf86-video-i810 configure 1.7.0 +xf86-video-i810 configure 1.7.2 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1206,7 +1206,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-video-i810 $as_me 1.7.0, which was +It was created by xf86-video-i810 $as_me 1.7.2, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1870,7 +1870,7 @@ # Define the identity of the package. PACKAGE='xf86-video-i810' - VERSION='1.7.0' + VERSION='1.7.2' cat >>confdefs.h <<_ACEOF @@ -21354,7 +21354,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by xf86-video-i810 $as_me 1.7.0, which was +This file was extended by xf86-video-i810 $as_me 1.7.2, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21417,7 +21417,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xf86-video-i810 config.status 1.7.0 +xf86-video-i810 config.status 1.7.2 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-i810-1.7.0/configure.ac new/xf86-video-i810-1.7.2/configure.ac --- old/xf86-video-i810-1.7.0/configure.ac 2006-10-02 12:12:08.000000000 +0200 +++ new/xf86-video-i810-1.7.2/configure.ac 2006-10-13 14:54:41.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-i810], - 1.7.0, + 1.7.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-i810) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-i810-1.7.0/man/Makefile.in new/xf86-video-i810-1.7.2/man/Makefile.in --- old/xf86-video-i810-1.7.0/man/Makefile.in 2006-10-02 12:13:18.000000000 +0200 +++ new/xf86-video-i810-1.7.2/man/Makefile.in 2006-10-13 14:56:19.000000000 +0200 @@ -254,9 +254,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/Makefile + $(AUTOMAKE) --foreign man/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-i810-1.7.0/src/Makefile.in new/xf86-video-i810-1.7.2/src/Makefile.in --- old/xf86-video-i810-1.7.0/src/Makefile.in 2006-10-02 12:13:19.000000000 +0200 +++ new/xf86-video-i810-1.7.2/src/Makefile.in 2006-10-13 14:56:19.000000000 +0200 @@ -291,9 +291,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile + $(AUTOMAKE) --foreign src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-i810-1.7.0/src/i810_dri.h new/xf86-video-i810-1.7.2/src/i810_dri.h --- old/xf86-video-i810-1.7.0/src/i810_dri.h 2006-10-02 12:12:02.000000000 +0200 +++ new/xf86-video-i810-1.7.2/src/i810_dri.h 2006-10-13 14:54:51.000000000 +0200 @@ -9,8 +9,8 @@ #define I810_MAX_DRAWABLES 256 #define I810_MAJOR_VERSION 1 -#define I810_MINOR_VERSION 6 -#define I810_PATCHLEVEL 3 +#define I810_MINOR_VERSION 7 +#define I810_PATCHLEVEL 2 typedef struct { drm_handle_t regs; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-i810-1.7.0/src/i810_driver.c new/xf86-video-i810-1.7.2/src/i810_driver.c --- old/xf86-video-i810-1.7.0/src/i810_driver.c 2006-09-29 09:47:07.000000000 +0200 +++ new/xf86-video-i810-1.7.2/src/i810_driver.c 2006-10-06 14:34:44.000000000 +0200 @@ -1186,14 +1186,13 @@ long i; for (i = 2; i < pI810->FbMapSize; i <<= 1) ; - pI810->FbMapSize = i; if (!I810MapMMIO(pScrn)) return FALSE; pI810->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER, pI810->PciTag, - pI810->LinearAddr, pI810->FbMapSize); + pI810->LinearAddr, i); if (!pI810->FbBase) return FALSE; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-i810-1.7.0/src/i830_dri.h new/xf86-video-i810-1.7.2/src/i830_dri.h --- old/xf86-video-i810-1.7.0/src/i830_dri.h 2006-09-29 09:47:07.000000000 +0200 +++ new/xf86-video-i810-1.7.2/src/i830_dri.h 2006-10-13 14:54:47.000000000 +0200 @@ -10,7 +10,7 @@ #define I830_MAJOR_VERSION 1 #define I830_MINOR_VERSION 7 -#define I830_PATCHLEVEL 0 +#define I830_PATCHLEVEL 2 #define I830_REG_SIZE 0x80000 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-i810-1.7.0/src/i830_driver.c new/xf86-video-i810-1.7.2/src/i830_driver.c --- old/xf86-video-i810-1.7.0/src/i830_driver.c 2006-10-02 12:16:23.000000000 +0200 +++ new/xf86-video-i810-1.7.2/src/i830_driver.c 2006-10-13 13:52:26.000000000 +0200 @@ -2620,37 +2620,15 @@ I830Set640x480(ScrnInfoPtr pScrn) { I830Ptr pI830 = I830PTR(pScrn); - int m = 0x30; /* 640x480 8bpp */ + int m; - switch (pScrn->depth) { - case 15: - m = 0x40; - break; - case 16: - m = 0x41; - break; - case 24: - m = 0x50; - break; - } - - m |= (1 << 15) | (1 << 14); + /* 640x480 8bpp */ + m = 0x30 | (1 << 15) | (1 << 14); if (VBESetVBEMode(pI830->pVbe, m, NULL)) return TRUE; - /* if the first failed, let's try the next - usually 800x600 */ - m = 0x32; - switch (pScrn->depth) { - case 15: - case 16: - m = 0x42; - break; - case 24: - m = 0x52; - break; - } - m |= (1 << 15) | (1 << 14); + m = 0x32 | (1 << 15) | (1 << 14); if (VBESetVBEMode(pI830->pVbe, m, NULL)) return TRUE; @@ -8063,7 +8041,11 @@ * the Video BIOS with our saved devices, and only when that fails, * we'll warm boot it. */ - if (!I830Set640x480(pScrn)) { + /* Check Pipe conf registers or possibly HTOTAL/VTOTAL for 0x00000000)*/ + CARD32 temp; + Bool set = I830Set640x480(pScrn); + temp = pI830->pipe ? INREG(PIPEBCONF) : INREG(PIPEACONF); + if (!set || !(temp & 0x80000000)) { xf86Int10InfoPtr pInt; xf86DrvMsg(pScrn->scrnIndex, X_INFO, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-i810-1.7.0/src/i830_video.c new/xf86-video-i810-1.7.2/src/i830_video.c --- old/xf86-video-i810-1.7.0/src/i830_video.c 2006-09-30 14:26:47.000000000 +0200 +++ new/xf86-video-i810-1.7.2/src/i830_video.c 2006-10-13 14:54:06.000000000 +0200 @@ -160,7 +160,7 @@ do { \ BEGIN_LP_RING(8); \ OUT_RING(MI_FLUSH | MI_WRITE_DIRTY_STATE); \ - OUT_RING(MI_NOOP); \ + OUT_RING(MI_NOOP); \ if (!*pI830->overlayOn) { \ OUT_RING(MI_NOOP); \ OUT_RING(MI_NOOP); \ @@ -188,7 +188,7 @@ int spin = 1000000; \ BEGIN_LP_RING(6); \ OUT_RING(MI_FLUSH | MI_WRITE_DIRTY_STATE); \ - OUT_RING(MI_NOOP); \ + OUT_RING(MI_NOOP); \ OUT_RING(MI_OVERLAY_FLIP | MI_OVERLAY_FLIP_OFF); \ if (IS_I965G(pI830)) \ OUT_RING(pI830->OverlayMem->Start | OFC_UPDATE); \ @@ -681,8 +681,7 @@ adapt->pPortPrivates[0].ptr = (pointer) (pPriv); adapt->nAttributes = NUM_ATTRIBUTES; - if (pI830->Clone) - adapt->nAttributes += CLONE_ATTRIBUTES; + adapt->nAttributes += CLONE_ATTRIBUTES; if (IS_I9XX(pI830)) adapt->nAttributes += GAMMA_ATTRIBUTES; /* has gamma */ adapt->pAttributes = xnfalloc(sizeof(XF86AttributeRec) * adapt->nAttributes); @@ -690,10 +689,8 @@ att = adapt->pAttributes; memcpy((char *)att, (char*)Attributes, sizeof(XF86AttributeRec)* NUM_ATTRIBUTES); att+=NUM_ATTRIBUTES; - if (pI830->Clone) { - memcpy((char*)att, (char*)CloneAttributes, sizeof(XF86AttributeRec) * CLONE_ATTRIBUTES); - att+=CLONE_ATTRIBUTES; - } + memcpy((char*)att, (char*)CloneAttributes, sizeof(XF86AttributeRec) * CLONE_ATTRIBUTES); + att+=CLONE_ATTRIBUTES; if (IS_I9XX(pI830)) { memcpy((char*)att, (char*)GammaAttributes, sizeof(XF86AttributeRec) * GAMMA_ATTRIBUTES); att+=GAMMA_ATTRIBUTES; @@ -752,8 +749,7 @@ xvDoubleBuffer = MAKE_ATOM("XV_DOUBLE_BUFFER"); /* Allow the pipe to be switched from pipe A to B when in clone mode */ - if (pI830->Clone) - xvPipe = MAKE_ATOM("XV_PIPE"); + xvPipe = MAKE_ATOM("XV_PIPE"); if (IS_I9XX(pI830)) { xvGamma0 = MAKE_ATOM("XV_GAMMA0"); @@ -885,9 +881,6 @@ I830PortPrivPtr pPriv = (I830PortPrivPtr) data; I830Ptr pI830 = I830PTR(pScrn); - I830OverlayRegPtr overlay = - (I830OverlayRegPtr) (pI830->FbBase + pI830->OverlayMem->Start); - if (pPriv->textured) return; @@ -1031,7 +1024,7 @@ *value = pPriv->brightness; } else if (attribute == xvContrast) { *value = pPriv->contrast; - } else if (pI830->Clone && attribute == xvPipe) { + } else if (attribute == xvPipe) { *value = pPriv->pipe; } else if (attribute == xvGamma0 && (IS_I9XX(pI830))) { *value = pPriv->gamma0; @@ -3271,8 +3264,6 @@ ScrnInfoPtr pScrn = xf86Screens[i]; I830Ptr pI830 = I830PTR(pScrn); I830PortPrivPtr pPriv = GET_PORT_PRIVATE(pScrn); - I830OverlayRegPtr overlay = - (I830OverlayRegPtr) (pI830->FbBase + pI830->OverlayMem->Start); pScreen->BlockHandler = pI830->BlockHandler; @@ -3402,9 +3393,6 @@ if (pPriv->isOn) { I830Ptr pI830 = I830PTR(pScrn); - I830OverlayRegPtr overlay = - (I830OverlayRegPtr) (pI830->FbBase + pI830->OverlayMem->Start); - ErrorF("StopSurface\n"); I830ResetVideo(pScrn); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-i810-1.7.0/src/xvmc/Makefile.in new/xf86-video-i810-1.7.2/src/xvmc/Makefile.in --- old/xf86-video-i810-1.7.0/src/xvmc/Makefile.in 2006-10-02 12:13:19.000000000 +0200 +++ new/xf86-video-i810-1.7.2/src/xvmc/Makefile.in 2006-10-13 14:56:20.000000000 +0200 @@ -228,9 +228,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/xvmc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/xvmc/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/xvmc/Makefile + $(AUTOMAKE) --foreign src/xvmc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de