Module Name: src
Committed By: riastradh
Date: Tue Jan 21 20:56:40 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/drm [riastradh-drm2]: drm_drv.c
Log Message:
Call drm_mode_group_init_legacy_group in drm_attach like Linux does.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.30 -r1.1.2.31 src/sys/external/bsd/drm2/drm/drm_drv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.30 src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.31
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.30 Tue Jan 21 20:56:30 2014
+++ src/sys/external/bsd/drm2/drm/drm_drv.c Tue Jan 21 20:56:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.1.2.30 2014/01/21 20:56:30 riastradh Exp $ */
+/* $NetBSD: drm_drv.c,v 1.1.2.31 2014/01/21 20:56:40 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.1.2.30 2014/01/21 20:56:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.1.2.31 2014/01/21 20:56:40 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -327,12 +327,19 @@ drm_attach(device_t parent, device_t sel
}
}
+ if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+ /* XXX errno Linux->NetBSD */
+ error = -drm_mode_group_init_legacy_group(dev,
+ &dev->primary->mode_group);
+ if (error)
+ goto fail2;
+ }
+
/* Success! */
sc->sc_initialized = true;
return;
-fail2: __unused
- if (dev->driver->unload != NULL)
+fail2: if (dev->driver->unload != NULL)
(*dev->driver->unload)(dev);
fail1: drm_undo_fill_in_dev(dev);
fail0: return;
