diff options
| author | Hans Petter Selasky <hselasky@FreeBSD.org> | 2014-06-28 03:56:17 +0000 |
|---|---|---|
| committer | Hans Petter Selasky <hselasky@FreeBSD.org> | 2014-06-28 03:56:17 +0000 |
| commit | af3b2549c4ba2ef00a7cbb4cb6836598bf0aefbe (patch) | |
| tree | 2ebc46d89e79d747fa284f379b1979658216c719 /sys/dev/drm2 | |
| parent | b152235544f6d8515906c119c210fbd77827b511 (diff) | |
| download | src-af3b2549c4ba2ef00a7cbb4cb6836598bf0aefbe.tar.gz src-af3b2549c4ba2ef00a7cbb4cb6836598bf0aefbe.zip | |
Pull in r267961 and r267973 again. Fix for issues reported will follow.
Notes
Notes:
svn path=/head/; revision=267992
Diffstat (limited to 'sys/dev/drm2')
| -rw-r--r-- | sys/dev/drm2/drm_drv.c | 1 | ||||
| -rw-r--r-- | sys/dev/drm2/drm_sysctl.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/drm2/drm_drv.c b/sys/dev/drm2/drm_drv.c index 7b00bcf8cf43..81fcee3dbe7c 100644 --- a/sys/dev/drm2/drm_drv.c +++ b/sys/dev/drm2/drm_drv.c @@ -203,7 +203,6 @@ static struct cdevsw drm_cdevsw = { }; static int drm_msi = 1; /* Enable by default. */ -TUNABLE_INT("hw.drm.msi", &drm_msi); SYSCTL_NODE(_hw, OID_AUTO, drm, CTLFLAG_RW, NULL, "DRM device"); SYSCTL_INT(_hw_drm, OID_AUTO, msi, CTLFLAG_RDTUN, &drm_msi, 1, "Enable MSI interrupts for drm devices"); diff --git a/sys/dev/drm2/drm_sysctl.c b/sys/dev/drm2/drm_sysctl.c index a30c7ab237a6..aac21e6a486e 100644 --- a/sys/dev/drm2/drm_sysctl.c +++ b/sys/dev/drm2/drm_sysctl.c @@ -68,7 +68,7 @@ int drm_sysctl_init(struct drm_device *dev) dev->sysctl = info; /* Add the sysctl node for DRI if it doesn't already exist */ - drioid = SYSCTL_ADD_NODE(&info->ctx, &sysctl__hw_children, OID_AUTO, + drioid = SYSCTL_ADD_NODE(&info->ctx, SYSCTL_CHILDREN(&sysctl___hw), OID_AUTO, "dri", CTLFLAG_RW, NULL, "DRI Graphics"); if (!drioid) return 1; |