Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at Sat Mar 7 11:44:35 CET 2009. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-03-04 18:02:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-03-07 04:35:53.140937449 +0100 @@ -1,0 +2,8 @@ +Sat Mar 7 04:34:50 CET 2009 - sndirsch@suse.de + +- xf86-video-intel-commit-73aa23d.diff + * DRI1: Update sarea (and other information) when CRTC + configuration changes (bfo #14423, bfo #18100) + + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xf86-video-intel-commit-73aa23d.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.n23523/_old 2009-03-07 11:44:00.000000000 +0100 +++ /var/tmp/diff_new_pack.n23523/_new 2009-03-07 11:44:00.000000000 +0100 @@ -22,7 +22,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 44 +Release: 45 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -100,6 +100,7 @@ Patch69: xf86-video-ati-ia64_screen_blank.diff Patch70: xf86-video-newport.diff Patch71: xf86-video-fbdev.diff +Patch72: xf86-video-intel-commit-73aa23d.diff Patch103: xf86-video-ati-6.7.197-r128-xvideo.patch Patch104: xf86-video-ati-disable-dri-bug437651-ia64only.diff @@ -133,6 +134,7 @@ %patch66 -p1 %endif %patch67 -p1 +%patch72 -p1 popd pushd xf86-video-nv-* %patch3 -p0 @@ -277,6 +279,10 @@ /var/lib/hardware/ids/20.%{name} %changelog +* Sat Mar 07 2009 sndirsch@suse.de +- xf86-video-intel-commit-73aa23d.diff + * DRI1: Update sarea (and other information) when CRTC + configuration changes (bfo #14423, bfo #18100) * Wed Mar 04 2009 sndirsch@suse.de - no longer require xorg-x11-driver-video-unichrome; use Supplements in xorg-x11-driver-video-unichrome instead (bnc #481569) ++++++ xf86-video-intel-commit-73aa23d.diff ++++++ commit 73aa23d9150121a4e4b70a78cab910acd164abf5 Author: Eric Anholt <eric@anholt.net> Date: Fri Dec 5 13:06:05 2008 -0800 DRI1: Update sarea (and other information) when CRTC configuration changes. Bug #14423. Signed-off-by: Eric Anholt <eric@anholt.net> diff --git a/src/i830_display.c b/src/i830_display.c index 3139d40..ca55906 100644 --- a/src/i830_display.c +++ b/src/i830_display.c @@ -1085,6 +1085,11 @@ i830_crtc_commit (xf86CrtcPtr crtc) /* Reenable FB compression if possible */ if (i830_use_fb_compression(crtc)) i830_enable_fb_compression(crtc); + +#ifdef XF86DRI + /* Tell DRI1 the news about new output config */ + i830_update_dri_buffers(crtc->scrn); +#endif } void diff --git a/src/i830_dri.c b/src/i830_dri.c index b7ebd92..f61c564 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -1387,9 +1387,6 @@ i830_update_dri_mappings(ScrnInfoPtr pScrn, drmI830Sarea *sarea) { I830Ptr pI830 = I830PTR(pScrn); - if (pI830->directRenderingType == DRI_DRI2) - return TRUE; - if (!i830_do_addmap(pScrn, pI830->front_buffer, &sarea->front_handle, &sarea->front_size, &sarea->front_offset)) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disabling DRI.\n"); @@ -1447,9 +1444,15 @@ Bool i830_update_dri_buffers(ScrnInfoPtr pScrn) { ScreenPtr pScreen = pScrn->pScreen; - drmI830Sarea *sarea = (drmI830Sarea *) DRIGetSAREAPrivate(pScreen); + I830Ptr pI830 = I830PTR(pScrn); + drmI830Sarea *sarea; Bool success; + if (pI830->directRenderingType == DRI_DRI2) + return TRUE; + + sarea = (drmI830Sarea *) DRIGetSAREAPrivate(pScreen); + success = i830_update_dri_mappings(pScrn, sarea); if (!success) return FALSE; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org