.gear/rules | 2 + .../tags/9b7825ba898c575123cb6423ceed4de5530317c3 | 6 + .gear/tags/list | 1 + src/drmmode_display.c | 15 - src/i830.h | 1 - src/i830_driver.c | 2 - src/i830_video.c | 2 +- xinf2fdi | 97 +++++ xorg-drv-intel.spec | 414 ++++++++++++++++++++ 9 files changed, 521 insertions(+), 19 deletions(-) diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..4fcfd99 --- /dev/null +++ b/.gear/rules @@ -0,0 +1,2 @@ +tar: @version@:. +diff: @version@:. . diff --git a/.gear/tags/9b7825ba898c575123cb6423ceed4de5530317c3 b/.gear/tags/9b7825ba898c575123cb6423ceed4de5530317c3 new file mode 100644 index 0000000..81cf884 --- /dev/null +++ b/.gear/tags/9b7825ba898c575123cb6423ceed4de5530317c3 @@ -0,0 +1,6 @@ +object 9acf10762b5f3d3b1b33ea07792a936a25e45010 +type commit +tag 2.9.1 +tagger Carl Worth 1256558082 -0700 + +Intel 2.9.1 release diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..e670b25 --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +9b7825ba898c575123cb6423ceed4de5530317c3 2.9.1 diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 8ab8a4b..7845fc5 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -1420,18 +1420,3 @@ drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc) return drm_intel_get_pipe_from_crtc_id (bufmgr, drmmode_crtc->mode_crtc->crtc_id); } - -void drmmode_closefb(ScrnInfoPtr scrn) -{ - xf86CrtcConfigPtr xf86_config; - drmmode_crtc_private_ptr drmmode_crtc; - drmmode_ptr drmmode; - - xf86_config = XF86_CRTC_CONFIG_PTR(scrn); - - drmmode_crtc = xf86_config->crtc[0]->driver_private; - drmmode = drmmode_crtc->drmmode; - - drmModeRmFB(drmmode->fd, drmmode->fb_id); - drmmode->fb_id = 0; -} diff --git a/src/i830.h b/src/i830.h index 9d9335b..009641a 100644 --- a/src/i830.h +++ b/src/i830.h @@ -692,7 +692,6 @@ void I830DRI2CloseScreen(ScreenPtr pScreen); extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp); extern int drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc); -extern void drmmode_closefb(ScrnInfoPtr scrn); extern int drmmode_output_dpms_status(xf86OutputPtr output); void drmmode_crtc_set_cursor_bo(xf86CrtcPtr crtc, dri_bo *cursor); diff --git a/src/i830_driver.c b/src/i830_driver.c index b2b1cb1..316a1fa 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -3079,8 +3079,6 @@ I830CloseScreen(int scrnIndex, ScreenPtr pScreen) } if (pI830->front_buffer) { i830_set_pixmap_bo(pScreen->GetScreenPixmap(pScreen), NULL); - if (pI830->use_drm_mode) - drmmode_closefb(pScrn); i830_free_memory(pScrn, pI830->front_buffer); pI830->front_buffer = NULL; } diff --git a/src/i830_video.c b/src/i830_video.c index 47c026d..78d546d 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -1015,7 +1015,7 @@ I830SetupImageVideoTextured(ScreenPtr pScreen) pPriv->doubleBuffer = 0; pPriv->rotation = RR_Rotate_0; - pPriv->SyncToVblank = 1; + pPriv->SyncToVblank = 0; /* gotta uninit this someplace, XXX: shouldn't be necessary for textured */ REGION_NULL(pScreen, &pPriv->clip); diff --git a/xinf2fdi b/xinf2fdi new file mode 100644 index 0000000..cc651d0 --- /dev/null +++ b/xinf2fdi @@ -0,0 +1,97 @@ +#!/bin/sh + +IN_FILE= +OUT_FILE= +DRIVER= + +add_match() +{ + if echo $p_id | grep -q "\;"; then + key="int_outof" + else + key="int" + fi + cat >> "$OUT_FILE" << EOF + + + $DRIVER + + + +EOF + +} + +add_ids() { + for ids in $IDS; do + if [ -z "$v_id" ]; then + v_id=${ids/-0x????/} + p_id=${ids/0x????-/} + else + if [ "${ids/-0x????/}" = "$v_id" ]; then + if [ -z "$p_id" ]; then + p_id=${ids/0x????-/} + else + p_id="$p_id;${ids/0x????-/}" + fi + else + add_match + v_id=${ids/-0x????/} + p_id=${ids/0x????-/} + fi + fi + done + add_match +} + +add_device() { + if [ -n "$IDS" ]; then + cat > "$OUT_FILE" << EOF + + + + +EOF + add_ids + cat >> "$OUT_FILE" << EOF + + +EOF + fi +} + +PROG="${0##*/}" + +TEMP=`getopt -n "$PROG" -o x:f:d: -l xinf:,fdi:,driver: -- "$@"` || exit 1 +eval set -- "$TEMP" + +while :; do + case "$1" in + -x|--xinf) + shift + IN_FILE="$1" + shift + ;; + -f|--fdi) + shift + OUT_FILE="$1" + shift + ;; + -d|--driver) + shift + DRIVER="$1" + shift + ;; + --) + shift + break + ;; + esac +done + +[ -n "$IN_FILE" ] || exit 1 +[ -n "$OUT_FILE" ] || exit 1 +[ -n "$DRIVER" ] || exit 1 + +IDS=`sed -ne 's|.*v....$....$d....$....$sv.*|0x\1-0x\2|p' "$IN_FILE" | sort -u` +add_device diff --git a/xorg-drv-intel.spec b/xorg-drv-intel.spec new file mode 100644 index 0000000..73ae982 --- /dev/null +++ b/xorg-drv-intel.spec @@ -0,0 +1,414 @@ +%define _hwdatadir %_datadir/hwdatabase/videoaliases +%define _fdidir %_datadir/hal/fdi/policy/20thirdparty + +Name: xorg-drv-intel +Version: 2.9.1 +Release: alt1 +Serial: 5 +Summary: Intel integrated graphics chipsets +License: MIT/X11 +Group: System/X11 +Url: http://xorg.freedesktop.org +Packager: Valery Inozemtsev + +Requires: XORG_ABI_VIDEODRV = %get_xorg_abi_videodrv +Requires: xorg-dri-intel +Obsoletes: xorg-x11-drv-i8xx xorg-x11-drv-i810 xorg-x11-drv-intel +Provides: xorg-x11-drv-i8xx = %serial:7.2.0 xorg-x11-drv-i810 = %serial:%version-%release +Provides: xorg-x11-drv-intel = %serial:%version-%release + +Source: %name-%version.tar +Patch: %name-%version-%release.patch + +BuildRequires(Pre): xorg-sdk +BuildRequires: libGL-devel libX11-devel libXext-devel libXvMC-devel xorg-inputproto-devel xorg-fontsproto-devel xorg-randrproto-devel +BuildRequires: xorg-renderproto-devel xorg-xextproto-devel xorg-xf86driproto-devel xorg-dri2proto-devel xorg-xineramaproto-devel + +%description +intel is an Xorg driver for Intel integrated graphics +chipsets. The driver supports depths 8, 15, 16 and 24. All visual +types are supported in depth 8. For the i810/i815 other depths support +the TrueColor and DirectColor visuals. For the 830M and later, only +the TrueColor visual is supported for depths greater than 8. The +driver supports hardware accelerated 3D via the Direct Rendering Infra- +structure (DRI), but only in depth 16 for the i810/i815 and depths 16 +and 24 for the 830M and later. + +%prep +%setup -q +%patch -p1 + +%build +%autoreconf +%configure \ + --with-xorg-module-dir=%_x11modulesdir \ + --enable-dri \ + --disable-static + +%make_build + +%install +%make DESTDIR=%buildroot install + +mkdir -p %buildroot%_hwdatadir +sed -ne '/^#def.*_BRIDGE.*/d;s|^#def.*$PCI_CHIP_.*$[[:space:]]*0x$[[:xdigit:]]*$|alias pcivideo:v00008086d0000\U\2\Esv*sd*bc*sc*i* intel\t# \1|p' src/common.h \ + >> %buildroot%_hwdatadir/intel.xinf + +mkdir -p %buildroot%_fdidir +sh xinf2fdi -x %buildroot%_hwdatadir/intel.xinf -f %buildroot%_fdidir/11-x11-video-intel.fdi -d intel + +%files +%_libdir/*.so.* +%_x11modulesdir/drivers/*.so +%dir %_hwdatadir +%_hwdatadir/*.xinf +%_fdidir/11-x11-video-intel.fdi +%_man4dir/i*.4* + +%changelog +* Mon Oct 26 2009 Valery Inozemtsev 5:2.9.1-alt1 +- 2.9.1 + +* Sun Oct 18 2009 Valery Inozemtsev 5:2.9.0-alt3 +- don't drop frontbuffer from crtc in I830CloseScreen + +* Thu Oct 08 2009 Valery Inozemtsev 5:2.9.0-alt2 +- fixed fd.o #24383, #24459 + +* Tue Sep 29 2009 Valery Inozemtsev 5:2.9.0-alt1 +- 2.9.0 + +* Mon Sep 28 2009 Valery Inozemtsev 5:2.8.99.902-alt1 +- 2.9 RC2 + +* Wed Aug 26 2009 Valery Inozemtsev 5:2.8.1-alt1 +- 2.8.1 + +* Thu Aug 06 2009 Valery Inozemtsev 5:2.8.0-alt5 +- fixed sampler indexes on i965 planar video + +* Tue Jul 21 2009 Valery Inozemtsev 5:2.8.0-alt4 +- 2.8.0 release + +* Fri Jul 17 2009 Valery Inozemtsev 5:2.8.0-alt3.rc2 +- fixed 915-class Render after the 8xx-class Render fix + +* Thu Jul 16 2009 Valery Inozemtsev 5:2.8.0-alt2.rc2 +- fixed batchbuffer wrapping problems with 8xx render + +* Mon Jul 13 2009 Valery Inozemtsev 5:2.8.0-alt1.rc2 +- 2.8 RC2 + +* Mon Jul 13 2009 Valery Inozemtsev 5:2.8.0-alt1.rc1 +- 2.8 RC1 + git 2009-07-11 (34c674dd45879b8ba8395b93b16c8a9e7b848f1f) + +* Thu Jun 11 2009 Valery Inozemtsev 5:2.7.99.901-alt1 +- 2.8 RC1 + +* Fri Jun 05 2009 Valery Inozemtsev 5:2.7.99.1-alt2 +- 2.8 development snapshot 2009-06-05 + +* Wed Apr 29 2009 Valery Inozemtsev 5:2.7.99.1-alt1 +- 2.8 development snapshot + +* Mon Apr 27 2009 Valery Inozemtsev 5:2.7.0-alt2 +- added i965+ fixes + +* Thu Apr 16 2009 Valery Inozemtsev 5:2.7.0-alt1 +- 2.7.0 + +* Sat Apr 11 2009 Valery Inozemtsev 5:2.6.99.903-alt1 +- 2.7 RC3 + +* Thu Mar 12 2009 Valery Inozemtsev 5:2.6.99.902-alt1 +- 2.7 RC2 + +* Tue Mar 10 2009 Valery Inozemtsev 5:2.6.99.901-alt1 +- 2.7 RC1 + +* Sat Mar 07 2009 Valery Inozemtsev 5:2.6.3-alt3 +- fixed another VT switch leak + +* Fri Mar 06 2009 Valery Inozemtsev 5:2.6.3-alt2 +- fixed serious memory leak at Enter/LeaveVT + +* Tue Mar 03 2009 Valery Inozemtsev 5:2.6.3-alt1 +- 2.6.3 + +* Sat Feb 28 2009 Valery Inozemtsev 5:2.6.2-alt3 +- UXA: disabled MITSHM + +* Fri Feb 27 2009 Valery Inozemtsev 5:2.6.2-alt2 +- updated build dependencies + +* Wed Feb 25 2009 Valery Inozemtsev 5:2.6.2-alt1 +- 2.6.2 + +* Thu Jan 22 2009 Valery Inozemtsev 5:2.6.1-alt1 +- 2.6.1 + +* Wed Jan 21 2009 Valery Inozemtsev 5:2.5.1-alt3 +- rollback to 2.5.1 + +* Thu Jan 15 2009 Valery Inozemtsev 4:2.6.0-alt1 +- 2.6.0 + +* Fri Jan 09 2009 Valery Inozemtsev 4:2.5.99.2-alt1 +- 2.6.0 RC2 + +* Fri Jan 09 2009 Valery Inozemtsev 4:2.5.1-alt3 +- 2.5.1 + +* Mon Jan 05 2009 Valery Inozemtsev 4:2.4.3-alt3 +- rollback to 2.4.3, wait GEM in kernel/Mesa + +* Sun Dec 07 2008 Valery Inozemtsev 3:2.5.1-alt2 +- updated build dependencies + +* Mon Dec 01 2008 Valery Inozemtsev 3:2.4.3-alt2 +- updated build dependencies + +* Fri Nov 14 2008 Valery Inozemtsev 3:2.5.1-alt1 +- 2.5.1 + +* Fri Nov 14 2008 Valery Inozemtsev 3:2.4.3-alt0.M41.1 +- build for branch 4.1 + +* Thu Nov 13 2008 Valery Inozemtsev 3:2.4.3-alt1 +- 2.4.3 + +* Fri Nov 07 2008 Valery Inozemtsev 3:2.4.2-alt9.M41.1 +- build for branch 4.1 + +* Fri Nov 07 2008 Valery Inozemtsev 3:2.4.2-alt10 +- use LFP data pointers instead of array (close #17811) + +* Sun Sep 21 2008 Valery Inozemtsev 3:2.4.2-alt8 +- disabled TTM + +* Sat Sep 20 2008 Valery Inozemtsev 3:2.4.2-alt7 +- Pipe A force quirk for Toshiba Satellite A30 +- fixed upscaling limit +- fixed timer leak + +* Mon Sep 15 2008 Valery Inozemtsev 3:2.4.2-alt5.M41.1 +- build for branch 4.1 + +* Mon Sep 15 2008 Valery Inozemtsev 3:2.4.2-alt6 +- added new option "TTM", TTM disabled by defaults + +* Sat Sep 13 2008 Valery Inozemtsev 3:2.4.2-alt5 +- enabled TTM + +* Fri Sep 12 2008 Valery Inozemtsev 3:2.4.2-alt4 +- added support for G41 chipset + +* Fri Sep 05 2008 Valery Inozemtsev 3:2.4.2-alt3 +- set EXA by defaults + +* Wed Aug 27 2008 Valery Inozemtsev 3:2.4.2-alt2 +- requires XORG_ABI_VIDEODRV = 4.1 + +* Tue Aug 26 2008 Valery Inozemtsev 3:2.4.2-alt1 +- 2.4.2 + +* Fri Aug 15 2008 Valery Inozemtsev 3:2.4.1-alt1 +- 2.4.1 + +* Fri Aug 01 2008 Valery Inozemtsev 3:2.4.0-alt1 +- 2.4.0 + +* Wed Jun 18 2008 Valery Inozemtsev 3:2.3.2-alt2 +- add support for Intel 4 series chipsets + +* Wed Jun 18 2008 Valery Inozemtsev 3:2.3.2-alt1 +- 2.3.2 + +* Mon Jun 02 2008 Valery Inozemtsev 3:2.3.1-alt3 +- rename xorg-x11-drv-intel to xorg-drv-intel +- add requires XORG_ABI_VIDEODRV = 2.0 + +* Sat May 24 2008 Valery Inozemtsev 3:2.3.1-alt2 +- fix/check vt switch + +* Mon May 12 2008 Valery Inozemtsev 3:2.3.1-alt1 +- 2.3.1 + +* Sat May 10 2008 Valery Inozemtsev 3:2.3.0-alt2 +- xf86-video-intel-2.3-branch 2008-05-10: + + fixed freeze on two X start (close #15479) + +* Wed Apr 23 2008 Valery Inozemtsev 3:2.3.0-alt1 +- 2.3.0 +- XAA by defaults for all chips + +* Fri Apr 04 2008 Valery Inozemtsev 3:2.2.1-alt4 +- obsoletes xorg-x11-drv-i810 +- convert xinf to fdi + +* Thu Mar 27 2008 Valery Inozemtsev 3:2.2.1-alt3 +- XAA by defaults for i8xx only + +* Tue Mar 25 2008 Valery Inozemtsev 3:2.2.1-alt2 +- disable DRI memory manager +- reset XV after mode switch + +* Sat Feb 23 2008 Valery Inozemtsev 3:2.2.1-alt1 +- 2.2.1 + +* Wed Feb 06 2008 Valery Inozemtsev 3:2.2.0.90-alt1 +- 2.2.1 pre-release + +* Fri Jan 25 2008 Valery Inozemtsev 3:2.2.0-alt5 +- fix VT switch + +* Sat Jan 05 2008 Valery Inozemtsev 3:2.2.0-alt4 +- xf86-video-intel-2.2-branch + +* Sat Dec 01 2007 Valery Inozemtsev 3:2.2.0-alt3 +- removed provides/obsoletes i810 +- fixed intel.xinf + +* Sat Nov 17 2007 Valery Inozemtsev 3:2.2.0-alt2 +- fix typo in 1920x1080 resolution entry + +* Fri Nov 16 2007 Valery Inozemtsev 3:2.2.0-alt1 +- 2.2.0 +- drop legacy driver + +* Wed Oct 31 2007 Valery Inozemtsev 3:2.1.1-alt3 +- added backlight control methods patch (close #13211) + +* Mon Sep 10 2007 Valery Inozemtsev 3:2.1.1-alt2 +- rebuild with xorg-server-1.4 + +* Fri Aug 31 2007 Valery Inozemtsev 3:2.1.1-alt1 +- 2.1.1 +- legacy driver version 1.6.5 + +* Thu Aug 09 2007 Valery Inozemtsev 3:2.1.0-alt3 +- added 0x8086:0x2562 845G/GL/GE (close #12515) + +* Tue Jul 31 2007 Valery Inozemtsev 3:2.1.0-alt2 +- generate intel.xinf from common.h +- added 0x8086:0x5641 PCI_CHIP_I845_G (close #12423) + +* Tue Jul 03 2007 Valery Inozemtsev 3:2.1.0-alt1 +- 2.1.0 + +* Tue Jun 19 2007 Valery Inozemtsev 3:2.0.0-alt8 +- fix left G33 issues +- update xinf file + +* Wed Jun 06 2007 Valery Inozemtsev 3:2.0.0-alt7 +- add support for the G33, Q33, and Q35 chipsets + +* Thu May 31 2007 Valery Inozemtsev 3:2.0.0-alt6 +- add support for the i945GME, i965GME and i965GLE chipsets + +* Fri Apr 27 2007 Valery Inozemtsev 3:2.0.0-alt5 +- returned old driver i810 + +* Fri Apr 27 2007 Valery Inozemtsev 3:2.0.0-alt4 +- drop XV patches + +* Wed Apr 25 2007 Valery Inozemtsev 3:2.0.0-alt3 +- fixed XV on i8xx chipsets + +* Tue Apr 24 2007 Valery Inozemtsev 3:2.0.0-alt2 +- removed old driver i810 + +* Fri Apr 20 2007 Valery Inozemtsev 3:2.0.0-alt1 +- 2.0 release + +* Tue Apr 03 2007 Valery Inozemtsev 3:1.9.94-alt1 +- 2.0RC4 + +* Tue Mar 27 2007 Valery Inozemtsev 3:1.9.93-alt1 +- 2.0.RC3 +- update xinf + +* Wed Mar 14 2007 Valery Inozemtsev 3:1.9.92-alt1 +- 2.0RC2 + +* Thu Jan 11 2007 Valery Inozemtsev 3:1.7.4-alt1 +- 1.7.4: + + Fix bug #8536, i915 BIOS fails when restarting Xserver. + +* Wed Dec 13 2006 Valery Inozemtsev 3:1.7.3-alt3 +- removed modesetting driver + +* Sun Dec 10 2006 Valery Inozemtsev 3:1.7.3-alt2 +- added modesetting driver (intel_drv.so) for i9xx + +* Thu Dec 07 2006 Valery Inozemtsev 3:1.7.3-alt1 +- 1.7.3 + +* Thu Nov 30 2006 Valery Inozemtsev 3:1.7.2-alt4 +- added xf86-video-intel-1.7.2-git-DRM-memory-manager, + xf86-video-intel-1.7.2-git-Xv-hang-G965.patch, + xf86-video-i810-setcursorposition.diff, + xf86-video-i810-update-port-attributes.diff, + xf86-video-i810-video-debug.diff +- added RH patches: + xf86-video-intel-1.7.2-rh-i810-match-server-sync-ranges.patch + +* Thu Nov 16 2006 Valery Inozemtsev 3:1.7.2-alt3 +- rollback to 1.7.2 release +- added videoaliases file from RH + +* Thu Nov 09 2006 Valery Inozemtsev 3:1.7.2-alt2 +- GIT snapshot 2006-11-08 + +* Fri Oct 13 2006 Valery Inozemtsev 3:1.7.2-alt1 +- 1.7.2: + + suspend/resume regression from 1.5 driver + +* Mon Oct 02 2006 Valery Inozemtsev 3:1.7.0-alt1 +- 1.7.0 + +* Tue Aug 29 2006 Valery Inozemtsev 3:1.6.5-alt1.git20060829 +- GIT snapshot 2006-08-29 + +* Fri Aug 11 2006 Valery Inozemtsev 3:1.6.5-alt1 +- 1.6.5 + +* Tue Aug 08 2006 Valery Inozemtsev 3:1.6.3-alt1 +- 1.6.3 + +* Wed Jul 26 2006 Valery Inozemtsev 3:1.6.1-alt1 +- 1.6.1 + +* Sun Jun 04 2006 Valery Inozemtsev 3:1.6.0-alt3 +- fix VT switch DRI locking + +* Sat May 13 2006 Valery Inozemtsev 3:1.6.0-alt2 +- requires xorg-x11-server >= 1.0.99.901 + +* Thu Apr 20 2006 Valery Inozemtsev 3:1.6.0-alt1 +- 1.6.0 + +* Sun Mar 19 2006 Valery Inozemtsev 3:1.4.1.3-alt1 +- rollback 1.4.1.3 + +* Sun Mar 05 2006 Valery Inozemtsev 2:1.5.2.0-alt1 +- 1.5.2.0 (requires xorg-x11-server >= 1.0.1-alt14) + +* Fri Feb 03 2006 Valery Inozemtsev 2:1.4.1.3-alt1 +- rollback 1.4.1.3 (1.5.0.0 problematic) + +* Tue Jan 31 2006 Valery Inozemtsev 1:1.5.0.0-alt1 +- 1.5.0.0 + +* Mon Jan 23 2006 Valery Inozemtsev 1:1.4.1.3-alt2 +- removed files spectre (%%ghost %%_libdir/*.so) + +* Wed Dec 28 2005 Valery Inozemtsev 1:1.4.1.3-alt1 +- Xorg-7.0 + +* Sun Dec 04 2005 Valery Inozemtsev 1:1.4.1.1-alt1 +- Xorg-7.0RC3 + +* Sun Nov 27 2005 Valery Inozemtsev 1:1.4.1-alt0.1 +- initial release +