diff options
| author | Kevin Brace <kevinbrace@gmx.com> | 2020-03-09 19:23:03 -0700 |
|---|---|---|
| committer | Kevin Brace <kevinbrace@gmx.com> | 2020-03-09 19:23:03 -0700 |
| commit | 38145b14fa0a6f387d1338db6d99911cd11b4504 (patch) | |
| tree | dc6be94a999e55e379e2bcc9dda32c947139cead | |
| parent | a245948a455de13719ac6db13608b6cecad186de (diff) | |
Add viaUMSDestroy() for tearing down UMS specific resources
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
| -rw-r--r-- | src/via_driver.c | 6 | ||||
| -rw-r--r-- | src/via_ums.c | 15 | ||||
| -rw-r--r-- | src/via_ums.h | 2 |
3 files changed, 17 insertions, 6 deletions
diff --git a/src/via_driver.c b/src/via_driver.c index 6920f67..171eccd 100644 --- a/src/via_driver.c +++ b/src/via_driver.c @@ -405,8 +405,7 @@ VIAFreeScreen(FREE_SCREEN_ARGS_DECL) } if (!pVia->KMS) { - viaUnmapFB(pScrn); - viaUnmapMMIO(pScrn); + viaUMSDestroy(pScrn); } VIAFreeRec(pScrn); @@ -1404,8 +1403,7 @@ VIACloseScreen(CLOSE_SCREEN_ARGS_DECL) #endif if (!pVia->KMS) { - viaUnmapFB(pScrn); - viaUnmapMMIO(pScrn); + viaUMSDestroy(pScrn); } pScrn->vtSema = FALSE; diff --git a/src/via_ums.c b/src/via_ums.c index f1c19ef..e3979a9 100644 --- a/src/via_ums.c +++ b/src/via_ums.c @@ -367,7 +367,7 @@ exit: return ret; } -void +static void viaUnmapFB(ScrnInfoPtr pScrn) { VIAPtr pVia = VIAPTR(pScrn); @@ -846,6 +846,19 @@ exit: return ret; } +void +viaUMSDestroy(ScrnInfoPtr pScrn) +{ + DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Entered %s.\n", __func__)); + + viaUnmapFB(pScrn); + viaUnmapMMIO(pScrn); + + DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Exiting %s.\n", __func__)); +} + static Bool viaProbeVRAM(ScrnInfoPtr pScrn) { diff --git a/src/via_ums.h b/src/via_ums.h index 017c1ec..e4822e2 100644 --- a/src/via_ums.h +++ b/src/via_ums.h @@ -1557,10 +1557,10 @@ viaSetDisplayScaling(ScrnInfoPtr pScrn, Bool scalingState) /* via_ums.c */ void viaUnmapMMIO(ScrnInfoPtr pScrn); -void viaUnmapFB(ScrnInfoPtr pScrn); void viaDisableVQ(ScrnInfoPtr pScrn); Bool viaUMSAccelInit(ScreenPtr pScreen); Bool viaUMSCreate(ScrnInfoPtr pScrn); +void viaUMSDestroy(ScrnInfoPtr pScrn); Bool viaUMSPreInit(ScrnInfoPtr pScrn); Bool viaUMSCrtcInit(ScrnInfoPtr pScrn); |