43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
|
From 0ece556daa8a88771b669d8104396abd9166d2d0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Stefan Dirsch <sndirsch@suse.de>
|
||
|
|
Date: Mon, 25 Jun 2018 15:55:06 +0200
|
||
|
|
Subject: [PATCH] Add check for max[HV]Value to ValidMode hook
|
||
|
|
|
||
|
|
xorg-server 1.20 removed this check, so implement this in the driver
|
||
|
|
itself.
|
||
|
|
|
||
|
|
Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
|
||
|
|
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
|
||
|
|
---
|
||
|
|
src/savage_driver.c | 10 ++++++++--
|
||
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/savage_driver.c b/src/savage_driver.c
|
||
|
|
index 58a294d..3cda923 100644
|
||
|
|
--- a/src/savage_driver.c
|
||
|
|
+++ b/src/savage_driver.c
|
||
|
|
@@ -2034,8 +2034,6 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
|
||
|
|
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected current MCLK value of %1.3f MHz\n",
|
||
|
|
mclk / 1000.0);
|
||
|
|
|
||
|
|
- pScrn->maxHValue = 2048 << 3; /* 11 bits of h_total 8-pixel units */
|
||
|
|
- pScrn->maxVValue = 2048; /* 11 bits of v_total */
|
||
|
|
pScrn->virtualX = pScrn->display->virtualX;
|
||
|
|
pScrn->virtualY = pScrn->display->virtualY;
|
||
|
|
|
||
|
|
@@ -3637,6 +3635,14 @@ static ModeStatus SavageValidMode(SCRN_ARG_TYPE arg, DisplayModePtr pMode,
|
||
|
|
(pMode->VDisplay > psav->PanelY)))
|
||
|
|
return MODE_PANEL;
|
||
|
|
|
||
|
|
+ /* 11 bits of h_total 8-pixel units */
|
||
|
|
+ if (pMode->HTotal > (2048 << 3))
|
||
|
|
+ return MODE_BAD_HVALUE;
|
||
|
|
+
|
||
|
|
+ /* 11 bits of v_total */
|
||
|
|
+ if (pMode->VTotal > 2048)
|
||
|
|
+ return MODE_BAD_VVALUE;
|
||
|
|
+
|
||
|
|
if (psav->UseBIOS) {
|
||
|
|
refresh = SavageGetRefresh(pMode);
|
||
|
|
return (SavageMatchBiosMode(pScrn,pMode->HDisplay,
|