pool/xf86-video-ati
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 114598 from home:dimstar:branches:X11:XOrg

Browse Source 
Update - compatible with X 1.12. - Package fails build until my xorg-server 1.12 package lands (due to missing x11_abi_videodrv_req macro) - Recommend to accept as one collection

OBS-URL: https://build.opensuse.org/request/show/114598
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xf86-video-ati?expand=0&rev=2
This commit is contained in:
Stefan Dirsch 2012-04-20 09:30:46 +00:00 committed by Git OBS Bridge
parent ac37d6ba51
commit fb4c456d0d
6 changed files with 21 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xf86-video-ati-6.14.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:844a2649eff6a3e92aff3e1837ea864f1561b4822b3e5d5ccb27b3b7fb8137b4
size 1113119

3
xf86-video-ati-6.14.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4ffe435ef8fbe0989f6576f04f789e147a2de7fdefc3644e39d5ef626c37ef85
size 1108681

56
xf86-video-ati-bug474071-fix2.diff
View File

@ -1,56 +0,0 @@
Index: xorg-x11-driver-video-7.5/xf86-video-ati-6.13.0/src/radeon_driver.c
===================================================================
--- xorg-x11-driver-video-7.5/xf86-video-ati-6.13.0.orig/src/radeon_driver.c
+++ xorg-x11-driver-video-7.5/xf86-video-ati-6.13.0/src/radeon_driver.c
@@ -223,6 +223,7 @@ struct RADEONInt10Save {
uint32_t MEM_CNTL;
uint32_t MEMSIZE;
uint32_t MPP_TB_CONFIG;
+ unsigned char MISC_OUT;
};
static Bool RADEONMapMMIO(ScrnInfoPtr pScrn);
@@ -278,14 +279,17 @@ RADEONPreInt10Save(ScrnInfoPtr pScrn, vo
RADEONInfoPtr info = RADEONPTR(pScrn);
unsigned char *RADEONMMIO = info->MMIO;
uint32_t CardTmp;
- static struct RADEONInt10Save SaveStruct = { 0, 0, 0 };
+ static struct RADEONInt10Save SaveStruct = { 0, 0, 0, 0 };
if (!IS_AVIVO_VARIANT) {
+ OUTREG(0,RADEON_MEM_CNTL);
/* Save the values and zap MEM_CNTL */
SaveStruct.MEM_CNTL = INREG(RADEON_MEM_CNTL);
SaveStruct.MEMSIZE = INREG(RADEON_CONFIG_MEMSIZE);
SaveStruct.MPP_TB_CONFIG = INREG(RADEON_MPP_TB_CONFIG);
-
+#if !defined(__powerpc__) && !defined(__sparc__)
+ SaveStruct.MISC_OUT = inb(pScrn->domainIOBase + RADEON_GENMO_RD);
+#endif
/*
* Zap MEM_CNTL and set MPP_TB_CONFIG<31:24> to 4
*/
@@ -347,6 +351,14 @@ RADEONPostInt10Check(ScrnInfoPtr pScrn,
CardTmp |= (pSave->MPP_TB_CONFIG & 0xff000000u);
OUTREG(RADEON_MPP_TB_CONFIG, CardTmp);
}
+#if !defined(__powerpc__) && !defined(__sparc__)
+ if (CardTmp != pSave->MISC_OUT) {
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ "Restoring MiscOut (%x), setting to %x\n",
+ CardTmp, pSave->MEM_CNTL);
+ outb(pScrn->domainIOBase + RADEON_GENMO_WT, pSave->MISC_OUT);
+ }
+#endif
}
/* Allocate our private RADEONInfoRec */
@@ -3014,7 +3026,7 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, in
goto fail1;
}
-#if !defined(__alpha__)
+#if !defined(__alpha__) && !defined (__ia64__)
if (
#ifndef XSERVER_LIBPCIACCESS
xf86GetPciDomain(info->PciTag) ||

106
xf86-video-ati-ia64_screen_blank.diff
View File

@ -1,106 +0,0 @@
Index: xorg-x11-driver-video-7.5/xf86-video-ati-6.13.0/src/radeon_driver.c
===================================================================
--- xorg-x11-driver-video-7.5/xf86-video-ati-6.13.0.orig/src/radeon_driver.c
+++ xorg-x11-driver-video-7.5/xf86-video-ati-6.13.0/src/radeon_driver.c
@@ -224,6 +224,7 @@ struct RADEONInt10Save {
uint32_t MEMSIZE;
uint32_t MPP_TB_CONFIG;
unsigned char MISC_OUT;
+ unsigned char ATTR[0x10];
};
static Bool RADEONMapMMIO(ScrnInfoPtr pScrn);
@@ -273,13 +274,67 @@ RADEONEntPtr RADEONEntPriv(ScrnInfoPtr p
return pPriv->ptr;
}
+#if !defined(__powerpc__) && !defined(__sparc__)
+/*
+ *
+ */
+void
+RADEONPreInt10SaveVGA(ScrnInfoPtr pScrn, struct RADEONInt10Save *pSave)
+{
+ IOADDRESS Base = pScrn->domainIOBase;
+ unsigned int Stat1Reg;
+ int i;
+
+ pSave->MISC_OUT = inb(pScrn->domainIOBase + RADEON_GENMO_RD);
+ Stat1Reg = (pSave->MISC_OUT & 0x1) ? 0x3DA : 0x3BA;
+ {
+ for (i = 0; i < 0x10; i++) {
+ inb(Base + Stat1Reg);
+ outb(Base + RADEON_ATTRX, i);
+ pSave->ATTR[i] = inb(Base + RADEON_ATTRDR);
+ }
+ }
+}
+
+/*
+ *
+ */
+void
+RADEONPostInt10CheckVGA(ScrnInfoPtr pScrn, struct RADEONInt10Save *pSave)
+{
+ IOADDRESS Base = pScrn->domainIOBase;
+ unsigned int Stat1Reg = (pSave->MISC_OUT & 0x1) ? 0x3DA : 0x3BA;
+ unsigned char CardTmp = inb(pScrn->domainIOBase + RADEON_GENMO_RD);
+ int i;
+
+ if (CardTmp != pSave->MISC_OUT) {
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ "Restoring MiscOut (%x), setting to %x\n",
+ CardTmp, pSave->MEM_CNTL);
+ outb(pScrn->domainIOBase + RADEON_GENMO_WT, pSave->MISC_OUT);
+ }
+
+ for (i = 0; i < 0x10; i++) {
+ inb(Base + Stat1Reg);
+ outb(Base + RADEON_ATTRX, i);
+ CardTmp = inb(Base + RADEON_ATTRDR);
+ if ( CardTmp != pSave->ATTR[i] ) {
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ "Restoring AttrReg[0x%i]: 0x%x to 0x%x\n",
+ i, CardTmp, pSave->ATTR[i]);
+ outb(Base + RADEON_ATTRDW, pSave->ATTR[i]);
+ }
+ }
+}
+#endif
+
static void
RADEONPreInt10Save(ScrnInfoPtr pScrn, void **pPtr)
{
RADEONInfoPtr info = RADEONPTR(pScrn);
unsigned char *RADEONMMIO = info->MMIO;
uint32_t CardTmp;
- static struct RADEONInt10Save SaveStruct = { 0, 0, 0, 0 };
+ static struct RADEONInt10Save SaveStruct = { 0, 0, 0, 0, {0} };
if (!IS_AVIVO_VARIANT) {
OUTREG(0,RADEON_MEM_CNTL);
@@ -287,8 +342,9 @@ RADEONPreInt10Save(ScrnInfoPtr pScrn, vo
SaveStruct.MEM_CNTL = INREG(RADEON_MEM_CNTL);
SaveStruct.MEMSIZE = INREG(RADEON_CONFIG_MEMSIZE);
SaveStruct.MPP_TB_CONFIG = INREG(RADEON_MPP_TB_CONFIG);
+
#if !defined(__powerpc__) && !defined(__sparc__)
- SaveStruct.MISC_OUT = inb(pScrn->domainIOBase + RADEON_GENMO_RD);
+ RADEONPreInt10SaveVGA(pScrn, &SaveStruct);
#endif
/*
* Zap MEM_CNTL and set MPP_TB_CONFIG<31:24> to 4
@@ -352,12 +408,7 @@ RADEONPostInt10Check(ScrnInfoPtr pScrn,
OUTREG(RADEON_MPP_TB_CONFIG, CardTmp);
}
#if !defined(__powerpc__) && !defined(__sparc__)
- if (CardTmp != pSave->MISC_OUT) {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- "Restoring MiscOut (%x), setting to %x\n",
- CardTmp, pSave->MEM_CNTL);
- outb(pScrn->domainIOBase + RADEON_GENMO_WT, pSave->MISC_OUT);
- }
+ RADEONPostInt10CheckVGA(pScrn, pSave);
#endif
}

16
xf86-video-ati.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Apr 19 12:03:30 UTC 2012 - dimstar@opensuse.org
- Update to version 6.14.4:
+ bump libdrm requirement for TN support
+ radeon/kms: add TN pci ids
+ r6xx: initialize SX_MISC
+ DRI2: Unreference buffers immediately when event wait info is
invalidated.
+ Re-register DRM FD wakeup handler for each server generation.
+ Bugs fixed: fdo#45827, fdo#45937, fdo#45829, fdo#43893.
- Drop patches:
+ xf86-video-ati-bug474071-fix2.diff
+ xf86-video-ati-ia64_screen_blank.diff
- Use %x11_abi_videodrv_req instead of static ABI Requires.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 18 15:51:24 UTC 2012 - vuntz@opensuse.org Wed Apr 18 15:51:24 UTC 2012 - vuntz@opensuse.org

8
xf86-video-ati.spec
View File

@ -16,7 +16,7 @@
# #
Name: xf86-video-ati Name: xf86-video-ati
Version: 6.14.3 Version: 6.14.4
Release: 0 Release: 0
License: MIT License: MIT
Summary: ATI video driver for the Xorg X server Summary: ATI video driver for the Xorg X server
@ -24,8 +24,6 @@ Url: http://xorg.freedesktop.org/
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4
Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
Patch0: xf86-video-ati.diff Patch0: xf86-video-ati.diff
Patch1: xf86-video-ati-bug474071-fix2.diff
Patch2: xf86-video-ati-ia64_screen_blank.diff
Patch3: xf86-video-ati-bug519261-increase-virtual.diff Patch3: xf86-video-ati-bug519261-increase-virtual.diff
Patch4: xf86-video-ati-disable-dri-bug437651-ia64only.diff Patch4: xf86-video-ati-disable-dri-bug437651-ia64only.diff
BuildRequires: Mesa-devel BuildRequires: Mesa-devel
@ -43,11 +41,11 @@ BuildRequires: pkgconfig(xf86driproto)
BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: pkgconfig(xorg-macros) >= 1.8
BuildRequires: pkgconfig(xorg-server) >= 1.3 BuildRequires: pkgconfig(xorg-server) >= 1.3
BuildRequires: pkgconfig(xproto) BuildRequires: pkgconfig(xproto)
Requires: VIDEO_ABI_VERSION = 10
Supplements: xorg-x11-server Supplements: xorg-x11-server
# This was part of the xorg-x11-driver-video package up to version 7.6 # This was part of the xorg-x11-driver-video package up to version 7.6
Conflicts: xorg-x11-driver-video <= 7.6 Conflicts: xorg-x11-driver-video <= 7.6
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%x11_abi_videodrv_req
%description %description
ati is an Xorg driver for ATI video cards. ati is an Xorg driver for ATI video cards.
@ -59,8 +57,6 @@ driver as appropriate.
%prep %prep
%setup -q %setup -q
%patch0 %patch0
%patch1 -p2
%patch2 -p2
%patch3 -p1 %patch3 -p1
%ifarch ia64 %ifarch ia64
%patch4 -p1 %patch4 -p1