xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/common/xf86Mode.c |   17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

New commits:
commit 6d468c68d6feb55d15e69ddea8fcec6d9d648ae3
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Apr 5 16:03:34 2022 -0700

    xfree86: finish removing numTimings in xf86ValidateModes()
    
    Finishes the work started in commit cd0d4c1bb54b809100444e6efc1f161054c43a8b
    to remove checks for the variable that never varied from 0 after the code
    to change it was removed by commit 511c60bc7399b07c267d686a969880e5ec92408a
    in 2006 (xorg-server-1.2.0).
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c
index 4a0623c49..16dd529e3 100644
--- a/hw/xfree86/common/xf86Mode.c
+++ b/hw/xfree86/common/xf86Mode.c
@@ -1352,8 +1352,6 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
     int saveType;
     PixmapFormatRec *BankFormat;
     ClockRangePtr cp;
-    const int numTimings = 0;
-    range vrefresh[MAX_VREFRESH];
     Bool inferred_virtual = FALSE;
 
     DebugF
@@ -1416,18 +1414,9 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
 
         type = "";
         if (scrp->monitor->nVrefresh <= 0) {
-            if (numTimings > 0) {
-                scrp->monitor->nVrefresh = numTimings;
-                for (i = 0; i < numTimings; i++) {
-                    scrp->monitor->vrefresh[i].lo = vrefresh[i].lo;
-                    scrp->monitor->vrefresh[i].hi = vrefresh[i].hi;
-                }
-            }
-            else {
-                scrp->monitor->vrefresh[0].lo = 50;
-                scrp->monitor->vrefresh[0].hi = 70;
-                scrp->monitor->nVrefresh = 1;
-            }
+            scrp->monitor->vrefresh[0].lo = 50;
+            scrp->monitor->vrefresh[0].hi = 70;
+            scrp->monitor->nVrefresh = 1;
             type = "default ";
         }
         else {