[Unichrome-devel] xf86-video-unichrome master branch updated. (3e2dd0af)
Brought to you by:
dwdeath
From: <li...@fr...> - 2010-12-06 16:10:14
|
Reporting from xf86-video-unichrome: Main unichrome.sf.net repository Please visit: http://cgit.freedesktop.org/~libv/xf86-video-unichrome Or get your own copy by using: git-clone git://anongit.freedesktop.org/~libv/xf86-video-unichrome The branch, master has been updated via 3e2dd0a xorg: update to new XvReputImage API via 71f2a86 xorg: remove x from xalloc/xcalloc/xfree symbols from cd12cce ID: VT3371: Belinea C.Book 150x. Summary of changes: configure.ac | 17 ++++++++++++++ src/via_ch7xxx.c | 6 ++-- src/via_crt.c | 4 +- src/via_cursor.c | 12 +++++----- src/via_dri.c | 46 +++++++++++++++++++------------------- src/via_driver.c | 26 +++++++++++----------- src/via_edid.c | 2 +- src/via_memory.c | 8 +++--- src/via_mode.c | 18 +++++++------- src/via_mpeg.c | 2 +- src/via_output.c | 6 ++-- src/via_panel.c | 14 ++++++------ src/via_sii16x.c | 2 +- src/via_video.c | 63 ++++++++++++++++++++++++++++++++++++++++++----------- src/via_vt162x.c | 14 ++++++------ src/via_xvmc.c | 4 +- wrapper/wrapper.c | 2 +- 17 files changed, 150 insertions(+), 96 deletions(-) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 71f2a864d7e9dd58f4f01f36587c765def9d2a97 Author: Luc Verhaegen <li...@sk...> Date: Mon Dec 6 16:48:07 2010 +0100 xorg: remove x from xalloc/xcalloc/xfree symbols These symbols are marked deprecated in newer X versions. Signed-off-by: Luc Verhaegen <li...@sk...> 71f2a864d7e9dd58f4f01f36587c765def9d2a97 diff --git a/src/via_ch7xxx.c b/src/via_ch7xxx.c index a8cbcd9..ed5dfaa 100644 --- a/src/via_ch7xxx.c +++ b/src/via_ch7xxx.c @@ -75,8 +75,8 @@ CH7xxxPrivateDestroy(struct ViaOutput *Output) VIAFUNC(Output); - xfree(Private->Regs); - xfree(Private); + free(Private->Regs); + free(Private); Output->PrivateDestroy = NULL; } @@ -329,7 +329,7 @@ CH7011TVStandardSet(struct ViaOutput *Output, int Standard) VIAFUNC(Output); if (Output->MonitorName) - xfree(Output->MonitorName); + free(Output->MonitorName); Private->Standard = Standard; diff --git a/src/via_crt.c b/src/via_crt.c index 0b6552a..6c79292 100644 --- a/src/via_crt.c +++ b/src/via_crt.c @@ -63,7 +63,7 @@ struct CRTPrivate { static void CRTPrivateDestroy(struct ViaOutput *Output) { - xfree(Output->Private); + free(Output->Private); /* So we won't try to destroy this twice */ Output->PrivateDestroy = NULL; @@ -157,7 +157,7 @@ CRTGetOptions(struct ViaOutput *Output) } } - xfree(Options); + free(Options); return NULL; } diff --git a/src/via_cursor.c b/src/via_cursor.c index 58f77df..b4207a8 100644 --- a/src/via_cursor.c +++ b/src/via_cursor.c @@ -307,7 +307,7 @@ VIACursorInit(ScrnInfoPtr pScrn, ScreenPtr pScreen) if (!xf86InitCursor(pScreen, infoPtr)) { xf86DestroyCursorInfoRec(infoPtr); - xfree(Cursor); + free(Cursor); return NULL; } @@ -333,9 +333,9 @@ VIACursorDestroy(VIAPtr pVia) xf86DestroyCursorInfoRec(Cursor->Info); if (Cursor->Image) - xfree(Cursor->Image); + free(Cursor->Image); - xfree(Cursor); + free(Cursor); pVia->Cursor = NULL; } @@ -354,10 +354,10 @@ VIACursorStore(VIAPtr pVia) if (Cursor->Image) { xf86DrvMsg(pVia->scrnIndex, X_WARNING, "%s: stale image left.\n", __func__); - xfree(Cursor->Image); + free(Cursor->Image); } - Cursor->Image = xcalloc(1, Cursor->Size); + Cursor->Image = calloc(1, Cursor->Size); memcpy(Cursor->Image, pVia->FBBase + Cursor->Address, Cursor->Size); Cursor->FG = (CARD32)VIAGETREG(VIA_REG_CURSOR_FG); @@ -385,7 +385,7 @@ VIACursorRestore(VIAPtr pVia) VIASETREG(VIA_REG_CURSOR_BG, Cursor->BG); VIASETREG(VIA_REG_CURSOR_MODE, Cursor->MC); - xfree(Cursor->Image); + free(Cursor->Image); Cursor->Image = NULL; } else xf86DrvMsg(pVia->scrnIndex, X_ERROR, "%s: No cursor image stored.\n", __func__); diff --git a/src/via_dri.c b/src/via_dri.c index efdb94d..d7104b8 100644 --- a/src/via_dri.c +++ b/src/via_dri.c @@ -253,7 +253,7 @@ VIADRICloseScreen(ScrnInfoPtr pScrn, ScreenPtr pScreen) if (pDri->pDRIInfo) { if ((pVIADRI = (VIADRIPtr) pDri->pDRIInfo->devPrivate)) { VIADRIIrqExit(pVia, pVIADRI); - xfree(pVIADRI); + free(pVIADRI); pDri->pDRIInfo->devPrivate = NULL; } DRIDestroyInfoRec(pDri->pDRIInfo); @@ -261,15 +261,15 @@ VIADRICloseScreen(ScrnInfoPtr pScrn, ScreenPtr pScreen) } if (pDri->pVisualConfigs) { - xfree(pDri->pVisualConfigs); + free(pDri->pVisualConfigs); pDri->pVisualConfigs = NULL; } if (pDri->pVisualConfigsPriv) { - xfree(pDri->pVisualConfigsPriv); + free(pDri->pVisualConfigsPriv); pDri->pVisualConfigsPriv = NULL; } - xfree(pDri); + free(pDri); pVia->Dri = NULL; } @@ -292,18 +292,18 @@ VIAInitVisualConfigs(ScrnInfoPtr pScrn) break; case 16: numConfigs = 12; - if (!(pConfigs = (__GLXvisualConfig*)xcalloc(sizeof(__GLXvisualConfig), + if (!(pConfigs = (__GLXvisualConfig*)calloc(sizeof(__GLXvisualConfig), numConfigs))) return FALSE; - if (!(pVIAConfigs = (VIAConfigPrivPtr)xcalloc(sizeof(VIAConfigPrivRec), + if (!(pVIAConfigs = (VIAConfigPrivPtr)calloc(sizeof(VIAConfigPrivRec), numConfigs))) { - xfree(pConfigs); + free(pConfigs); return FALSE; } - if (!(pVIAConfigPtrs = (VIAConfigPrivPtr*)xcalloc(sizeof(VIAConfigPrivPtr), + if (!(pVIAConfigPtrs = (VIAConfigPrivPtr*)calloc(sizeof(VIAConfigPrivPtr), numConfigs))) { - xfree(pConfigs); - xfree(pVIAConfigs); + free(pConfigs); + free(pVIAConfigs); return FALSE; } for (i=0; i<numConfigs; i++) @@ -392,18 +392,18 @@ VIAInitVisualConfigs(ScrnInfoPtr pScrn) case 32: numConfigs = 12; - if (!(pConfigs = (__GLXvisualConfig*)xcalloc(sizeof(__GLXvisualConfig), + if (!(pConfigs = (__GLXvisualConfig*)calloc(sizeof(__GLXvisualConfig), numConfigs))) return FALSE; - if (!(pVIAConfigs = (VIAConfigPrivPtr)xcalloc(sizeof(VIAConfigPrivRec), + if (!(pVIAConfigs = (VIAConfigPrivPtr)calloc(sizeof(VIAConfigPrivRec), numConfigs))) { - xfree(pConfigs); + free(pConfigs); return FALSE; } - if (!(pVIAConfigPtrs = (VIAConfigPrivPtr*)xcalloc(sizeof(VIAConfigPrivPtr), + if (!(pVIAConfigPtrs = (VIAConfigPrivPtr*)calloc(sizeof(VIAConfigPrivPtr), numConfigs))) { - xfree(pConfigs); - xfree(pVIAConfigs); + free(pConfigs); + free(pVIAConfigs); return FALSE; } for (i=0; i<numConfigs; i++) @@ -701,7 +701,7 @@ VIADRIScreenInit(ScrnInfoPtr pScrn, ScreenPtr pScreen) if (!pDri->pDRIInfo) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR,\ "%s: DRICreateInfoRec failed.\n", __func__); - xfree(pDri); + free(pDri); return FALSE; } @@ -709,7 +709,7 @@ VIADRIScreenInit(ScrnInfoPtr pScrn, ScreenPtr pScreen) pDRIInfo->drmDriverName = VIAKernelDriverName; pDRIInfo->clientDriverName = VIAClientDriverName; - pDRIInfo->busIdString = xalloc(64); + pDRIInfo->busIdString = malloc(64); sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d", PCI_BUS(pVia->PciInfo), PCI_DEV(pVia->PciInfo), PCI_FUNC(pVia->PciInfo)); @@ -748,17 +748,17 @@ VIADRIScreenInit(ScrnInfoPtr pScrn, ScreenPtr pScreen) if ((sizeof(XF86DRISAREARec) + sizeof(drm_via_sarea_t)) > SAREA_MAX) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Data does not fit in SAREA\n"); DRIDestroyInfoRec(pDri->pDRIInfo); - xfree(pDri); + free(pDri); return FALSE; } pDRIInfo->SAREASize = SAREA_MAX; #endif - if (!(pVIADRI = (VIADRIPtr)xcalloc(sizeof(VIADRIRec),1))) { + if (!(pVIADRI = (VIADRIPtr)calloc(sizeof(VIADRIRec),1))) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s: failed to allocate pVIADRI.\n", __func__); DRIDestroyInfoRec(pDri->pDRIInfo); - xfree(pDri); + free(pDri); return FALSE; } pDRIInfo->devPrivate = pVIADRI; @@ -775,10 +775,10 @@ VIADRIScreenInit(ScrnInfoPtr pScrn, ScreenPtr pScreen) if (!DRIScreenInit(pScreen, pDRIInfo, &pVia->drmFD)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "[dri] DRIScreenInit failed. Disabling DRI.\n"); - xfree(pDRIInfo->devPrivate); + free(pDRIInfo->devPrivate); pDRIInfo->devPrivate = NULL; DRIDestroyInfoRec(pDri->pDRIInfo); - xfree(pDri); + free(pDri); pVia->drmFD = -1; return FALSE; } diff --git a/src/via_driver.c b/src/via_driver.c index a83cbed..4750b8e 100644 --- a/src/via_driver.c +++ b/src/via_driver.c @@ -469,27 +469,27 @@ VIAFreeRec(ScrnInfoPtr pScrn) if (pVia->Crtc[0]) { if (pVia->Crtc[0]->Name) - xfree(pVia->Crtc[0]->Name); - xfree(pVia->Crtc[0]); + free(pVia->Crtc[0]->Name); + free(pVia->Crtc[0]); } if (pVia->Crtc[1]) { if (pVia->Crtc[1]->Name) - xfree(pVia->Crtc[1]->Name); - xfree(pVia->Crtc[1]); + free(pVia->Crtc[1]->Name); + free(pVia->Crtc[1]); } ViaOutputsDestroy(pScrn->scrnIndex); if (pVia->Scratch) - xfree(pVia->Scratch); + free(pVia->Scratch); if (pVia->SavedReg.VGAFB) - xfree(pVia->SavedReg.VGAFB); + free(pVia->SavedReg.VGAFB); VIAUnmapMem(pScrn); - xfree(pScrn->driverPrivate); + free(pScrn->driverPrivate); pScrn->driverPrivate = NULL; } @@ -670,7 +670,7 @@ VIAProbe(DriverPtr drv, int flags) numUsed = xf86MatchPciInstances("unichrome", PCI_VENDOR_VIA, VIAChipsets, VIAPciChipsets, devSections, numDevSections, drv, &usedChips); - xfree(devSections); + free(devSections); if (numUsed <= 0) return FALSE; @@ -692,7 +692,7 @@ VIAProbe(DriverPtr drv, int flags) } } - xfree(usedChips); + free(usedChips); return foundScreen; } @@ -1129,7 +1129,7 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags) { EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[0]); if (pEnt->resources) { - xfree(pEnt); + free(pEnt); VIAFreeRec(pScrn); return FALSE; } @@ -1139,7 +1139,7 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags) pVia->ChipId = pVia->PciInfo->chipType; pVia->Chipset = pEnt->chipset; pScrn->chipset = (char *)xf86TokenToString(VIAChipsets, pVia->Chipset); - xfree(pEnt); + free(pEnt); } #endif @@ -2395,7 +2395,7 @@ VIAInternalScreenInit(ScrnInfoPtr pScrn, ScreenPtr pScreen) if (pVia->AccelMethod == VIA_ACCEL_SHADOWFB) { pVia->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width); - pVia->ShadowPtr = xalloc(pVia->ShadowPitch * height); + pVia->ShadowPtr = xnfcalloc(1, pVia->ShadowPitch * height); displayWidth = pVia->ShadowPitch / (pScrn->bitsPerPixel >> 3); FBStart = pVia->ShadowPtr; } else { @@ -2500,7 +2500,7 @@ VIACloseScreen(int scrnIndex, ScreenPtr pScreen) } if (pVia->ShadowPtr) { - xfree(pVia->ShadowPtr); + free(pVia->ShadowPtr); pVia->ShadowPtr = NULL; } diff --git a/src/via_edid.c b/src/via_edid.c index f5354c2..c6b07dd 100644 --- a/src/via_edid.c +++ b/src/via_edid.c @@ -283,7 +283,7 @@ ViaOutputEDIDSet(struct ViaOutput *Output, xf86MonPtr EDID) Modes = ViaModesAdd(Modes, Mode); break; case DS_NAME: - xfree(Output->MonitorName); + free(Output->MonitorName); Output->MonitorName = xnfcalloc(13, 1); memcpy(Output->MonitorName, EDID->det_mon[i].section.name, 13); break; diff --git a/src/via_memory.c b/src/via_memory.c index 8fa9d33..ca43f79 100644 --- a/src/via_memory.c +++ b/src/via_memory.c @@ -69,7 +69,7 @@ ViaMemFBFree(ScrnInfoPtr pScrn, struct ViaMem *Mem) xf86FreeOffscreenLinear((FBLinearPtr) Mem->Private); - /* sick bastards manually xfree this Private, + /* sick bastards manually free this Private, normal people know better */ } @@ -141,7 +141,7 @@ ViaMemDRMFree(ScrnInfoPtr pScrn, struct ViaMem *Mem) xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s: Failed to deallocate Memory.\n", __func__); - xfree((drm_via_mem_t *) Mem->Private); + free((drm_via_mem_t *) Mem->Private); } /* @@ -168,7 +168,7 @@ ViaMemDRMAlloc(ScrnInfoPtr pScrn, unsigned long size, CARD8 alignment) sizeof(drm_via_mem_t)); if (ret || (DrmMem->size != (size + alignment))) { - xfree(DrmMem); + free(DrmMem); return NULL; } @@ -244,6 +244,6 @@ ViaMemFree(ScrnInfoPtr pScrn, struct ViaMem *Mem) if (Mem->Free) Mem->Free(pScrn, Mem); - xfree(Mem); + free(Mem); } } diff --git a/src/via_mode.c b/src/via_mode.c index dc435ed..07e7e1f 100644 --- a/src/via_mode.c +++ b/src/via_mode.c @@ -92,7 +92,7 @@ ViaPrintModeline(int scrnIndex, DisplayModePtr mode) mode->HSyncStart, mode->HSyncEnd, mode->HTotal, mode->VDisplay, mode->VSyncStart, mode->VSyncEnd, mode->VTotal, flags); - xfree(flags); + free(flags); } #if 0 @@ -473,8 +473,8 @@ ViaModesDestroy(DisplayModePtr Modes) while (mode) { next = mode->next; - xfree(mode->name); - xfree(mode); + free(mode->name); + free(mode); mode = next; } } @@ -924,8 +924,8 @@ ViaCreateModesListAndValidate(ScrnInfoPtr pScrn, Bool Silent) "(%dx%d:%3.1fMhz): %s\n", Mode->name, Mode->HDisplay, Mode->VDisplay, Mode->Clock / 1000.0, ViaModeStatusToString(Status)); - xfree(Mode->name); - xfree(Mode); + free(Mode->name); + free(Mode); } } @@ -1162,7 +1162,7 @@ ViaModeCreateFromName(ScrnInfoPtr pScrn, char *name, Bool Silent) /* First, try a plain CVT mode */ Mode = ViaCVTMode(HDisplay, VDisplay, VRefresh, Reduced, FALSE); - xfree(Mode->name); + free(Mode->name); Mode->name = xnfstrdup(name); Mode->type = M_T_USERDEF; @@ -1178,7 +1178,7 @@ ViaModeCreateFromName(ScrnInfoPtr pScrn, char *name, Bool Silent) continue; Mode = ViaModeCopy(Crtc->FixedMode); - xfree(Mode->name); + free(Mode->name); Mode->name = xnfstrdup(name); Mode->type = M_T_USERDEF; @@ -1278,8 +1278,8 @@ ViaModeFixedInitCrtc(struct ViaCrtc *Crtc) "(%dx%d:%3.1fMhz): %s\n", Mode->name, Mode->HDisplay, Mode->VDisplay, Mode->Clock / 1000.0, ViaModeStatusToString(Status)); - xfree(Mode->name); - xfree(Mode); + free(Mode->name); + free(Mode); } } diff --git a/src/via_mpeg.c b/src/via_mpeg.c index 131b1dd..a8a9f4d 100644 --- a/src/via_mpeg.c +++ b/src/via_mpeg.c @@ -581,6 +581,6 @@ ViaMpegDestroy(ScrnInfoPtr pScrn) ViaMpegStop(pScrn); - xfree(Swov->Mpeg); + free(Swov->Mpeg); Swov->Mpeg = NULL; } diff --git a/src/via_output.c b/src/via_output.c index 8eee3d2..48093ac 100644 --- a/src/via_output.c +++ b/src/via_output.c @@ -69,12 +69,12 @@ ViaOutputDestroy(struct ViaOutput *Output) xf86DestroyI2CDevRec(Output->I2CDev, TRUE); if (Output->Options) - xfree(Output->Options); + free(Output->Options); if (Output->MonitorName) - xfree(Output->MonitorName); + free(Output->MonitorName); - xfree(Output); + free(Output); return Next; } diff --git a/src/via_panel.c b/src/via_panel.c index 3b24a6d..2c1e7d7 100644 --- a/src/via_panel.c +++ b/src/via_panel.c @@ -58,7 +58,7 @@ struct ViaPanelOutputPrivate { static void ViaPanelPrivateDestroy(struct ViaOutput *Output) { - xfree(Output->Private); + free(Output->Private); /* So we won't try to destroy this twice */ Output->PrivateDestroy = NULL; @@ -497,16 +497,16 @@ ViaPanelInit(int scrnIndex, I2CDevPtr pDev) } else { Output->PrivateDestroy(Output); - xfree(Output->Options); - xfree(Output); + free(Output->Options); + free(Output); return NULL; } if (!ViaPanelNativeResolution(pVia, Private)) { xf86DrvMsg(scrnIndex, X_ERROR, "%s: Disabling panel.\n", __func__); Output->PrivateDestroy(Output); - xfree(Output->Options); - xfree(Output); + free(Output->Options); + free(Output); return NULL; } @@ -536,8 +536,8 @@ ViaPanelInit(int scrnIndex, I2CDevPtr pDev) default: xf86DrvMsg(scrnIndex, X_WARNING, "%s: Unsupported chipset.\n", __func__); Output->PrivateDestroy(Output); - xfree(Output->Options); - xfree(Output); + free(Output->Options); + free(Output); return NULL; } diff --git a/src/via_sii16x.c b/src/via_sii16x.c index f933088..2f33f03 100644 --- a/src/via_sii16x.c +++ b/src/via_sii16x.c @@ -65,7 +65,7 @@ struct SiI16xOutputPrivate { static void SiI16xPrivateDestroy(struct ViaOutput *Output) { - xfree(Output->Private); + free(Output->Private); Output->PrivateDestroy = NULL; } diff --git a/src/via_video.c b/src/via_video.c index 1933dd8..fc8670d 100644 --- a/src/via_video.c +++ b/src/via_video.c @@ -315,7 +315,7 @@ ViaSwovCopyDMA(VIAPtr pVia, struct ViaMem *Mem, CARD8 *buf) xf86DrvMsg(pVia->scrnIndex, X_ERROR, "%s: Copying %p to %08X\n", __func__, blit.mem_addr, blit.fb_addr); if (new_buf) - xfree(new_buf); + free(new_buf); return FALSE; } @@ -331,7 +331,7 @@ ViaSwovCopyDMA(VIAPtr pVia, struct ViaMem *Mem, CARD8 *buf) } if (new_buf) - xfree(new_buf); + free(new_buf); if (error) { xf86DrvMsg(pVia->scrnIndex, X_ERROR, "%s: DMA copy sync failed: %d - %d\n", @@ -750,7 +750,7 @@ ViaSwovAlphaSurface(ScrnInfoPtr pScrn) if (Port->AlphaFB) ViaMemFree(pScrn, Port->AlphaFB); if (Port->AlphaLocalUnaligned) - xfree(Port->AlphaLocalUnaligned); + free(Port->AlphaLocalUnaligned); Port->AlphaFB = ViaMemAlloc(pScrn, (Port->AlphaWidth / 2) * Port->AlphaHeight, VIA_ALPHAADDRESS_ALIGN); @@ -816,7 +816,7 @@ ViaSwovAlphaDisable(ScrnInfoPtr pScrn) Port->AlphaFB = NULL; if (Port->AlphaLocalUnaligned) - xfree(Port->AlphaLocalUnaligned); + free(Port->AlphaLocalUnaligned); Port->AlphaLocalUnaligned = NULL; Port->AlphaLocal = NULL; @@ -1316,7 +1316,7 @@ ViaSwovSurfaceDestroy(ScrnInfoPtr pScrn) if (Port->AlphaFB) ViaMemFree(pScrn, Port->AlphaFB); if (Port->AlphaLocalUnaligned) - xfree(Port->AlphaLocalUnaligned); + free(Port->AlphaLocalUnaligned); Port->Front[0] = NULL; Port->Front[1] = NULL; @@ -2640,8 +2640,8 @@ ViaVideoDestroy(ScrnInfoPtr pScrn) #endif /* Now tear down the wallpaper */ - xfree(Swov->Adaptors); - xfree(Swov->Adaptor->pPortPrivates); + free(Swov->Adaptors); + free(Swov->Adaptor->pPortPrivates); xf86XVFreeVideoAdaptorRec(Swov->Adaptor); switch (pVia->Chipset) { @@ -2653,8 +2653,8 @@ ViaVideoDestroy(ScrnInfoPtr pScrn) break; } - xfree(Swov->Port); - xfree(Swov); + free(Swov->Port); + free(Swov); pVia->Swov = NULL; } diff --git a/src/via_vt162x.c b/src/via_vt162x.c index 182baf4..45a9983 100644 --- a/src/via_vt162x.c +++ b/src/via_vt162x.c @@ -78,8 +78,8 @@ VT162xPrivateDestroy(struct ViaOutput *Output) { struct VT162xOutputPrivate *Private = Output->Private; - xfree(Private->Regs); - xfree(Private); + free(Private->Regs); + free(Private); Output->PrivateDestroy = NULL; } @@ -349,7 +349,7 @@ VT1621TVStandardSet(struct ViaOutput *Output, int Standard) VIAFUNC(Output); if (Output->MonitorName) - xfree(Output->MonitorName); + free(Output->MonitorName); Private->Standard = Standard; @@ -447,7 +447,7 @@ VT1622TVStandardSet(struct ViaOutput *Output, int Standard) VIAFUNC(Output); if (Output->MonitorName) - xfree(Output->MonitorName); + free(Output->MonitorName); Private->Standard = Standard; @@ -495,7 +495,7 @@ VT1623TVStandardSet(struct ViaOutput *Output, int Standard) VIAFUNC(Output); if (Output->MonitorName) - xfree(Output->MonitorName); + free(Output->MonitorName); Private->Standard = Standard; @@ -856,7 +856,7 @@ ViaVT162xInit(int scrnIndex, I2CDevPtr pDev) Output->PrivateDestroy(Output); - xfree(Output->Options); - xfree(Output); + free(Output->Options); + free(Output); return NULL; } diff --git a/src/via_xvmc.c b/src/via_xvmc.c index 3b68f86..494393c 100644 --- a/src/via_xvmc.c +++ b/src/via_xvmc.c @@ -357,7 +357,7 @@ static void XvMCEClose(ExtensionEntry *XvMCE_Ext) { if (XvMCE_Ext->extPrivate) { - xfree(XvMCE_Ext->extPrivate); + free(XvMCE_Ext->extPrivate); XvMCE_Ext->extPrivate = NULL; } } @@ -555,7 +555,7 @@ ViaMCBrokenXine(int scrnIndex) ret = xf86ReturnOptValBool(Options, OPTION_BROKENXINE, FALSE); - xfree(Options); + free(Options); return ret; } diff --git a/wrapper/wrapper.c b/wrapper/wrapper.c index a443165..ecbebf8 100644 --- a/wrapper/wrapper.c +++ b/wrapper/wrapper.c @@ -112,7 +112,7 @@ WRAP_REPLACE(Setup)( for (i = 0; i < count; i++) gdevs[i]->driver = "unichrome"; - xfree(gdevs); + free(gdevs); } xf86LoadOneModule("unichrome", options); ----------------------------------------------------------------------- commit 3e2dd0afb9719295454d8d879d6f5ffde0755253 Author: Luc Verhaegen <li...@sk...> Date: Mon Dec 6 16:49:30 2010 +0100 xorg: update to new XvReputImage API Now we might get called not only for changing frame or clipping, but also for changing modes. Handle this accordingly. Signed-off-by: Luc Verhaegen <li...@sk...> 3e2dd0afb9719295454d8d879d6f5ffde0755253 diff --git a/configure.ac b/configure.ac index d7fcb01..f30691d 100644 --- a/configure.ac +++ b/configure.ac @@ -129,6 +129,23 @@ fi AC_MSG_RESULT([$have_xv]) AM_CONDITIONAL(XV, test x$have_xv = xyes) +# check whether reputimage gained some extra arguments +if test "x$have_xv" = xyes; then + SAVED_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $XORG_CFLAGS" + + AC_CHECK_MEMBER([ScrnInfoRec.ModeSet], + [SCRNINFO_HAS_MODESET=yes], [SCRNINFO_HAS_MODESET=no], + [#include "${sdkdir}/xf86str.h"]) + if test "x$SCRNINFO_HAS_MODESET" = xyes; then + AC_DEFINE(XV_NEW_REPUT, 1, + [XvReputImage takes more all coordinates]) + fi + + CFLAGS="$SAVED_CFLAGS" +fi +AM_CONDITIONAL(XV_NEW_REPUT, test x$XV_NEW_REPUT = xyes) + # Check what parts of XvMC are around. AC_MSG_CHECKING([XvMC protocol headers directory]) xvmcprotodir=$(pkg-config --variable=includedir xvmc) diff --git a/src/via_video.c b/src/via_video.c index fc8670d..6c27683 100644 --- a/src/via_video.c +++ b/src/via_video.c @@ -2130,12 +2130,22 @@ viaPutImage(ScrnInfoPtr pScrn, short src_x, short src_y, short drw_x, } /* - * This doesn't fix the case where the overlay window was not - * in the visible frame when switching away. That one requires - * some DIX poking. + * For the code inside XV_NEW_REPUT: + * A modeset might have happened, without updating the clients, so without + * updating fb contents. This is why this code is different. The scaling might + * have changed, forcing us to recalculate drw_ values. The src_ values are + * unchanged for reputimage (atm), and for our hardware we only need to + * recalculate the scaling. */ static int -ViaSwovReputImage(ScrnInfoPtr pScrn, short drw_x, short drw_y, +ViaSwovReputImage(ScrnInfoPtr pScrn, +#ifdef XV_NEW_REPUT + short src_x, short src_y, +#endif + short drw_x, short drw_y, +#ifdef XV_NEW_REPUT + short src_w, short src_h, short drw_w, short drw_h, +#endif RegionPtr clipBoxes, pointer data #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 1 , DrawablePtr pDraw @@ -2161,6 +2171,32 @@ ViaSwovReputImage(ScrnInfoPtr pScrn, short drw_x, short drw_y, ViaHQVIdle(Swov); +#ifdef XV_NEW_REPUT + /* Handle CRTC scaling */ + if (pVia->VisibleWidth < pVia->ScaledWidth) { + drw_w = (drw_w * pVia->ScaledWidth) / pVia->VisibleWidth; + drw_x = (drw_x * pVia->ScaledWidth) / pVia->VisibleWidth; + } + if (pVia->VisibleHeight < pVia->ScaledHeight) { + drw_h = (drw_h * pVia->ScaledHeight) / pVia->VisibleHeight; + drw_y = (drw_y * pVia->ScaledHeight) / pVia->VisibleHeight; + } + + /* FrameAdjust is usually in only a single direction */ + if ((pScrn->frameX0 != Swov->frameX0) || (drw_x != Port->Drw_X) || + (drw_w != Port->Drw_W)) { + Port->Drw_X = drw_x; + Port->Drw_W = drw_w; + HVisible = ViaSwovVisibleH(pScrn, Swov->Port); + } + + if ((pScrn->frameY0 != Swov->frameY0) || (drw_y != Port->Drw_Y) || + (drw_h != Port->Drw_H)) { + Port->Drw_Y = drw_y; + Port->Drw_H = drw_h; + VVisible = ViaSwovVisibleV(pScrn, Swov->Port); + } +#else /* Handle CRTC scaling */ if (pVia->VisibleWidth < pVia->ScaledWidth) drw_x = (drw_x * pVia->ScaledWidth) / pVia->VisibleWidth; @@ -2177,6 +2213,7 @@ ViaSwovReputImage(ScrnInfoPtr pScrn, short drw_x, short drw_y, Port->Drw_Y = drw_y; VVisible = ViaSwovVisibleV(pScrn, Swov->Port); } +#endif if (HVisible && VVisible) { ViaSwovStartAddress(Swov, Swov->Port); ----------------------------------------------------------------------- |