xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 hw/xfree86/drivers/modesetting/drmmode_display.c |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 5b9010fa6b0ab0971dddf5108d5a5046c05180b0
Author: Yuriy Vasilev <uuvasiliev at yandex.ru>
Date:   Fri Mar 6 20:22:19 2020 +0300

    modesetting: add support for GBM_FORMAT_ARGB1555
    
    Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>
    Signed-off-by: Yuriy Vasilev <uuvasiliev at yandex.ru>

diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index fe1b43d06..8e6b697c4 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -1022,12 +1022,20 @@ drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,
 #endif
         uint32_t format;
 
-        if (drmmode->scrn->depth == 30)
-            format = GBM_FORMAT_ARGB2101010;
-        else if (drmmode->scrn->depth == 16)
+        switch (drmmode->scrn->depth) {
+        case 15:
+            format = GBM_FORMAT_ARGB1555;
+            break;
+        case 16:
             format = GBM_FORMAT_RGB565;
-        else
+            break;
+        case 30:
+            format = GBM_FORMAT_ARGB2101010;
+            break;
+        default:
             format = GBM_FORMAT_ARGB8888;
+            break;
+        }
 
 #ifdef GBM_BO_WITH_MODIFIERS
         num_modifiers = get_modifiers_set(drmmode->scrn, format, &modifiers,
commit 8315fc4ea2e04598ce0c7e9771786a9334f0d456
Author: Yuriy Vasilev <uuvasiliev at yandex.ru>
Date:   Thu Mar 5 17:02:26 2020 +0300

    modesetting: add support for GBM_FORMAT_RGB565
    
    This allow x-server to run with -depth 16.
    
    Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>
    Signed-off-by: Yuriy Vasilev <uuvasiliev at yandex.ru>

diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index 27ad75049..fe1b43d06 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -1024,6 +1024,8 @@ drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,
 
         if (drmmode->scrn->depth == 30)
             format = GBM_FORMAT_ARGB2101010;
+        else if (drmmode->scrn->depth == 16)
+            format = GBM_FORMAT_RGB565;
         else
             format = GBM_FORMAT_ARGB8888;