On Thu, 2018-04-05 at 18:01 +0200, Olivier Fourdan wrote: > > On 5 April 2018 at 17:47, Daniel Stone <dani...@collabora.com> wrote: > > 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 <dani...@collabora.com> > > Reported-by: Olivier Fourdan <ofour...@redhat.com> > > --- > > hw/xfree86/drivers/modesetting/drmmode_display.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > 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) { > > -- > > 2.16.3 > > > > > > > LGTM, Thanks! > > Tested-by: Olivier Fourdan <ofour...@redhat.com> > Reviewed-by: Olivier Fourdan <ofour...@redhat.com>
Merged: remote: I: patch #215199 updated using rev 99f9b077c62e14ba955b9c1f7afda47f7799d317. remote: I: 1 patch(es) updated to state Accepted. To ssh://git.freedesktop.org/git/xorg/xserver 8ff1cdb2bf..99f9b077c6 master -> master - ajax _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel