diff options
Diffstat (limited to 'src/radeon_video.c')
| -rw-r--r-- | src/radeon_video.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/radeon_video.c b/src/radeon_video.c index 0ba7d82..a14f44c 100644 --- a/src/radeon_video.c +++ b/src/radeon_video.c @@ -284,7 +284,7 @@ void RADEONInitVideo(ScreenPtr pScreen) memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr)); adaptors = newAdaptors; - if (!IS_AVIVO_VARIANT && !info->kms_enabled) { + if (!IS_AVIVO_VARIANT) { overlayAdaptor = RADEONSetupImageVideo(pScreen); if (overlayAdaptor != NULL) { adaptors[num_adaptors++] = overlayAdaptor; @@ -308,13 +308,6 @@ void RADEONInitVideo(ScreenPtr pScreen) } else xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Textured video requires CP on R5xx/R6xx/R7xx/IGP\n"); -#ifdef RADEON_XVMC - if (radeon_hwmc_probe(pScrn)) - { - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Probe Radeon XvMC driver\n"); - } -#endif - if(num_adaptors) xf86XVScreenInit(pScreen, adaptors, num_adaptors); @@ -1655,6 +1648,10 @@ RADEONStopVideo(ScrnInfoPtr pScrn, pointer data, Bool cleanup) if (pPriv->textured) { if (cleanup) { + if (pPriv->bicubic_memory != NULL) { + radeon_legacy_free_memory(pScrn, pPriv->bicubic_memory); + pPriv->bicubic_memory = NULL; + } if (pPriv->video_memory != NULL) { radeon_legacy_free_memory(pScrn, pPriv->video_memory); pPriv->video_memory = NULL; |