xserver: Branch 'master'

[Adam Jackson]

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

New commits:
commit 99f9b077c62e14ba955b9c1f7afda47f7799d317
Author: Daniel Stone <daniels at collabora.com>
Date:   Thu Apr 5 16:47:39 2018 +0100

    modesetting: Actually get framebuffer ID
    
    We would fail to get the FB ID if it wasn't already imported, since we
    were checking to see if the pointer was NULL (it never was) rather than
    if the content of the pointer was 0.
    
    Signed-off-by: Daniel Stone <daniels at collabora.com>
    Reported-by: Olivier Fourdan <ofourdan at redhat.com>
    Tested-by: Olivier Fourdan <ofourdan at redhat.com>
    Reviewed-by: Olivier Fourdan <ofourdan at redhat.com>

diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index cdcd4f3f3..322ef050b 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -624,7 +624,7 @@ drmmode_crtc_get_fb_id(xf86CrtcPtr crtc, uint32_t *fb_id, int *x, int *y)
         *y = crtc->y;
     }
 
-    if (fb_id == 0) {
+    if (*fb_id == 0) {
         ret = drmmode_bo_import(drmmode, &drmmode->front_bo,
                                 &drmmode->fb_id);
         if (ret < 0) {