xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/drivers/modesetting/driver.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ac138f9b31b0fba00742edbc3326afe66e28099a
Author: Rinat Ibragimov <ibragimovrinat at mail.ru>
Date:   Tue Oct 24 01:43:43 2017 +0300

    modesetting: setup colormap
    
    Signed-off-by: Rinat Ibragimov <ibragimovrinat at mail.ru>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
index 380dbbe17..e057970a6 100644
--- a/hw/xfree86/drivers/modesetting/driver.c
+++ b/hw/xfree86/drivers/modesetting/driver.c
@@ -1656,7 +1656,7 @@ ScreenInit(ScreenPtr pScreen, int argc, char **argv)
     if (!xf86CrtcScreenInit(pScreen))
         return FALSE;
 
-    if (!miCreateDefColormap(pScreen))
+    if (!drmmode_setup_colormap(pScreen, pScrn))
         return FALSE;
 
     xf86DPMSInit(pScreen, xf86DPMSSet, 0);