Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=469243ab18cc5ab6ce02bedfb15420637f472198
commit 469243ab18cc5ab6ce02bedfb15420637f472198 Author: Krisztian VASAS <[email protected]> Date: Fri Jan 2 10:39:04 2009 +0100 xf86-video-ati-6.9.0.91-1-i686 - version bump - added some patches diff --git a/source/x11/xf86-video-ati/01-fix_for_xorg_bug_19269.patch1 b/source/x11/xf86-video-ati/01-fix_for_xorg_bug_19269.patch1 new file mode 100644 index 0000000..f664ae6 --- /dev/null +++ b/source/x11/xf86-video-ati/01-fix_for_xorg_bug_19269.patch1 @@ -0,0 +1,65 @@ +diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c +index c285109..39c987c 100644 +--- a/src/radeon_exa_render.c ++++ b/src/radeon_exa_render.c +@@ -324,7 +324,7 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict, int unit) + * see 197a62704742a4a19736c2637ac92d1dc5ab34ed + */ + +- if ((w > 2047) || (h > 2047)) ++ if ((w > 2048) || (h > 2048)) + RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h)); + + for (i = 0; i < sizeof(R100TexFormats) / sizeof(R100TexFormats[0]); i++) { +@@ -643,7 +643,11 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict, int unit) + int h = pPict->pDrawable->height; + int i; + +- if ((w > 2048) || (h > 2048)) ++ /* r200 limit should be 2048, there are issues with 2048 ++ * see bug 19269 ++ */ ++ ++ if ((w > 2047) || (h > 2047)) + RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h)); + + for (i = 0; i < sizeof(R200TexFormats) / sizeof(R200TexFormats[0]); i++) +@@ -768,10 +772,14 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP + if (!pSrcPicture->pDrawable) + return FALSE; + ++ /* r200 limit should be 2048, there are issues with 2048 ++ * see bug 19269 ++ */ ++ + pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); + +- if (pSrcPixmap->drawable.width > 2048 || +- pSrcPixmap->drawable.height > 2048) { ++ if (pSrcPixmap->drawable.width > 2047 || ++ pSrcPixmap->drawable.height > 2047) { + RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", + pSrcPixmap->drawable.width, + pSrcPixmap->drawable.height)); +@@ -779,8 +787,8 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP + + pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable); + +- if (pDstPixmap->drawable.width > 2048 || +- pDstPixmap->drawable.height > 2048) { ++ if (pDstPixmap->drawable.width > 2047 || ++ pDstPixmap->drawable.height > 2047) { + RADEON_FALLBACK(("Dest w/h too large (%d,%d).\n", + pDstPixmap->drawable.width, + pDstPixmap->drawable.height)); +@@ -789,8 +797,8 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP + if (pMaskPicture) { + PixmapPtr pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); + +- if (pMaskPixmap->drawable.width > 2048 || +- pMaskPixmap->drawable.height > 2048) { ++ if (pMaskPixmap->drawable.width > 2047 || ++ pMaskPixmap->drawable.height > 2047) { + RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", + pMaskPixmap->drawable.width, + pMaskPixmap->drawable.height)); diff --git a/source/x11/xf86-video-ati/02-include_radeon_drm.h_in_tarball.patch1 b/source/x11/xf86-video-ati/02-include_radeon_drm.h_in_tarball.patch1 new file mode 100644 index 0000000..66fd400 --- /dev/null +++ b/source/x11/xf86-video-ati/02-include_radeon_drm.h_in_tarball.patch1 @@ -0,0 +1,12 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index a13bfad..c15cc30 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -134,6 +134,7 @@ EXTRA_DIST = \ + generic_bus.h \ + radeon_commonfuncs.c \ + radeon_dri.h \ ++ radeon_drm.h \ + radeon_exa_render.c \ + radeon_exa_funcs.c \ + radeon.h \ diff --git a/source/x11/xf86-video-ati/03-radeon-a-bit_motherboard_has_no_dvi.patch1 b/source/x11/xf86-video-ati/03-radeon-a-bit_motherboard_has_no_dvi.patch1 new file mode 100644 index 0000000..4b4a99e --- /dev/null +++ b/source/x11/xf86-video-ati/03-radeon-a-bit_motherboard_has_no_dvi.patch1 @@ -0,0 +1,18 @@ +diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c +index 3cd7eae..b674a41 100644 +--- a/src/radeon_atombios.c ++++ b/src/radeon_atombios.c +@@ -1530,6 +1530,13 @@ static void RADEONApplyATOMQuirks(ScrnInfoPtr pScrn, int index) + info->BiosConnector[index].ConnectorType = CONNECTOR_DVI_D; + } + } ++ /* a-bit f-i90hd - ciaranm on #radeonhd - this board has no DVI */ ++ if ((info->Chipset == PCI_CHIP_RS600_7941) && ++ (PCI_SUB_VENDOR_ID(info->PciInfo) == 0x147b) && ++ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x2412)) { ++ if (info->BiosConnector[index].ConnectorType == CONNECTOR_DVI_I) ++ info->BiosConnector[index].valid = FALSE; ++ } + + /* Falcon NW laptop lists vga ddc line for LVDS */ + if ((info->Chipset == PCI_CHIP_RV410_5653) && diff --git a/source/x11/xf86-video-ati/04-rs600_remove_gpio_quirk_for_ddc.patch1 b/source/x11/xf86-video-ati/04-rs600_remove_gpio_quirk_for_ddc.patch1 new file mode 100644 index 0000000..52c4b9f --- /dev/null +++ b/source/x11/xf86-video-ati/04-rs600_remove_gpio_quirk_for_ddc.patch1 @@ -0,0 +1,14 @@ +diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c +index b674a41..43f2c18 100644 +--- a/src/radeon_atombios.c ++++ b/src/radeon_atombios.c +@@ -2049,8 +2049,7 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn) + (i == ATOM_DEVICE_TV2_INDEX) || + (i == ATOM_DEVICE_CV_INDEX)) + info->BiosConnector[i].ddc_i2c.valid = FALSE; +- else if ((info->ChipFamily == CHIP_FAMILY_RS600) || +- (info->ChipFamily == CHIP_FAMILY_RS690) || ++ else if ((info->ChipFamily == CHIP_FAMILY_RS690) || + (info->ChipFamily == CHIP_FAMILY_RS740)) { + /* IGP DFP ports use non-standard gpio entries */ + if ((i == ATOM_DEVICE_DFP2_INDEX) || (i == ATOM_DEVICE_DFP3_INDEX)) diff --git a/source/x11/xf86-video-ati/05-atombios_endian_fix_for_r600.patch1 b/source/x11/xf86-video-ati/05-atombios_endian_fix_for_r600.patch1 new file mode 100644 index 0000000..e71cbf6 --- /dev/null +++ b/source/x11/xf86-video-ati/05-atombios_endian_fix_for_r600.patch1 @@ -0,0 +1,15 @@ +diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c +index 43f2c18..1ca9f86 100644 +--- a/src/radeon_atombios.c ++++ b/src/radeon_atombios.c +@@ -1644,8 +1644,8 @@ RADEONGetATOMConnectorInfoFromBIOSObject (ScrnInfoPtr pScrn) + for (j = 0; j < SrcDstTable->ucNumberOfSrc; j++) { + uint8_t sobj_id; + +- sobj_id = (SrcDstTable->usSrcObjectID[j] & OBJECT_ID_MASK) >> OBJECT_ID_SHIFT; +- ErrorF("src object id %04x %d\n", SrcDstTable->usSrcObjectID[j], sobj_id); ++ sobj_id = (le16_to_cpu(SrcDstTable->usSrcObjectID[j]) & OBJECT_ID_MASK) >> OBJECT_ID_SHIFT; ++ ErrorF("src object id %04x %d\n", le16_to_cpu(SrcDstTable->usSrcObjectID[j]), sobj_id); + + switch(sobj_id) { + case ENCODER_OBJECT_ID_INTERNAL_LVDS: diff --git a/source/x11/xf86-video-ati/06-man_page_update.patch1 b/source/x11/xf86-video-ati/06-man_page_update.patch1 new file mode 100644 index 0000000..1b36033 --- /dev/null +++ b/source/x11/xf86-video-ati/06-man_page_update.patch1 @@ -0,0 +1,58 @@ +diff --git a/man/radeon.man b/man/radeon.man +index 19ffb94..3bc3a56 100644 +--- a/man/radeon.man ++++ b/man/radeon.man +@@ -25,14 +25,17 @@ Full support for 8, 15, 16 and 24 bit pixel depths; + RandR 1.2 and RandR 1.3 support; + .TP + \(bu +-TV Out support (only on R/RV/RS1xx, R/RV/RS2xx, R/RV/RS3xx); ++TV-out support (only on R/RV/RS1xx, R/RV/RS2xx, R/RV/RS3xx. Experimental ++support on R/RV5xx, R/RV6xx, and R/RV7xx through the ++.B ATOMTvOut ++option); + .TP + \(bu + Full EXA 2D acceleration (not supported on R/RV6xx and R/RV/RS7xx); + .TP + \(bu + Full XAA 2D acceleration (not supported on R/RV6xx and R/RV/RS7xx. XAA Render +-acceleration supported only on R/RV100, R/RV/RS2xx and RS300); ++acceleration supported only on R/RV100, R/RV/RS2xx and RS3xx); + .TP + \(bu + Textured XVideo acceleration (not supported on R/RV6xx and R/RV/RS7xx. +@@ -151,6 +154,12 @@ Radeon HD 3450/3470 + .B RS780 + Radeon HD 3100/3200/3300 + .TP 12 ++.B RV710 ++Radeon HD 4350/4550 ++.TP 12 ++.B RV730 ++Radeon HD 4650/4670 ++.TP 12 + .B RV770 + Radeon HD 4850/4870 + .PD +@@ -325,7 +334,7 @@ parameter may be specified as a float value with standard suffixes like + .BI "Option \*qRenderAccel\*q \*q" boolean \*q + Enables or disables hardware Render acceleration. It is supported on all + Radeon cards when using EXA acceleration and on Radeon R/RV/RS1xx, +-R/RV/RS2xx and RS300 when usig XAA. The default is to ++R/RV/RS2xx and RS3xx when usig XAA. The default is to + .B enable + Render acceleration. + .TP +@@ -552,8 +561,9 @@ The default is + .B off. + .TP + .BI "Option \*qATOMTvOut\*q \*q" boolean \*q +-This option enables experimental TV-out support for r500 and r600 atombios chips. +-tv-out is experimental and may not function on these chips as well as hoped for. ++This option enables experimental TV-out support for R/RV5xx, R/RV6xx, and R/RV7xx ++atombios chips. TV-out is experimental and may not function on these chips as ++well as hoped for. + The default is + .B off. + diff --git a/source/x11/xf86-video-ati/07-r2xx_another_agp_quirk.patch1 b/source/x11/xf86-video-ati/07-r2xx_another_agp_quirk.patch1 new file mode 100644 index 0000000..b6d05d8 --- /dev/null +++ b/source/x11/xf86-video-ati/07-r2xx_another_agp_quirk.patch1 @@ -0,0 +1,14 @@ +diff --git a/src/radeon_dri.c b/src/radeon_dri.c +index 7c317e6..c0200f1 100644 +--- a/src/radeon_dri.c ++++ b/src/radeon_dri.c +@@ -763,6 +763,9 @@ static radeon_agpmode_quirk radeon_agpmode_quirk_list[] = { + /* VIA K8M800 Host Bridge / RV280 [Radeon 9200 PRO] Needs AGPMode 4 (fdo #12544) */ + { 0x1106,0x0204, PCI_VENDOR_ATI,0x5960, 0x17af,0x2020, 4 }, + ++ /* ATI Host Bridge / RV280 [M9+] Needs AGPMode 1 (phoronix forum) */ ++ { 0x1002,0xcbb2, PCI_VENDOR_ATI,0x5c61, 0x104d,0x8175, 1 }, ++ + { 0, 0, 0, 0, 0, 0, 0 }, + }; + diff --git a/source/x11/xf86-video-ati/FrugalBuild b/source/x11/xf86-video-ati/FrugalBuild index a745408..80948af 100644 --- a/source/x11/xf86-video-ati/FrugalBuild +++ b/source/x11/xf86-video-ati/FrugalBuild @@ -2,18 +2,33 @@ # Maintainer: Christian Hamar alias krix <[email protected]> pkgname=xf86-video-ati -pkgver=6.8.0 -pkgrel=2 +pkgver=6.9.0.91 +pkgrel=1 pkgdesc="X.Org driver for ATI cards" url="http://xorg.freedesktop.org"; groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64' 'ppc') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') # to help upgraders. can be removed after 0.9 is out -rodepends=('xf86-video-mach64' 'xf86-video-r128') +#rodepends=('xf86-video-mach64' 'xf86-video-r128') makedepends=('xproto' 'randrproto' 'renderproto' 'xf86driproto' 'videoproto' 'xf86miscproto' 'xineramaproto' 'glproto') Finclude xorg -sha1sums=('b6974237b6ae9b45b32fc37f31a3fee7358230d3') +source=(${sour...@]} \ + '01-fix_for_xorg_bug_19269.patch1' \ + '02-include_radeon_drm.h_in_tarball.patch1' \ + '03-radeon-a-bit_motherboard_has_no_dvi.patch1' \ + '04-rs600_remove_gpio_quirk_for_ddc.patch1' \ + '05-atombios_endian_fix_for_r600.patch1' \ + '06-man_page_update.patch1' \ + '07-r2xx_another_agp_quirk.patch1') +sha1sums=('710827ccbf2ad3660fde9ad9a8aab91b7820af54' \ + '40ce82693a9accba06797d8e59e55a316227b4e2' \ + '6e152a35edb54dde946bf0ebfaf9e1a88564ee23' \ + '52caae2104d1a4b0719c07b3ebf6c4630bc6f180' \ + '7aee4b52f9a529e49dc441a6c65c874615a8ff4f' \ + '6fef6b50e278a8bac24fdaa0f29474a5a5a832a9' \ + 'f7ac25d0705e3d9514ebddbf0eccd60933787b8e' \ + '9118c8dd958117cad2712d95a7898c6c0e9d3f7e') Fconfopts="$Fconfopts --enable-dri" # NOTE: TVout interface not available on x86_64 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
