diff options
author | Kevin Brace <kevinbrace@gmx.com> | 2020-02-13 16:09:01 -0800 |
---|---|---|
committer | Kevin Brace <kevinbrace@gmx.com> | 2020-02-13 16:09:01 -0800 |
commit | 6393d955b7fe946d19a6fb6853c13c3c0a2e5a5d (patch) | |
tree | dbe34e934f8723d8d0f2d8290d0941dd9a05f524 /src | |
parent | b1ac666462c2987777dfab5d7fd998c7a9d843df (diff) |
Rearrange some code inside viaUMSCreate()
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/via_ums.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/via_ums.c b/src/via_ums.c index d0a9c12..799f8c6 100644 --- a/src/via_ums.c +++ b/src/via_ums.c @@ -763,8 +763,21 @@ viaUMSCreate(ScrnInfoPtr pScrn) VIAPtr pVia = VIAPTR(pScrn); Bool ret = TRUE; + DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Entered %s.\n", __func__)); + + if (pVia->directRenderingType == DRI_NONE) { + if (!pVia->useEXA) { + if (!viaInitFB(pScrn)) { + ret = FALSE; + } + } else { + if (!viaInitExa(pScrn->pScreen)) { + ret = FALSE; + } + } #ifdef HAVE_DRI - if (pVia->directRenderingType == DRI_1) { + } else if (pVia->directRenderingType == DRI_1) { if (!VIADRIKernelInit(pScrn)) { ret = FALSE; goto exit; @@ -776,21 +789,12 @@ viaUMSCreate(ScrnInfoPtr pScrn) goto exit; } } - } else #endif - { - if (!pVia->useEXA) { - if (!viaInitFB(pScrn)) { - ret = FALSE; - } - } else { - if (!viaInitExa(pScrn->pScreen)) { - ret = FALSE; - } - } } exit: + DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Exiting %s.\n", __func__)); return ret; } |