diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-01-22 21:09:53 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-01-22 21:09:53 +1100 |
| commit | e29a32d711553fcb4ca9928122ac285fe0b0c1a7 (patch) | |
| tree | b6e3c199ffc50d6ed9fff0939859b09584c5bab5 /src/radeon_video.c | |
| parent | aa9d04ba94a3cd60b248231da517e2817591fc69 (diff) | |
add back overlay CRTC chooser this may not work yet
Diffstat (limited to 'src/radeon_video.c')
| -rw-r--r-- | src/radeon_video.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/radeon_video.c b/src/radeon_video.c index f8f29af..9575592 100644 --- a/src/radeon_video.c +++ b/src/radeon_video.c @@ -2749,8 +2749,7 @@ RADEONPutImage( dstBox.y1 = drw_y; dstBox.y2 = drw_y + drw_h; - // if (info->MergedFB) -// RADEONChooseOverlayCRTC(pScrn, &dstBox); + RADEONChooseOverlayCRTC(pScrn, &dstBox); if(!xf86XVClipVideoHelper(&dstBox, &xa, &xb, &ya, &yb, clipBoxes, width, height)) @@ -3112,8 +3111,7 @@ RADEONDisplaySurface( dstBox.y1 = drw_y; dstBox.y2 = drw_y + drw_h; - //if (info->MergedFB) - // RADEONChooseOverlayCRTC(pScrn, &dstBox); + RADEONChooseOverlayCRTC(pScrn, &dstBox); if (!xf86XVClipVideoHelper(&dstBox, &xa, &xb, &ya, &yb, clipBoxes, surface->width, surface->height)) @@ -3253,8 +3251,7 @@ RADEONPutVideo( else vbi_line_width = 2000; /* might need adjustment */ - //if (info->MergedFB) - // RADEONChooseOverlayCRTC(pScrn, &dstBox); + RADEONChooseOverlayCRTC(pScrn, &dstBox); if(!xf86XVClipVideoHelper(&dstBox, &xa, &xb, &ya, &yb, clipBoxes, width, height)) return Success; |