Fri Oct 7 15:43:38 2016 UTC ()

CID 1373515: check return value.


(christos)

diff -r1.1.1.1 -r1.2 xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c

--- xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c 2016/08/10 07:44:34	1.1.1.1
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c 2016/10/07 15:43:38	1.2

 @@ -664,31 +664,35 @@ drmmode_set_scanout_pixmap_cpu(xf86CrtcP
     ppriv = msGetPixmapPriv(drmmode, ppix);
     if (!drmmode_crtc->slave_damage) {
         drmmode_crtc->slave_damage = DamageCreate(NULL, NULL,
                                                   DamageReportNone,
                                                   TRUE,
                                                   crtc->randr_crtc->pScreen,
                                                   NULL);
+    }
     ptr = drmmode_map_slave_bo(drmmode, ppriv);
     ppix->devPrivate.ptr = ptr;
     DamageRegister(&ppix->drawable, drmmode_crtc->slave_damage);
     if (ppriv->fb_id == 0) {
-        drmModeAddFB(drmmode->fd, ppix->drawable.width,
+        int ret = drmModeAddFB(drmmode->fd, ppix->drawable.width,
                      ppix->drawable.height,
                      ppix->drawable.depth,
                      ppix->drawable.bitsPerPixel,
                      ppix->devKind, ppriv->backing_bo->handle, &ppriv->fb_id);
 	if (ret) {
 	    ErrorF("failed to set scanout pixmap cpu\n");
 	    return FALSE;
+	}
+    }
     return TRUE;
+}
 static Bool
 drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
+{
     drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
     drmmode_ptr drmmode = drmmode_crtc->drmmode;
     if (drmmode->reverse_prime_offload_mode)
         return drmmode_set_scanout_pixmap_gpu(crtc, ppix);
     else