diff --git a/radeon-suspend-fix.patch b/radeon-suspend-fix.patch new file mode 100644 index 0000000..c2a8b1f --- /dev/null +++ b/radeon-suspend-fix.patch @@ -0,0 +1,32 @@ +diff --git a/src/radeon_driver.c b/src/radeon_driver.c +index 1ae6018..1a3b74a 100644 +--- a/src/radeon_driver.c ++++ b/src/radeon_driver.c +@@ -5590,8 +5590,11 @@ Bool RADEONEnterVT(int scrnIndex, int flags) + + } + +- if (info->drm_mm) ++ if (info->drm_mm) { + radeon_bind_all_memory(pScrn); ++ info->XInited3D = FALSE; ++ info->engineMode = EXA_ENGINEMODE_UNKNOWN; ++ } + + radeon_update_dri_buffers(pScrn); + +diff --git a/src/radeon_memory.c b/src/radeon_memory.c +index ccc3bb8..8a23ccd 100644 +--- a/src/radeon_memory.c ++++ b/src/radeon_memory.c +@@ -21,6 +21,10 @@ radeon_bind_memory(ScrnInfoPtr pScrn, struct radeon_memory *mem) + + int ret; + ++ if (mem->pool == RADEON_POOL_VRAM) ++ pin.pin_domain = RADEON_GEM_DOMAIN_VRAM; ++ else ++ pin.pin_domain = RADEON_GEM_DOMAIN_GTT; + pin.handle = mem->kernel_bo_handle; + pin.alignment = mem->alignment; + diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec index 387e51b..502d08b 100644 --- a/xorg-x11-drv-ati.spec +++ b/xorg-x11-drv-ati.spec @@ -5,7 +5,7 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 6.9.0 -Release: 7%{?dist} +Release: 8%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -16,13 +16,14 @@ Source1: radeon.xinf Patch0: radeon-6.9.0-to-git.patch Patch1: radeon-modeset.patch +Patch2: radeon-suspend-fix.patch ExcludeArch: s390 s390x BuildRequires: xorg-x11-server-sdk >= 1.4.99.1 BuildRequires: mesa-libGL-devel >= 6.4-4 BuildRequires: libdrm-devel >= 2.4.0-0.19 -BuildRequires: kernel-headers >= 2.6.27-0.280 +BuildRequires: kernel-headers >= 2.6.27-0.308 BuildRequires: automake autoconf libtool pkgconfig BuildRequires: xorg-x11-util-macros >= 1.1.5 @@ -36,6 +37,7 @@ X.Org X11 ati video driver. %setup -q -n %{tarball}-%{version} %patch0 -p1 -b .git %patch1 -p1 -b .modeset +%patch2 -p1 -b .suspend %build autoreconf @@ -67,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/radeon.4* %changelog +* Fri Sep 05 2008 Dave Airlie 6.9.0-8 +- fix suspend/resume support - needs new pinning API + * Wed Aug 27 2008 Dave Airlie 6.9.0-7 - fix bug in modesetting to make 3D work again