From 8ebfdfe248e93b41d01041a5ec069bf5761f8741 Mon Sep 17 00:00:00 2001 From: rnoland Date: Sat, 23 Aug 2008 20:59:12 +0000 Subject: Update drm kernel drivers. This is a sync to mesa/drm pre-gem, with a few fixes on top of that. It also contains one local patch supplied by kib@ that I can't apply to git.master shared code. Approved by: flz Obtained from: mesa/drm git.master MFC after: 2 weeks --- sys/dev/drm/drm_sysctl.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'sys/dev/drm/drm_sysctl.c') diff --git a/sys/dev/drm/drm_sysctl.c b/sys/dev/drm/drm_sysctl.c index eb5bbe2..5c4eacb 100644 --- a/sys/dev/drm/drm_sysctl.c +++ b/sys/dev/drm/drm_sysctl.c @@ -24,6 +24,11 @@ #include __FBSDID("$FreeBSD$"); +/** @file drm_sysctl.c + * Implementation of various sysctls for controlling DRM behavior and reporting + * debug information. + */ + #include "dev/drm/drmP.h" #include "dev/drm/drm.h" @@ -50,7 +55,7 @@ struct drm_sysctl_info { char name[2]; }; -int drm_sysctl_init(drm_device_t *dev) +int drm_sysctl_init(struct drm_device *dev) { struct drm_sysctl_info *info; struct sysctl_oid *oid; @@ -104,7 +109,7 @@ int drm_sysctl_init(drm_device_t *dev) return 0; } -int drm_sysctl_cleanup(drm_device_t *dev) +int drm_sysctl_cleanup(struct drm_device *dev) { int error; error = sysctl_ctx_free( &dev->sysctl->ctx ); @@ -125,7 +130,7 @@ do { \ static int drm_name_info DRM_SYSCTL_HANDLER_ARGS { - drm_device_t *dev = arg1; + struct drm_device *dev = arg1; char buf[128]; int retcode; int hasunique = 0; @@ -150,7 +155,7 @@ done: static int drm_vm_info DRM_SYSCTL_HANDLER_ARGS { - drm_device_t *dev = arg1; + struct drm_device *dev = arg1; drm_local_map_t *map, *tempmaps; const char *types[] = { "FB", "REG", "SHM", "AGP", "SG" }; const char *type, *yesno; @@ -209,7 +214,7 @@ done: static int drm_bufs_info DRM_SYSCTL_HANDLER_ARGS { - drm_device_t *dev = arg1; + struct drm_device *dev = arg1; drm_device_dma_t *dma = dev->dma; drm_device_dma_t tempdma; int *templists; @@ -265,7 +270,7 @@ done: static int drm_clients_info DRM_SYSCTL_HANDLER_ARGS { - drm_device_t *dev = arg1; + struct drm_device *dev = arg1; drm_file_t *priv, *tempprivs; char buf[128]; int retcode; -- cgit v1.1