summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel@tungstengraphics.com>2006-07-02 17:03:23 +0200
committerDave Airlie <airlied@linux.ie>2006-07-05 15:42:30 +1000
commit6ff77d071ce7b30930f696814b4dfc0abe207036 (patch)
tree69b4bbd59850b0a24c852419b59857e6102c03ce
parentb779109051f86b5b8af2359b2b940ac4567d77b9 (diff)
Bug #6939: Disable RENDER acceleration by default on RN50.
Based on patch from Weixing Zhang, but still allows enabling it with Option "RenderAccel". (cherry picked from 11bedb7c845fc6074383890d5525315aebe05f2c commit)
-rw-r--r--src/radeon_driver.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index ffd41d2..68cb0dc 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3012,8 +3012,9 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn)
"Option ShowCache enabled\n");
#ifdef RENDER
- info->RenderAccel = xf86ReturnOptValBool (info->Options,
- OPTION_RENDER_ACCEL, TRUE);
+ info->RenderAccel = xf86ReturnOptValBool(info->Options, OPTION_RENDER_ACCEL,
+ info->Chipset != PCI_CHIP_RN50_515E &&
+ info->Chipset != PCI_CHIP_RN50_5969);
#endif
return TRUE;