diff options
| author | Kevin Brace <kevinbrace@gmx.com> | 2020-02-10 11:48:53 -0800 |
|---|---|---|
| committer | Kevin Brace <kevinbrace@gmx.com> | 2020-02-10 11:48:53 -0800 |
| commit | cd25726ec7f591463ee30a33ba36b5c92e8d8bdf (patch) | |
| tree | 981e548ab3018f85481ea3201f8f6c5e7d4adc26 /src | |
| parent | cfa4de3dd89682bfa481267de00a398fa2d6bf65 (diff) | |
Initialize driSize member of VIARec struct inside VIADRI1ScreenInit()
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/via_dri.c | 7 | ||||
| -rw-r--r-- | src/via_ums.c | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/via_dri.c b/src/via_dri.c index e0f049a..ec46fa0 100644 --- a/src/via_dri.c +++ b/src/via_dri.c @@ -618,6 +618,13 @@ VIADRI1ScreenInit(ScreenPtr pScreen) return FALSE; } + if ((pVia->driSize > (pVia->maxDriSize * 1024)) && + (pVia->maxDriSize > 0)) { + pVia->driSize = pVia->maxDriSize * 1024; + } else { + pVia->driSize = (pVia->FBFreeEnd - pVia->FBFreeStart) >> 2; + } + if (!(VIAInitVisualConfigs(pScreen))) { VIADRICloseScreen(pScreen); return FALSE; diff --git a/src/via_ums.c b/src/via_ums.c index 3d1a3a9..1ddd74b 100644 --- a/src/via_ums.c +++ b/src/via_ums.c @@ -698,10 +698,6 @@ viaUMSCreate(ScrnInfoPtr pScrn) #ifdef HAVE_DRI if (pVia->directRenderingType == DRI_1) { - pVia->driSize = (pVia->FBFreeEnd - pVia->FBFreeStart) >> 2; - if ((pVia->driSize > (pVia->maxDriSize * 1024)) && pVia->maxDriSize > 0) - pVia->driSize = pVia->maxDriSize * 1024; - /* In the case of DRI we handle all VRAM by the DRI ioctls */ if (pVia->useEXA) goto exit; |