summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2010-04-08 00:31:52 -0400
committerAlex Deucher <alexdeucher@gmail.com>2010-04-08 00:31:52 -0400
commiteb5665688ef9b52f03f61546351d0848cab54740 (patch)
tree287f09fadfe4b0157bd0e0fbaf157f8a3f261c53 /src
parent3c6c6afcbfc6f2c582e13a7c37fe2014b0875b22 (diff)
radeon: don't setup Xv on rn50
It has no overlay or 3D engine. fixes fdo bug 27528
Diffstat (limited to 'src')
-rw-r--r--src/radeon_video.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/radeon_video.c b/src/radeon_video.c
index 8f0917f5..5e2a7238 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -271,10 +271,14 @@ void RADEONInitVideo(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
RADEONInfoPtr info = RADEONPTR(pScrn);
+ RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
XF86VideoAdaptorPtr overlayAdaptor = NULL, texturedAdaptor = NULL;
int num_adaptors;
+ /* no overlay or 3D on RN50 */
+ if (info->ChipFamily == CHIP_FAMILY_RV100 && !pRADEONEnt->HasCRTC2)
+ return;
num_adaptors = xf86XVListGenericAdaptors(pScrn, &adaptors);
newAdaptors = xalloc((num_adaptors + 2) * sizeof(XF86VideoAdaptorPtr *));