Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix hot-plug with small patch from upstream before a full update.

Browse Source
This commit is contained in:
riastradh 2014-04-25 19:07:55 +00:00
parent 22b20e4adc
commit 8e210af663
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/external/bsd/drm2/dist/drm/drm_fb_helper.c vendored
View File

@ -40,6 +40,7 @@
#include <linux/notifier.h>
#include <linux/printk.h>
#include <linux/sysrq.h>
#include <asm/bug.h>
#include <drm/drmP.h>
#include <drm/drm_crtc.h>
#include <drm/drm_fb_helper.h>
@ -1331,6 +1332,7 @@ static void drm_setup_crtcs(struct drm_fb_helper *fb_helper)
for (i = 0; i < fb_helper->crtc_count; i++) {
modeset = &fb_helper->crtc_info[i].mode_set;
modeset->num_connectors = 0;
modeset->fb = NULL;
}
for (i = 0; i < fb_helper->connector_count; i++) {
@ -1350,6 +1352,18 @@ static void drm_setup_crtcs(struct drm_fb_helper *fb_helper)
}
}
/* Clear out any old modes if there are no more connected outputs. */
for (i = 0; i < fb_helper->crtc_count; i++) {
modeset = &fb_helper->crtc_info[i].mode_set;
if (modeset->num_connectors == 0) {
BUG_ON(modeset->fb);
BUG_ON(modeset->num_connectors);
if (modeset->mode)
drm_mode_destroy(dev, modeset->mode);
modeset->mode = NULL;
fb_helper->crtc_info[i].desired_mode = NULL;
}
}
out:
kfree(crtcs);
kfree(modes);