xserver: Branch 'master' - 3 commits

[GitLab Mirror]

 hw/vfb/InitOutput.c |   48 ++++++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

New commits:
commit 82225aab81d581e943c67c679695a1d15757d69d
Author: Ignacio Casal Quinteiro <qignacio at amazon.com>
Date:   Wed Jul 17 14:45:46 2019 +0200

    vfb: set gamma size to avoid xrandr to complain about it missing

diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 2f0f4f07d..f36752fc1 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -833,6 +833,9 @@ vfbRandRInit(ScreenPtr pScreen)
     if (!crtc)
        return FALSE;
 
+    /* This is to avoid xrandr to complain about the gamma missing */
+    RRCrtcGammaSetSize (crtc, 256);
+
     output = RROutputCreate (pScreen, "screen", 6, NULL);
     if (!output)
        return FALSE;
commit 492639f5e167b12ef81c4e4fa0e6a2749cbfe3a0
Author: Ignacio Casal Quinteiro <qignacio at amazon.com>
Date:   Wed Jul 17 14:39:29 2019 +0200

    vfb: factor out method to free a single screen info

diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index f4b48fa6a..2f0f4f07d 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -156,22 +156,16 @@ vfbBitsPerPixel(int depth)
         return 32;
 }
 
-void
-ddxGiveUp(enum ExitCode error)
+static void
+freeScreenInfo(vfbScreenInfoPtr pvfb)
 {
-    int i;
-
-    /* clean up the framebuffers */
-
     switch (fbmemtype) {
 #ifdef HAVE_MMAP
     case MMAPPED_FILE_FB:
-        for (i = 0; i < vfbNumScreens; i++) {
-            if (-1 == unlink(vfbScreens[i].mmap_file)) {
-                perror("unlink");
-                ErrorF("unlink %s failed, %s",
-                       vfbScreens[i].mmap_file, strerror(errno));
-            }
+        if (-1 == unlink(pvfb->mmap_file)) {
+            perror("unlink");
+            ErrorF("unlink %s failed, %s",
+                   pvfb->mmap_file, strerror(errno));
         }
         break;
 #else                           /* HAVE_MMAP */
@@ -181,11 +175,9 @@ ddxGiveUp(enum ExitCode error)
 
 #ifdef HAS_SHM
     case SHARED_MEMORY_FB:
-        for (i = 0; i < vfbNumScreens; i++) {
-            if (-1 == shmdt((char *) vfbScreens[i].pXWDHeader)) {
-                perror("shmdt");
-                ErrorF("shmdt failed, %s", strerror(errno));
-            }
+        if (-1 == shmdt((char *) pvfb->pXWDHeader)) {
+            perror("shmdt");
+            ErrorF("shmdt failed, %s", strerror(errno));
         }
         break;
 #else                           /* HAS_SHM */
@@ -194,13 +186,22 @@ ddxGiveUp(enum ExitCode error)
 #endif                          /* HAS_SHM */
 
     case NORMAL_MEMORY_FB:
-        for (i = 0; i < vfbNumScreens; i++) {
-            free(vfbScreens[i].pXWDHeader);
-        }
+        free(pvfb->pXWDHeader);
         break;
     }
 }
 
+void
+ddxGiveUp(enum ExitCode error)
+{
+    int i;
+
+    /* clean up the framebuffers */
+    for (i = 0; i < vfbNumScreens; i++) {
+        freeScreenInfo(&vfbScreens[i]);
+    }
+}
+
 #ifdef __APPLE__
 void
 DarwinHandleGUI(int argc, char *argv[])
commit 356ffd6729861bc9d0cd059fd8a99d7135fe50dd
Author: Ignacio Casal Quinteiro <qignacio at amazon.com>
Date:   Wed Jul 17 14:18:47 2019 +0200

    vfb: no need for else if we are returning

diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 240903b8e..f4b48fa6a 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -627,8 +627,8 @@ vfbAllocateFramebufferMemory(vfbScreenInfoPtr pvfb)
 
         return pvfb->pfbMemory;
     }
-    else
-        return NULL;
+
+    return NULL;
 }
 
 static void