xf86-video-ati: Branch 'master'

[Stefan Dirsch]

On Fri, Nov 23, 2007 at 04:00:21PM -0500, James Cloos wrote:
> The commit below is bogus.
> 
> I've been using render acceleration on an M7 LW for many months;
> it works perfectly.
> 
> (I confirmed that the PCI_CHIP_RADEON_LW symbol does match my
> card's pci id.)
> 
> (I have been having other problems since the switch to pci-rework,
> but render accell is not the issue.)

Since you read the git commit ML I'm assuming that you saw also the
commit by Dave Airlie, which reverted my change after applying the fix
by Adam Jackson.

----------------------------------------------------------------------

commit 197a62704742a4a19736c2637ac92d1dc5ab34ed
Author: Adam Jackson <ajackson at redhat.com>
Date:   Thu Nov 22 20:26:23 2007 +1000

    radeon: fix openoffice/render bug on r100 chips

commit 64010fc4eae8359c01e430f64252931242c91435
Author: Dave Airlie <airlied at linux.ie>
Date:   Thu Nov 22 20:25:31 2007 +1000

    Revert "Disable RENDER acceleration by default on some RV200 chips."
    
    This reverts commit 145da701bf4fb9c0ad9f95620b20914ae0126852.
    
    pull in fix from ajax next commit

----------------------------------------------------------------------

Best regards,
Stefan

> ,----
> |  src/radeon_driver.c |    4 +++-
> |  1 file changed, 3 insertions(+), 1 deletion(-)
> | 
> | New commits:
> | commit 145da701bf4fb9c0ad9f95620b20914ae0126852
> | Author: Stefan Dirsch <sndirsch at suse.de>
> | Date:   Thu Nov 22 08:38:09 2007 +0100
> | 
> |     Disable RENDER acceleration by default on some RV200 chips.
> |     
> |     Novell Bug #341699: Render acceleration is known to be broken
> |     on at least "Radeon 7500 QW" and "Radeon Mobility M7 LW".
> | 
> | diff --git a/src/radeon_driver.c b/src/radeon_driver.c
> | index c55b5a5..c939a5c 100644
> | --- a/src/radeon_driver.c
> | +++ b/src/radeon_driver.c
> | @@ -1704,7 +1704,9 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn)
> |  #ifdef RENDER
> |      info->RenderAccel = xf86ReturnOptValBool(info->Options, OPTION_RENDER_ACCEL,
> |  					     info->Chipset != PCI_CHIP_RN50_515E &&
> | -					     info->Chipset != PCI_CHIP_RN50_5969);
> | +					     info->Chipset != PCI_CHIP_RN50_5969 &&
> | +					     info->Chipset != PCI_CHIP_RV200_QW &&
> | +					     info->Chipset != PCI_CHIP_RADEON_LW);
> |  #endif
> |  
> |      return TRUE;
> `----
> -- 
> James Cloos <cloos at jhcloos.com>         OpenPGP: 1024D/ED7DAEA6

Public Key available
------------------------------------------------------
Stefan Dirsch (Res. & Dev.)   SUSE LINUX Products GmbH
Tel: 0911-740 53 0            Maxfeldstraße 5
FAX: 0911-740 53 479          D-90409 Nürnberg
http://www.suse.de            Germany 
-----------------------------------------------------------------
SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG Nürnberg)
-----------------------------------------------------------------