From ccf0c639fd60e4344ef890ee653201056378c1074bfaf107bd499f3a80601c6b Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 30 Jan 2014 11:02:58 +0000 Subject: [PATCH] - Update to 7.3.0; changes since 7.2.0: radeon: disallow glamor on pre-R600 asics radeon/kms: add berlin pci ids radeon: enable glamor by default (v4) radeon: fix limit handling for cards with >4G of ram drm/radeon: fix non-glamor build radeon: fix the non-glamor build harder... radeon: enable tiling on SI by default (v2) radeon: add support for Hawaii radeon/kms: add Hawaii pci ids drm/radeon: fix SUMO2 pci id radeon/exa: Always use a scratch surface for UTS to vram Require glamor 0.6.0 EXA/evergreen: Paranoia around linear tiling. (v2) radeon: use glamor Xv support if present. radeon/glamor: with new pixmap for dri2 drawable no need to create new texture Fix shadowfb on big-endian machines DRI2: Install client callback only once dri2: Make last_vblank_seq local unsigned to match dpms_last_seq Don't require the glamoregl module to be pre-loaded with xserver >= 1.15 radeon: Set first parameter of drmOpen() to NULL radeon: Restore kernel module load on FreeBSD. radeon: disable 2D tiling on buffers < 128 pixels - removed obsolete patches xf86-video-ati.diff, xf86-video-ati-bug519261-increase-virtual.diff, xf86-video-ati-disable-dri-bug437651-ia64only.diff since modesetting is now being done in kernel space (KMS) and IA64 is no longer considered a relevant architecture for current SUSE products - specfile cleanup OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xf86-video-ati?expand=0&rev=31 --- xf86-video-ati-7.2.0.tar.bz2 | 3 -- xf86-video-ati-7.3.0.tar.bz2 | 3 ++ ...-video-ati-bug519261-increase-virtual.diff | 26 -------------- ...eo-ati-disable-dri-bug437651-ia64only.diff | 11 ------ xf86-video-ati.changes | 35 +++++++++++++++++++ xf86-video-ati.diff | 28 --------------- xf86-video-ati.spec | 18 ++-------- 7 files changed, 40 insertions(+), 84 deletions(-) delete mode 100644 xf86-video-ati-7.2.0.tar.bz2 create mode 100644 xf86-video-ati-7.3.0.tar.bz2 delete mode 100644 xf86-video-ati-bug519261-increase-virtual.diff delete mode 100644 xf86-video-ati-disable-dri-bug437651-ia64only.diff delete mode 100644 xf86-video-ati.diff diff --git a/xf86-video-ati-7.2.0.tar.bz2 b/xf86-video-ati-7.2.0.tar.bz2 deleted file mode 100644 index c35a751..0000000 --- a/xf86-video-ati-7.2.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f30f5efdc8d7d18d06eda7ef2f91a8b7290f1cfbf6ff26362cd47ab8969daec4 -size 824613 diff --git a/xf86-video-ati-7.3.0.tar.bz2 b/xf86-video-ati-7.3.0.tar.bz2 new file mode 100644 index 0000000..9357449 --- /dev/null +++ b/xf86-video-ati-7.3.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:107c072c4919a996e04f47afdb53d5946a3ad574f270b8c560ef8b3a032046fe +size 816346 diff --git a/xf86-video-ati-bug519261-increase-virtual.diff b/xf86-video-ati-bug519261-increase-virtual.diff deleted file mode 100644 index 6bbe06f..0000000 --- a/xf86-video-ati-bug519261-increase-virtual.diff +++ /dev/null @@ -1,26 +0,0 @@ -Index: xf86-video-ati-6.13.0/src/radeon_driver.c -=================================================================== ---- xf86-video-ati-6.13.0.orig/src/radeon_driver.c -+++ xf86-video-ati-6.13.0/src/radeon_driver.c -@@ -3221,6 +3221,21 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, in - if (!RADEONPreInitControllers(pScrn)) - goto fail; - -+ /* Unless we're able to shrink/enlarge FB on the fly (GEM etc.), allocate -+ * large enough (TM) virtual size */ -+ if (!pScrn->display->virtualX || !pScrn->display->virtualY) { -+ /* Have at least enough space for double buffering and z Buffer + some textures */ -+ if (2 * 1920*1920 * (pScrn->bitsPerPixel/8) <= pScrn->videoRam / 4 * 1024) { -+ /* Fits on 128MB and up */ -+ pScrn->display->virtualX = 2 * 1920; -+ pScrn->display->virtualY = 1920; -+ } else if (2 * 1680*1280 * (pScrn->bitsPerPixel/8) <= pScrn->videoRam / 4 * 1024) { -+ /* Fits on 64MB and up */ -+ pScrn->display->virtualX = 2 * 1680; -+ pScrn->display->virtualY = 1280; -+ } -+ } -+ - if (!xf86InitialConfiguration (pScrn, FALSE)) - { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No valid modes.\n"); diff --git a/xf86-video-ati-disable-dri-bug437651-ia64only.diff b/xf86-video-ati-disable-dri-bug437651-ia64only.diff deleted file mode 100644 index 79257f8..0000000 --- a/xf86-video-ati-disable-dri-bug437651-ia64only.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- xf86-video-ati-6.13.0/src/radeon_driver.c.orig 2010-03-15 17:27:28.000000000 +0100 -+++ xf86-video-ati-6.13.0/src/radeon_driver.c 2010-04-10 11:04:12.000000000 +0200 -@@ -2358,7 +2358,7 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr - } - } - -- if (!xf86ReturnOptValBool(info->Options, OPTION_DRI, TRUE)) { -+ if (!xf86ReturnOptValBool(info->Options, OPTION_DRI, FALSE)) { - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Direct rendering forced off\n"); - return FALSE; diff --git a/xf86-video-ati.changes b/xf86-video-ati.changes index 77bf539..7e30878 100644 --- a/xf86-video-ati.changes +++ b/xf86-video-ati.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Thu Jan 30 10:42:16 UTC 2014 - sndirsch@suse.com + +- Update to 7.3.0; changes since 7.2.0: + radeon: disallow glamor on pre-R600 asics + radeon/kms: add berlin pci ids + radeon: enable glamor by default (v4) + radeon: fix limit handling for cards with >4G of ram + drm/radeon: fix non-glamor build + radeon: fix the non-glamor build harder... + radeon: enable tiling on SI by default (v2) + radeon: add support for Hawaii + radeon/kms: add Hawaii pci ids + drm/radeon: fix SUMO2 pci id + radeon/exa: Always use a scratch surface for UTS to vram + Require glamor 0.6.0 + EXA/evergreen: Paranoia around linear tiling. (v2) + radeon: use glamor Xv support if present. + radeon/glamor: with new pixmap for dri2 drawable no need to + create new texture + Fix shadowfb on big-endian machines + DRI2: Install client callback only once + dri2: Make last_vblank_seq local unsigned to match dpms_last_seq + Don't require the glamoregl module to be pre-loaded with xserver >= 1.15 + radeon: Set first parameter of drmOpen() to NULL + radeon: Restore kernel module load on FreeBSD. + radeon: disable 2D tiling on buffers < 128 pixels +- removed obsolete patches xf86-video-ati.diff, + xf86-video-ati-bug519261-increase-virtual.diff, + xf86-video-ati-disable-dri-bug437651-ia64only.diff since + modesetting is now being done in kernel space (KMS) and IA64 is + no longer considered a relevant architecture for current SUSE + products +- specfile cleanup + ------------------------------------------------------------------- Wed Aug 7 16:01:23 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/xf86-video-ati.diff b/xf86-video-ati.diff deleted file mode 100644 index 69413fa..0000000 --- a/xf86-video-ati.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- - src/AtomBios/includes/CD_Structs.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -Index: src/AtomBios/includes/CD_Structs.h -=================================================================== ---- src/AtomBios/includes/CD_Structs.h.orig -+++ src/AtomBios/includes/CD_Structs.h -@@ -419,6 +419,10 @@ typedef struct _DEVICE_DATA { - - #endif - -+#if (PARSER_TYPE==DRIVER_TYPE_PARSER) -+#pragma pack(pop) -+#endif -+ - struct _PARSER_TEMP_DATA; - typedef UINT32 WORKSPACE_POINTER; - -@@ -479,8 +483,4 @@ typedef struct _INDIRECT_IO_PARSER_COMMA - UINT8 csize; - } INDIRECT_IO_PARSER_COMMANDS; - --#if (PARSER_TYPE==DRIVER_TYPE_PARSER) --#pragma pack(pop) --#endif -- - #endif diff --git a/xf86-video-ati.spec b/xf86-video-ati.spec index 5671f5d..f9bcd4a 100644 --- a/xf86-video-ati.spec +++ b/xf86-video-ati.spec @@ -1,7 +1,7 @@ # # spec file for package xf86-video-ati # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,13 @@ Name: xf86-video-ati -Version: 7.2.0 +Version: 7.3.0 Release: 0 Summary: ATI video driver for the Xorg X server License: MIT Group: System/X11/Servers/XF86_4 Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 -Patch0: xf86-video-ati.diff -Patch3: xf86-video-ati-bug519261-increase-virtual.diff -Patch4: xf86-video-ati-disable-dri-bug437651-ia64only.diff BuildRequires: Mesa-devel BuildRequires: autoconf >= 2.60 @@ -66,13 +63,6 @@ driver as appropriate. %prep %setup -q -### File is gone (not applicable anymore?) -#%patch0 -### File is gone (not applicable anymore?) -#%patch3 -p1 -%ifarch ia64 -#%patch4 -p1 -%endif %build autoreconf -fi @@ -87,12 +77,8 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %defattr(-,root,root) %doc COPYING README %dir %{_libdir}/xorg/modules/drivers -#%dir %{_libdir}/xorg/modules/multimedia %{_libdir}/xorg/modules/drivers/ati_drv.so %{_libdir}/xorg/modules/drivers/radeon_drv.so -#%{_libdir}/xorg/modules/multimedia/theatre200_drv.so -#%{_libdir}/xorg/modules/multimedia/theatre_detect_drv.so -#%{_libdir}/xorg/modules/multimedia/theatre_drv.so %{_datadir}/man/man4/ati.4%{?ext_man} %{_datadir}/man/man4/radeon.4%{?ext_man}