[FreeBSD] Declare vblank_disable_fn callout MPSAFE.

[android-x86/external-libdrm.git] / bsd-core / drm_sysctl.c

diff --git a/bsd-core/drm_sysctl.c b/bsd-core/drm_sysctl.c
index aa6bee4..a6adf0f 100644 (file)
--- a/bsd-core/drm_sysctl.c
+++ b/bsd-core/drm_sysctl.c
@@ -21,6 +21,11 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+/** @file drm_sysctl.c
+ * Implementation of various sysctls for controlling DRM behavior and reporting
+ * debug information.
+ */
+
 #include "drmP.h"
 #include "drm.h"
 
@@ -47,7 +52,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;
@@ -101,7 +106,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 );
@@ -122,12 +127,12 @@ 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;
 
-       DRM_SYSCTL_PRINT("%s 0x%x", dev->driver_name, dev2udev(dev->devnode));
+       DRM_SYSCTL_PRINT("%s 0x%x", dev->driver.name, dev2udev(dev->devnode));
        
        DRM_LOCK();
        if (dev->unique) {
@@ -147,7 +152,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;
@@ -206,7 +211,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;
@@ -262,7 +267,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;