Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at Wed Dec 16 12:46:45 CET 2009. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-12-11 04:02:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-12-15 16:58:03.000000000 +0100 @@ -0,0 +1,5 @@ +Tue Dec 15 13:26:22 UTC 2009 - mhopf@novell.com + +- xf86-video-ati-bug-561880-keep_crtc_enabled.diff: + 200M crashes if CRTCs are disabled. + calling whatdependson for head-i586 New: ---- xf86-video-ati-bug-561880-keep_crtc_enabled.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.7nZHB8/_old 2009-12-16 12:46:23.000000000 +0100 +++ /var/tmp/diff_new_pack.7nZHB8/_new 2009-12-16 12:46:23.000000000 +0100 @@ -23,7 +23,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 91 +Release: 92 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -106,6 +106,7 @@ Patch133: xf86-video-sis-19070.diff Patch134: xf86-video-nv-commit-f050096.diff Patch135: xf86-video-nv-commit-b30ec38.diff +Patch136: xf86-video-ati-bug-561880-keep_crtc_enabled.diff %description This package contains X.Org video drivers. @@ -168,6 +169,7 @@ %patch68 -p2 %patch69 -p2 %patch131 -p1 +%patch136 -p1 popd pushd xf86-video-fbdev-* %patch71 ++++++ xf86-video-ati-bug-561880-keep_crtc_enabled.diff ++++++
From 3a30210d50b27f8772fc5045133940246764fce9 Mon Sep 17 00:00:00 2001 From: Matthias Hopf
Date: Tue, 15 Dec 2009 10:53:48 -0500 Subject: [PATCH] fix 200M freezes on VT switch if CRTC is disabled
It appears that RS4xx chips need to have the crtc enabled when the timing is programmed. agd5f: minor fixes/cleanup of the original patch --- src/legacy_crtc.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/legacy_crtc.c b/src/legacy_crtc.c index ed339ab..0ad762b 100644 --- a/src/legacy_crtc.c +++ b/src/legacy_crtc.c @@ -912,6 +912,11 @@ RADEONInitCrtcRegisters(xf86CrtcPtr crtc, RADEONSavePtr save, ? RADEON_CRTC_INTERLACE_EN : 0)); + /* 200M freezes on VT switch sometimes if CRTC is disabled */ + if ((info->ChipFamily == CHIP_FAMILY_RS400) || + (info->ChipFamily == CHIP_FAMILY_RS480)) + save->crtc_gen_cntl |= RADEON_CRTC_EN; + save->crtc_ext_cntl |= (RADEON_XCRT_CNT_EN| RADEON_CRTC_VSYNC_DIS | RADEON_CRTC_HSYNC_DIS | @@ -1162,6 +1167,11 @@ RADEONInitCrtc2Registers(xf86CrtcPtr crtc, RADEONSavePtr save, ? RADEON_CRTC2_INTERLACE_EN : 0)); + /* 200M freezes on VT switch sometimes if CRTC is disabled */ + if ((info->ChipFamily == CHIP_FAMILY_RS400) || + (info->ChipFamily == CHIP_FAMILY_RS480)) + save->crtc2_gen_cntl |= RADEON_CRTC2_EN; + save->disp2_merge_cntl = info->SavedReg->disp2_merge_cntl; save->disp2_merge_cntl &= ~(RADEON_DISP2_RGB_OFFSET_EN); -- 1.5.4.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org