norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

main: pick up non-FBDEV_DRM devices without --fbdev

Browse Source 
Now that we can differentiate between fbdev-DRM and normal fbdev devices,
we can just pick up the normal fbdev devices by default.

--fbdev now makes kmscon use the FBDEV_DRM devices instead of pure DRM.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-09-21 14:31:27 +02:00
parent 02ddaaeb9f
commit 6b500b39e9
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main.c
View File

@ -203,8 +203,20 @@ static void seat_add_video(struct kmscon_seat *seat,
unsigned int mode; unsigned int mode;
struct kmscon_video *vid; struct kmscon_video *vid;
if ((type == UTERM_MONITOR_FBDEV) != !!kmscon_conf.use_fbdev) if (kmscon_conf.use_fbdev) {
if (type != UTERM_MONITOR_FBDEV &&
type != UTERM_MONITOR_FBDEV_DRM) {
log_debug("ignoring %s as it is not fbdev device",
node);
return; return;
}
} else {
if (type == UTERM_MONITOR_FBDEV_DRM) {
log_debug("ignoring %s as it is a DRM-fbdev device",
node);
return;
}
}
vid = malloc(sizeof(*vid)); vid = malloc(sizeof(*vid));
if (!vid) if (!vid)
@ -212,12 +224,14 @@ static void seat_add_video(struct kmscon_seat *seat,
memset(vid, 0, sizeof(*vid)); memset(vid, 0, sizeof(*vid));
vid->vdev = dev; vid->vdev = dev;
if (kmscon_conf.use_fbdev) if (type == UTERM_MONITOR_DRM) {
mode = UTERM_VIDEO_FBDEV; if (kmscon_conf.dumb)
else if (kmscon_conf.dumb)
mode = UTERM_VIDEO_DUMB; mode = UTERM_VIDEO_DUMB;
else else
mode = UTERM_VIDEO_DRM; mode = UTERM_VIDEO_DRM;
} else {
mode = UTERM_VIDEO_FBDEV;
}
ret = uterm_video_new(&vid->video, seat->app->eloop, mode, node); ret = uterm_video_new(&vid->video, seat->app->eloop, mode, node);
if (ret) { if (ret) {
@ -304,7 +318,8 @@ static void monitor_event(struct uterm_monitor *mon,
if (!seat) if (!seat)
break; break;
if (ev->dev_type == UTERM_MONITOR_DRM || if (ev->dev_type == UTERM_MONITOR_DRM ||
ev->dev_type == UTERM_MONITOR_FBDEV) ev->dev_type == UTERM_MONITOR_FBDEV ||
ev->dev_type == UTERM_MONITOR_FBDEV_DRM)
seat_add_video(seat, ev->dev, ev->dev_type, seat_add_video(seat, ev->dev, ev->dev_type,
ev->dev_node); ev->dev_node);
else if (ev->dev_type == UTERM_MONITOR_INPUT) else if (ev->dev_type == UTERM_MONITOR_INPUT)
@ -315,7 +330,8 @@ static void monitor_event(struct uterm_monitor *mon,
if (!seat) if (!seat)
break; break;
if (ev->dev_type == UTERM_MONITOR_DRM || if (ev->dev_type == UTERM_MONITOR_DRM ||
ev->dev_type == UTERM_MONITOR_FBDEV) ev->dev_type == UTERM_MONITOR_FBDEV ||
ev->dev_type == UTERM_MONITOR_FBDEV_DRM)
seat_rm_video(seat, ev->dev); seat_rm_video(seat, ev->dev);
else if (ev->dev_type == UTERM_MONITOR_INPUT) else if (ev->dev_type == UTERM_MONITOR_INPUT)
uterm_input_remove_dev(seat->input, ev->dev_node); uterm_input_remove_dev(seat->input, ev->dev_node);