Commit | Line | Data |
---|---|---|
a4edd9ad MB |
1 | Fix build against xorg-server >= 1.20. |
2 | ||
3 | Patch taken from upstream: | |
4 | https://cgit.freedesktop.org/xorg/driver/xf86-video-savage/commit/?id=0ece556daa8a88771b669d8104396abd9166d2d0 | |
5 | ||
6 | diff --git a/src/savage_driver.c b/src/savage_driver.c | |
7 | index 58a294d..3cda923 100644 | |
8 | --- a/src/savage_driver.c | |
9 | +++ b/src/savage_driver.c | |
10 | @@ -2034,8 +2034,6 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) | |
11 | xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected current MCLK value of %1.3f MHz\n", | |
12 | mclk / 1000.0); | |
13 | ||
14 | - pScrn->maxHValue = 2048 << 3; /* 11 bits of h_total 8-pixel units */ | |
15 | - pScrn->maxVValue = 2048; /* 11 bits of v_total */ | |
16 | pScrn->virtualX = pScrn->display->virtualX; | |
17 | pScrn->virtualY = pScrn->display->virtualY; | |
18 | ||
19 | @@ -3637,6 +3635,14 @@ static ModeStatus SavageValidMode(SCRN_ARG_TYPE arg, DisplayModePtr pMode, | |
20 | (pMode->VDisplay > psav->PanelY))) | |
21 | return MODE_PANEL; | |
22 | ||
23 | + /* 11 bits of h_total 8-pixel units */ | |
24 | + if (pMode->HTotal > (2048 << 3)) | |
25 | + return MODE_BAD_HVALUE; | |
26 | + | |
27 | + /* 11 bits of v_total */ | |
28 | + if (pMode->VTotal > 2048) | |
29 | + return MODE_BAD_VVALUE; | |
30 | + | |
31 | if (psav->UseBIOS) { | |
32 | refresh = SavageGetRefresh(pMode); | |
33 | return (SavageMatchBiosMode(pScrn,pMode->HDisplay, |