xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/modes/xf86EdidModes.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9b7b8720ebc8028b14796a66d0a21b002682a83c
Author: Jeff Smith <whydoubt at gmail.com>
Date:   Sat Jan 27 00:14:02 2018 -0600

    edid: use value returned from pruning duplicate modes
    
    xf86PruneDuplicateModes is passed a linked list of modes, and after
    pruning the duplicate nodes, the new head of the list is returned.  If
    the first element is removed, the head of the list will change and the
    returned value needs to be assigned.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103722
    Thanks: John Lumby <johnlumby at hotmail.com>
    Signed-off-by: Jeff Smith <whydoubt at gmail.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index 5cb09d600..96249ac3a 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -1220,7 +1220,7 @@ xf86EdidMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC)
             Monitor->Modes = Modes;
         }
 
-        xf86PruneDuplicateModes(Monitor->Modes);
+        Monitor->Modes = xf86PruneDuplicateModes(Monitor->Modes);
 
         /* Update pointer to last mode */
         for (Mode = Monitor->Modes; Mode && Mode->next; Mode = Mode->next) {}