From a5d052e4e7e7e89c50d1286ac7536a5ad53f2e47 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Tue, 30 Apr 2019 01:45:05 +0000 Subject: Convert a linux specific test for master in currently disabled code. --- sys/dev/pci/drm/drm_fb_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/pci/drm/drm_fb_helper.c b/sys/dev/pci/drm/drm_fb_helper.c index 785ed969911..63897e9f5ee 100644 --- a/sys/dev/pci/drm/drm_fb_helper.c +++ b/sys/dev/pci/drm/drm_fb_helper.c @@ -2007,7 +2007,7 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper, /* First time: disable all crtc's.. */ #ifdef notyet /* XXX calling this hangs boot with no connected outputs */ - if (!fb_helper->deferred_setup /* && !READ_ONCE(fb_helper->dev->master) */) + if (!fb_helper->deferred_setup /* && SPLAY_EMPTY(fb_helper->dev->files) */) restore_fbdev_mode(fb_helper); #endif return -EAGAIN; -- cgit v1.2.3