 @@ -834,1336 +834,1341 @@ struct drm_master {
 	struct drm_lock_data lock;	/**< Information on hardware lock */
 	void *driver_priv; /**< Private structure for driver to use */
 };
 /* Size of ringbuffer for vblank timestamps. Just double-buffer
  * in initial implementation.
  */
 #define DRM_VBLANKTIME_RBSIZE 2
 /* Flags and return codes for get_vblank_timestamp() driver function. */
 #define DRM_CALLED_FROM_VBLIRQ 1
 #define DRM_VBLANKTIME_SCANOUTPOS_METHOD (1 << 0)
 #define DRM_VBLANKTIME_INVBL             (1 << 1)
 /* get_scanout_position() return flags */
 #define DRM_SCANOUTPOS_VALID        (1 << 0)
 #define DRM_SCANOUTPOS_INVBL        (1 << 1)
 #define DRM_SCANOUTPOS_ACCURATE     (1 << 2)
 struct drm_bus_irq_cookie;
 struct drm_bus {
 	int bus_type;
 	/*
 	 * XXX NetBSD will have a problem with this: pci_intr_handle_t
 	 * is a long on some LP64 architectures, where int is 32-bit,
 	 * such as alpha and mips64.
 	 */
 	int (*get_irq)(struct drm_device *dev);
 #ifdef __NetBSD__
 	int (*irq_install)(struct drm_device *, irqreturn_t (*)(void *), int,
 	    const char *, void *, struct drm_bus_irq_cookie **);
 	void (*irq_uninstall)(struct drm_device *,
 	    struct drm_bus_irq_cookie *);
 #endif
 	const char *(*get_name)(struct drm_device *dev);
 	int (*set_busid)(struct drm_device *dev, struct drm_master *master);
 	int (*set_unique)(struct drm_device *dev, struct drm_master *master,
 			  struct drm_unique *unique);
 	int (*irq_by_busid)(struct drm_device *dev, struct drm_irq_busid *p);
 	/* hooks that are for PCI */
 	int (*agp_init)(struct drm_device *dev);
 };
 /**
  * DRM driver structure. This structure represent the common code for
  * a family of cards. There will one drm_device for each card present
  * in this family
  */
 struct drm_driver {
 	int (*load) (struct drm_device *, unsigned long flags);
 	int (*firstopen) (struct drm_device *);
 	int (*open) (struct drm_device *, struct drm_file *);
 	void (*preclose) (struct drm_device *, struct drm_file *file_priv);
 	void (*postclose) (struct drm_device *, struct drm_file *);
 	void (*lastclose) (struct drm_device *);
 	int (*unload) (struct drm_device *);
 	int (*suspend) (struct drm_device *, pm_message_t state);
 	int (*resume) (struct drm_device *);
 	int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv);
 	int (*dma_quiescent) (struct drm_device *);
 	int (*context_dtor) (struct drm_device *dev, int context);
 	/**
 	 * get_vblank_counter - get raw hardware vblank counter
 	 * @dev: DRM device
 	 * @crtc: counter to fetch
+	 *
 	 * Driver callback for fetching a raw hardware vblank counter for @crtc.
 	 * If a device doesn't have a hardware counter, the driver can simply
 	 * return the value of drm_vblank_count. The DRM core will account for
 	 * missed vblank events while interrupts where disabled based on system
 	 * timestamps.
+	 *
 	 * Wraparound handling and loss of events due to modesetting is dealt
 	 * with in the DRM core code.
+	 *
 	 * RETURNS
 	 * Raw vblank counter value.
 	 */
 	u32 (*get_vblank_counter) (struct drm_device *dev, int crtc);
 	/**
 	 * enable_vblank - enable vblank interrupt events
 	 * @dev: DRM device
 	 * @crtc: which irq to enable
+	 *
 	 * Enable vblank interrupts for @crtc.  If the device doesn't have
 	 * a hardware vblank counter, this routine should be a no-op, since
 	 * interrupts will have to stay on to keep the count accurate.
+	 *
 	 * RETURNS
 	 * Zero on success, appropriate errno if the given @crtc's vblank
 	 * interrupt cannot be enabled.
 	 */
 	int (*enable_vblank) (struct drm_device *dev, int crtc);
 	/**
 	 * disable_vblank - disable vblank interrupt events
 	 * @dev: DRM device
 	 * @crtc: which irq to enable
+	 *
 	 * Disable vblank interrupts for @crtc.  If the device doesn't have
 	 * a hardware vblank counter, this routine should be a no-op, since
 	 * interrupts will have to stay on to keep the count accurate.
 	 */
 	void (*disable_vblank) (struct drm_device *dev, int crtc);
 	/**
 	 * Called by \c drm_device_is_agp.  Typically used to determine if a
 	 * card is really attached to AGP or not.
+	 *
 	 * \param dev  DRM device handle
+	 *
 	 * \returns
 	 * One of three values is returned depending on whether or not the
 	 * card is absolutely \b not AGP (return of 0), absolutely \b is AGP
 	 * (return of 1), or may or may not be AGP (return of 2).
 	 */
 	int (*device_is_agp) (struct drm_device *dev);
 	/**
 	 * Called by vblank timestamping code.
+	 *
 	 * Return the current display scanout position from a crtc.
+	 *
 	 * \param dev  DRM device.
 	 * \param crtc Id of the crtc to query.
 	 * \param *vpos Target location for current vertical scanout position.
 	 * \param *hpos Target location for current horizontal scanout position.
+	 *
 	 * Returns vpos as a positive number while in active scanout area.
 	 * Returns vpos as a negative number inside vblank, counting the number
 	 * of scanlines to go until end of vblank, e.g., -1 means "one scanline
 	 * until start of active scanout / end of vblank."
+	 *
 	 * \return Flags, or'ed together as follows:
+	 *
 	 * DRM_SCANOUTPOS_VALID = Query successful.
 	 * DRM_SCANOUTPOS_INVBL = Inside vblank.
 	 * DRM_SCANOUTPOS_ACCURATE = Returned position is accurate. A lack of
 	 * this flag means that returned position may be offset by a constant
 	 * but unknown small number of scanlines wrt. real scanout position.
+	 *
 	 */
 	int (*get_scanout_position) (struct drm_device *dev, int crtc,
 				     int *vpos, int *hpos);
 	/**
 	 * Called by \c drm_get_last_vbltimestamp. Should return a precise
 	 * timestamp when the most recent VBLANK interval ended or will end.
+	 *
 	 * Specifically, the timestamp in @vblank_time should correspond as
 	 * closely as possible to the time when the first video scanline of
 	 * the video frame after the end of VBLANK will start scanning out,
 	 * the time immediately after end of the VBLANK interval. If the
 	 * @crtc is currently inside VBLANK, this will be a time in the future.
 	 * If the @crtc is currently scanning out a frame, this will be the
 	 * past start time of the current scanout. This is meant to adhere
 	 * to the OpenML OML_sync_control extension specification.
+	 *
 	 * \param dev dev DRM device handle.
 	 * \param crtc crtc for which timestamp should be returned.
 	 * \param *max_error Maximum allowable timestamp error in nanoseconds.
 	 *                   Implementation should strive to provide timestamp
 	 *                   with an error of at most *max_error nanoseconds.
 	 *                   Returns true upper bound on error for timestamp.
 	 * \param *vblank_time Target location for returned vblank timestamp.
 	 * \param flags 0 = Defaults, no special treatment needed.
 	 * \param       DRM_CALLED_FROM_VBLIRQ = Function is called from vblank
 	 *	        irq handler. Some drivers need to apply some workarounds
 	 *              for gpu-specific vblank irq quirks if flag is set.
+	 *
 	 * \returns
 	 * Zero if timestamping isn't supported in current display mode or a
 	 * negative number on failure. A positive status code on success,
 	 * which describes how the vblank_time timestamp was computed.
 	 */
 	int (*get_vblank_timestamp) (struct drm_device *dev, int crtc,
 				     int *max_error,
 				     struct timeval *vblank_time,
 				     unsigned flags);
 	/* these have to be filled in */
 	irqreturn_t(*irq_handler) (DRM_IRQ_ARGS);
 	void (*irq_preinstall) (struct drm_device *dev);
 	int (*irq_postinstall) (struct drm_device *dev);
 	void (*irq_uninstall) (struct drm_device *dev);
 	void (*set_version) (struct drm_device *dev,
 			     struct drm_set_version *sv);
 	/* Master routines */
 	int (*master_create)(struct drm_device *dev, struct drm_master *master);
 	void (*master_destroy)(struct drm_device *dev, struct drm_master *master);
 	/**
 	 * master_set is called whenever the minor master is set.
 	 * master_drop is called whenever the minor master is dropped.
 	 */
 	int (*master_set)(struct drm_device *dev, struct drm_file *file_priv,
 			  bool from_open);
 	void (*master_drop)(struct drm_device *dev, struct drm_file *file_priv,
 			    bool from_release);
 	int (*debugfs_init)(struct drm_minor *minor);
 	void (*debugfs_cleanup)(struct drm_minor *minor);
 	/**
 	 * Driver-specific constructor for drm_gem_objects, to set up
 	 * obj->driver_private.
+	 *
 	 * Returns 0 on success.
 	 */
 	int (*gem_init_object) (struct drm_gem_object *obj);
 	void (*gem_free_object) (struct drm_gem_object *obj);
 	int (*gem_open_object) (struct drm_gem_object *, struct drm_file *);
 	void (*gem_close_object) (struct drm_gem_object *, struct drm_file *);
 	/* prime: */
 	/* export handle -> fd (see drm_gem_prime_handle_to_fd() helper) */
 	int (*prime_handle_to_fd)(struct drm_device *dev, struct drm_file *file_priv,
 				uint32_t handle, uint32_t flags, int *prime_fd);
 	/* import fd -> handle (see drm_gem_prime_fd_to_handle() helper) */
 	int (*prime_fd_to_handle)(struct drm_device *dev, struct drm_file *file_priv,
 				int prime_fd, uint32_t *handle);
 	/* export GEM -> dmabuf */
 	struct dma_buf * (*gem_prime_export)(struct drm_device *dev,
 				struct drm_gem_object *obj, int flags);
 	/* import dmabuf -> GEM */
 	struct drm_gem_object * (*gem_prime_import)(struct drm_device *dev,
 				struct dma_buf *dma_buf);
 	/* vga arb irq handler */
 	void (*vgaarb_irq)(struct drm_device *dev, bool state);
 	/* dumb alloc support */
 	int (*dumb_create)(struct drm_file *file_priv,
 			   struct drm_device *dev,
 			   struct drm_mode_create_dumb *args);
 	int (*dumb_map_offset)(struct drm_file *file_priv,
 			       struct drm_device *dev, uint32_t handle,
 			       uint64_t *offset);
 	int (*dumb_destroy)(struct drm_file *file_priv,
 			    struct drm_device *dev,
 			    uint32_t handle);
 	/* Driver private ops for this object */
 #ifdef __NetBSD__
 	const struct uvm_pagerops *gem_uvm_ops;
 #else
 	const struct vm_operations_struct *gem_vm_ops;
 #endif
 	int major;
 	int minor;
 	int patchlevel;
 #ifdef __NetBSD__
 	const char *name;
 	const char *desc;
 	const char *date;
 #else
 	char *name;
 	char *desc;
 	char *date;
 #endif
 	u32 driver_features;
 	int dev_priv_size;
 	struct drm_ioctl_desc *ioctls;
 	int num_ioctls;
 	const struct file_operations *fops;
 	union {
 		struct pci_driver *pci;
 		struct platform_device *platform_device;
 		struct usb_driver *usb;
 	} kdriver;
 	struct drm_bus *bus;
 	/* List of devices hanging off this driver */
 	struct list_head device_list;
 };
 #define DRM_MINOR_UNASSIGNED 0
 #define DRM_MINOR_LEGACY 1
 #define DRM_MINOR_CONTROL 2
 #define DRM_MINOR_RENDER 3
 #ifndef __NetBSD__
 /**
  * debugfs node list. This structure represents a debugfs file to
  * be created by the drm core
  */
 struct drm_debugfs_list {
 	const char *name; /** file name */
 	int (*show)(struct seq_file*, void*); /** show callback */
 	u32 driver_features; /**< Required driver features for this entry */
 };
 /**
  * debugfs node structure. This structure represents a debugfs file.
  */
 struct drm_debugfs_node {
 	struct list_head list;
 	struct drm_minor *minor;
 	struct drm_debugfs_list *debugfs_ent;
 	struct dentry *dent;
 };
 /**
  * Info file list entry. This structure represents a debugfs or proc file to
  * be created by the drm core
  */
 struct drm_info_list {
 	const char *name; /** file name */
 	int (*show)(struct seq_file*, void*); /** show callback */
 	u32 driver_features; /**< Required driver features for this entry */
 	void *data;
 };
 /**
  * debugfs node structure. This structure represents a debugfs file.
  */
 struct drm_info_node {
 	struct list_head list;
 	struct drm_minor *minor;
 	struct drm_info_list *info_ent;
 	struct dentry *dent;
 };
 #endif
 /**
  * DRM minor structure. This structure represents a drm minor number.
  */
 struct drm_minor {
 	int index;			/**< Minor device number */
 	int type;                       /**< Control or render */
 	dev_t device;			/**< Device number for mknod */
 #ifdef __NetBSD__
 	device_t kdev;			/* NetBSD device */
 #else
 	struct device kdev;		/**< Linux device */
 #endif
 	struct drm_device *dev;
 #ifndef __NetBSD__
 	struct proc_dir_entry *proc_root;  /**< proc directory entry */
 	struct drm_info_node proc_nodes;
 	struct dentry *debugfs_root;
 	struct list_head debugfs_list;
 	struct mutex debugfs_lock; /* Protects debugfs_list. */
 #endif
 	struct drm_master *master; /* currently active master for this node */
 	struct list_head master_list;
 	struct drm_mode_group mode_group;
 };
 /* mode specified on the command line */
 struct drm_cmdline_mode {
 	bool specified;
 	bool refresh_specified;
 	bool bpp_specified;
 	int xres, yres;
 	int bpp;
 	int refresh;
 	bool rb;
 	bool interlace;
 	bool cvt;
 	bool margins;
 	enum drm_connector_force force;
 };
 struct drm_pending_vblank_event {
 	struct drm_pending_event base;
 	int pipe;
 	struct drm_event_vblank event;
 };
 /**
  * DRM device structure. This structure represent a complete card that
  * may contain multiple heads.
  */
 struct drm_device {
 	struct list_head driver_item;	/**< list of devices per driver */
 	char *devname;			/**< For /proc/interrupts */
 	int if_version;			/**< Highest interface version set */
 	/** \name Locks */
 	/*@{ */
 	spinlock_t count_lock;		/**< For inuse, drm_device::open_count, drm_device::buf_use */
 	struct mutex struct_mutex;	/**< For others */
 	/*@} */
 	/** \name Usage Counters */
 	/*@{ */
 	int open_count;			/**< Outstanding files open */
 	atomic_t ioctl_count;		/**< Outstanding IOCTLs pending */
 	atomic_t vma_count;		/**< Outstanding vma areas open */
 	int buf_use;			/**< Buffers in use -- cannot alloc */
 	atomic_t buf_alloc;		/**< Buffer allocation in progress */
 	/*@} */
 	/** \name Performance counters */
 	/*@{ */
 	unsigned long counters;
 	enum drm_stat_type types[15];
 	atomic_t counts[15];
 	/*@} */
 	struct list_head filelist;
 	/** \name Memory management */
 	/*@{ */
 	struct list_head maplist;	/**< Linked list of regions */
 	int map_count;			/**< Number of mappable regions */
 	struct drm_open_hash map_hash;	/**< User token hash table for maps */
 	/** \name Context handle management */
 	/*@{ */
 	struct list_head ctxlist;	/**< Linked list of context handles */
 	int ctx_count;			/**< Number of context handles */
 	struct mutex ctxlist_mutex;	/**< For ctxlist */
 	struct idr ctx_idr;
 	struct list_head vmalist;	/**< List of vmas (for debugging) */
 	/*@} */
 	/** \name DMA support */
 	/*@{ */
 	struct drm_device_dma *dma;		/**< Optional pointer for DMA support */
 	/*@} */
 	/** \name Context support */
 	/*@{ */
 	int irq_enabled;		/**< True if irq handler is enabled */
 #ifdef __NetBSD__
 	struct drm_bus_irq_cookie *irq_cookie;
 #endif
 	__volatile__ long context_flag;	/**< Context swapping flag */
 	__volatile__ long interrupt_flag; /**< Interruption handler flag */
 	__volatile__ long dma_flag;	/**< DMA dispatch flag */
 #ifdef __NetBSD__
 	drm_waitqueue_t context_wait;	/**< Processes waiting on ctx switch */
 #else
 	wait_queue_head_t context_wait;	/**< Processes waiting on ctx switch */
 #endif
 	int last_checked;		/**< Last context checked for DMA */
 	int last_context;		/**< Last current context */
 #ifndef __NetBSD__
 	/* XXX Nobody seems to use this.  */
 	unsigned long last_switch;	/**< jiffies at last context switch */
 #endif
 	/*@} */
 	struct work_struct work;
 	/** \name VBLANK IRQ support */
 	/*@{ */
 	/*
 	 * At load time, disabling the vblank interrupt won't be allowed since
 	 * old clients may not call the modeset ioctl and therefore misbehave.
 	 * Once the modeset ioctl *has* been called though, we can safely
 	 * disable them when unused.
 	 */
 	int vblank_disable_allowed;
 #ifdef __NetBSD__
 	drm_waitqueue_t *vbl_queue;     /**< VBLANK wait queue */
 #else
 	wait_queue_head_t *vbl_queue;   /**< VBLANK wait queue */
 #endif
 	atomic_t *_vblank_count;        /**< number of VBLANK interrupts (driver must alloc the right number of counters) */
 	struct timeval *_vblank_time;   /**< timestamp of current vblank_count (drivers must alloc right number of fields) */
 	spinlock_t vblank_time_lock;    /**< Protects vblank count and time updates during vblank enable/disable */
 	spinlock_t vbl_lock;
 	atomic_t *vblank_refcount;      /* number of users of vblank interruptsper crtc */
 	u32 *last_vblank;               /* protected by dev->vbl_lock, used */
 					/* for wraparound handling */
 	int *vblank_enabled;            /* so we don't call enable more than
 					   once per disable */
 	int *vblank_inmodeset;          /* Display driver is setting mode */
 	u32 *last_vblank_wait;		/* Last vblank seqno waited per CRTC */
 	struct timer_list vblank_disable_timer;
 	u32 max_vblank_count;           /**< size of vblank counter register */
 	/**
 	 * List of events
 	 */
 	struct list_head vblank_event_list;
 	spinlock_t event_lock;
 	/*@} */
 	cycles_t ctx_start;
 	cycles_t lck_start;
 	struct fasync_struct *buf_async;/**< Processes waiting for SIGIO */
 #ifdef __NetBSD__
 	drm_waitqueue_t buf_readers;	/**< Processes waiting to read */
 	drm_waitqueue_t buf_writers;	/**< Processes waiting to ctx switch */
 #else
 	wait_queue_head_t buf_readers;	/**< Processes waiting to read */
 	wait_queue_head_t buf_writers;	/**< Processes waiting to ctx switch */
 #endif
 	struct drm_agp_head *agp;	/**< AGP data */
 	struct device *dev;             /**< Device structure */
 	struct pci_dev *pdev;		/**< PCI device structure */
 	int pci_vendor;			/**< PCI vendor id */
 	int pci_device;			/**< PCI device id */
 #ifdef __alpha__
 	struct pci_controller *hose;
 #endif
 	struct platform_device *platformdev; /**< Platform device struture */
 	struct usb_device *usbdev;
 #ifdef __NetBSD__
 	bus_space_tag_t bst;
 	struct drm_bus_map *bus_maps;
 	size_t bus_nmaps;
 	/* XXX What does this have to do with AGP?  */
 	struct drm_bus_map *agp_maps;
 	size_t agp_nmaps;
 	bus_dma_tag_t bus_dmat;
 	bus_dma_tag_t dmat;
 	bool dmat_subregion_p;
 	bus_addr_t dmat_subregion_min;
 	bus_addr_t dmat_subregion_max;
 #endif
 	struct drm_sg_mem *sg;	/**< Scatter gather memory */
 	unsigned int num_crtcs;                  /**< Number of CRTCs on this device */
 	void *dev_private;		/**< device private data */
 	void *mm_private;
 	struct address_space *dev_mapping;
 	struct drm_sigdata sigdata;	   /**< For block_all_signals */
 #ifndef __NetBSD__
 	sigset_t sigmask;
 #endif
 	struct drm_driver *driver;
 	struct drm_local_map *agp_buffer_map;
 	unsigned int agp_buffer_token;
 	struct drm_minor *control;		/**< Control node for card */
 	struct drm_minor *primary;		/**< render type primary screen head */
         struct drm_mode_config mode_config;	/**< Current mode config */
 	/** \name GEM information */
 	/*@{ */
 	spinlock_t object_name_lock;
 	struct idr object_name_idr;
 	/*@} */
 	int switch_power_state;
 	atomic_t unplugged; /* device has been unplugged or gone away */
 };
 #define DRM_SWITCH_POWER_ON 0
 #define DRM_SWITCH_POWER_OFF 1
 #define DRM_SWITCH_POWER_CHANGING 2
 static __inline__ int drm_core_check_feature(struct drm_device *dev,
 					     int feature)
+{
 	return ((dev->driver->driver_features & feature) ? 1 : 0);
+}
 static inline int drm_dev_to_irq(struct drm_device *dev)
+{
 	return dev->driver->bus->get_irq(dev);
+}
 #if __OS_HAS_AGP
 static inline int drm_core_has_AGP(struct drm_device *dev)
+{
 	return drm_core_check_feature(dev, DRIVER_USE_AGP);
+}
 #else
 #define drm_core_has_AGP(dev) (0)
 #endif
 #if __OS_HAS_MTRR
 static inline int drm_core_has_MTRR(struct drm_device *dev)
+{
 	return drm_core_check_feature(dev, DRIVER_USE_MTRR);
+}
 #define DRM_MTRR_WC		MTRR_TYPE_WRCOMB
 static inline int drm_mtrr_add(unsigned long offset, unsigned long size,
 			       unsigned int flags)
+{
 	return mtrr_add(offset, size, flags, 1);
+}
 static inline int drm_mtrr_del(int handle, unsigned long offset,
 			       unsigned long size, unsigned int flags)
+{
 	return mtrr_del(handle, offset, size);
+}
 #else
 #define drm_core_has_MTRR(dev) (0)
 #define DRM_MTRR_WC		0
 static inline int drm_mtrr_add(unsigned long offset, unsigned long size,
 			       unsigned int flags)
+{
 	return 0;
+}
 static inline int drm_mtrr_del(int handle, unsigned long offset,
 			       unsigned long size, unsigned int flags)
+{
 	return 0;
+}
 #endif
 static inline void drm_device_set_unplugged(struct drm_device *dev)
+{
 	smp_wmb();
 	atomic_set(&dev->unplugged, 1);
+}
 static inline int drm_device_is_unplugged(struct drm_device *dev)
+{
 	int ret = atomic_read(&dev->unplugged);
 	smp_rmb();
 	return ret;
+}
 /******************************************************************/
 /** \name Internal function definitions */
 /*@{*/
 #ifndef __NetBSD__		/* XXX temporary measure 20130212 */
 				/* Driver support (drm_drv.h) */
 extern long drm_ioctl(struct file *filp,
 		      unsigned int cmd, unsigned long arg);
 extern long drm_compat_ioctl(struct file *filp,
 			     unsigned int cmd, unsigned long arg);
 extern int drm_lastclose(struct drm_device *dev);
 #endif
 #ifdef __NetBSD__
 extern void drm_config_found(device_t, /* XXXX const */ struct drm_driver *,
     unsigned long, struct drm_device *);
 #endif
 				/* Device support (drm_fops.h) */
 extern struct mutex drm_global_mutex;
 #ifdef __NetBSD__
 extern int drm_open_file(struct drm_file *, void *, struct drm_minor *);
 extern int drm_close_file(struct drm_file *);
 #if 0				/* XXX drm event poll */
 extern int drm_dequeue_event(struct drm_file *, size_t,
     struct drm_pending_event **);
 #endif
 extern void drm_lastclose(struct drm_device *);
 #else
 extern int drm_open(struct inode *inode, struct file *filp);
 extern int drm_stub_open(struct inode *inode, struct file *filp);
 extern int drm_fasync(int fd, struct file *filp, int on);
 extern ssize_t drm_read(struct file *filp, char __user *buffer,
 			size_t count, loff_t *offset);
 extern int drm_release(struct inode *inode, struct file *filp);
 #endif
 				/* Mapping support (drm_vm.h) */
 #ifdef __NetBSD__
 extern paddr_t drm_mmap_paddr(struct drm_device *, off_t, int);
 #else
 extern int drm_mmap(struct file *filp, struct vm_area_struct *vma);
 extern int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma);
 extern void drm_vm_open_locked(struct drm_device *dev, struct vm_area_struct *vma);
 extern void drm_vm_close_locked(struct drm_device *dev, struct vm_area_struct *vma);
 extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait);
 #endif
 				/* Memory management support (drm_memory.h) */
 #include <drm/drm_memory.h>
 #ifndef __NetBSD__
 extern void drm_free_agp(DRM_AGP_MEM * handle, int pages);
 extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start);
 extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev,
 				       struct page **pages,
 				       unsigned long num_pages,
 				       uint32_t gtt_offset,
 				       uint32_t type);
 extern int drm_unbind_agp(DRM_AGP_MEM * handle);
 #endif
 #ifdef __NetBSD__
 extern void *drm_ioremap(struct drm_device *dev, struct drm_local_map *map);
 extern void drm_iounmap(struct drm_device *dev, struct drm_local_map *map);
 extern int drm_limit_dma_space(struct drm_device *, resource_size_t,
     resource_size_t);
 #endif
 				/* Misc. IOCTL support (drm_ioctl.h) */
 extern int drm_irq_by_busid(struct drm_device *dev, void *data,
 			    struct drm_file *file_priv);
 extern int drm_getunique(struct drm_device *dev, void *data,
 			 struct drm_file *file_priv);
 extern int drm_setunique(struct drm_device *dev, void *data,
 			 struct drm_file *file_priv);
 extern int drm_getmap(struct drm_device *dev, void *data,
 		      struct drm_file *file_priv);
 extern int drm_getclient(struct drm_device *dev, void *data,
 			 struct drm_file *file_priv);
 extern int drm_getstats(struct drm_device *dev, void *data,
 			struct drm_file *file_priv);
 extern int drm_getcap(struct drm_device *dev, void *data,
 		      struct drm_file *file_priv);
 extern int drm_setversion(struct drm_device *dev, void *data,
 			  struct drm_file *file_priv);
 extern int drm_noop(struct drm_device *dev, void *data,
 		    struct drm_file *file_priv);
 				/* Context IOCTL support (drm_context.h) */
 extern int drm_resctx(struct drm_device *dev, void *data,
 		      struct drm_file *file_priv);
 extern int drm_addctx(struct drm_device *dev, void *data,
 		      struct drm_file *file_priv);
 extern int drm_modctx(struct drm_device *dev, void *data,
 		      struct drm_file *file_priv);
 extern int drm_getctx(struct drm_device *dev, void *data,
 		      struct drm_file *file_priv);
 extern int drm_switchctx(struct drm_device *dev, void *data,
 			 struct drm_file *file_priv);
 extern int drm_newctx(struct drm_device *dev, void *data,
 		      struct drm_file *file_priv);
 extern int drm_rmctx(struct drm_device *dev, void *data,
 		     struct drm_file *file_priv);
 extern int drm_ctxbitmap_init(struct drm_device *dev);
 extern void drm_ctxbitmap_cleanup(struct drm_device *dev);
 extern void drm_ctxbitmap_free(struct drm_device *dev, int ctx_handle);
 extern int drm_setsareactx(struct drm_device *dev, void *data,
 			   struct drm_file *file_priv);
 extern int drm_getsareactx(struct drm_device *dev, void *data,
 			   struct drm_file *file_priv);
 				/* Authentication IOCTL support (drm_auth.h) */
 extern int drm_getmagic(struct drm_device *dev, void *data,
 			struct drm_file *file_priv);
 extern int drm_authmagic(struct drm_device *dev, void *data,
 			 struct drm_file *file_priv);
 extern int drm_remove_magic(struct drm_master *master, drm_magic_t magic);
 #ifndef __NetBSD__		/* XXX temporary measure 20130212 */
 /* Cache management (drm_cache.c) */
 void drm_clflush_pages(struct page *pages[], unsigned long num_pages);
 void drm_clflush_sg(struct sg_table *st);
 void drm_clflush_virt_range(char *addr, unsigned long length);
 #endif
 				/* Locking IOCTL support (drm_lock.h) */
 extern int drm_lock(struct drm_device *dev, void *data,
 		    struct drm_file *file_priv);
 extern int drm_unlock(struct drm_device *dev, void *data,
 		      struct drm_file *file_priv);
 extern int drm_lock_free(struct drm_lock_data *lock_data, unsigned int context);
 extern void drm_idlelock_take(struct drm_lock_data *lock_data);
 extern void drm_idlelock_release(struct drm_lock_data *lock_data);
 /*
  * These are exported to drivers so that they can implement fencing using
  * DMA quiscent + idle. DMA quiescent usually requires the hardware lock.
  */
 extern int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv);
 				/* Buffer management support (drm_bufs.h) */
 extern int drm_addbufs_agp(struct drm_device *dev, struct drm_buf_desc * request);
 extern int drm_addbufs_pci(struct drm_device *dev, struct drm_buf_desc * request);
 extern int drm_addmap(struct drm_device *dev, resource_size_t offset,
 		      unsigned int size, enum drm_map_type type,
 		      enum drm_map_flags flags, struct drm_local_map **map_ptr);
 extern int drm_addmap_ioctl(struct drm_device *dev, void *data,
 			    struct drm_file *file_priv);
 extern int drm_rmmap(struct drm_device *dev, struct drm_local_map *map);
 extern int drm_rmmap_locked(struct drm_device *dev, struct drm_local_map *map);
 extern int drm_rmmap_ioctl(struct drm_device *dev, void *data,
 			   struct drm_file *file_priv);
 extern int drm_addbufs(struct drm_device *dev, void *data,
 		       struct drm_file *file_priv);
 extern int drm_infobufs(struct drm_device *dev, void *data,
 			struct drm_file *file_priv);
 extern int drm_markbufs(struct drm_device *dev, void *data,
 			struct drm_file *file_priv);
 extern int drm_freebufs(struct drm_device *dev, void *data,
 			struct drm_file *file_priv);
 extern int drm_mapbufs(struct drm_device *dev, void *data,
 		       struct drm_file *file_priv);
 extern int drm_order(unsigned long size);
 				/* DMA support (drm_dma.h) */
 extern int drm_dma_setup(struct drm_device *dev);
 extern void drm_dma_takedown(struct drm_device *dev);
 extern void drm_free_buffer(struct drm_device *dev, struct drm_buf * buf);
 extern void drm_core_reclaim_buffers(struct drm_device *dev,
 				     struct drm_file *filp);
 				/* IRQ support (drm_irq.h) */
 extern int drm_control(struct drm_device *dev, void *data,
 		       struct drm_file *file_priv);
 extern int drm_irq_install(struct drm_device *dev);
 extern int drm_irq_uninstall(struct drm_device *dev);
 extern int drm_vblank_init(struct drm_device *dev, int num_crtcs);
 extern int drm_wait_vblank(struct drm_device *dev, void *data,
 			   struct drm_file *filp);
 extern int drm_vblank_wait(struct drm_device *dev, unsigned int *vbl_seq);
 extern u32 drm_vblank_count(struct drm_device *dev, int crtc);
 extern u32 drm_vblank_count_and_time(struct drm_device *dev, int crtc,
 				     struct timeval *vblanktime);
 extern void drm_send_vblank_event(struct drm_device *dev, int crtc,
 				     struct drm_pending_vblank_event *e);
 extern bool drm_handle_vblank(struct drm_device *dev, int crtc);
 extern int drm_vblank_get(struct drm_device *dev, int crtc);
 extern void drm_vblank_put(struct drm_device *dev, int crtc);
 extern void drm_vblank_off(struct drm_device *dev, int crtc);
 extern void drm_vblank_cleanup(struct drm_device *dev);
 extern u32 drm_get_last_vbltimestamp(struct drm_device *dev, int crtc,
 				     struct timeval *tvblank, unsigned flags);
 extern int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
 						 int crtc, int *max_error,
 						 struct timeval *vblank_time,
 						 unsigned flags,
 						 struct drm_crtc *refcrtc);
 extern void drm_calc_timestamping_constants(struct drm_crtc *crtc);
 extern bool
 drm_mode_parse_command_line_for_connector(const char *mode_option,
 					  struct drm_connector *connector,
 					  struct drm_cmdline_mode *mode);
 extern struct drm_display_mode *
 drm_mode_create_from_cmdline_mode(struct drm_device *dev,
 				  struct drm_cmdline_mode *cmd);
 /* Modesetting support */
 extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc);
 extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc);
 extern int drm_modeset_ctl(struct drm_device *dev, void *data,
 			   struct drm_file *file_priv);
 				/* AGP/GART support (drm_agpsupport.h) */
 extern struct drm_agp_head *drm_agp_init(struct drm_device *dev);
 extern int drm_agp_acquire(struct drm_device *dev);
 extern int drm_agp_acquire_ioctl(struct drm_device *dev, void *data,
 				 struct drm_file *file_priv);
 extern int drm_agp_release(struct drm_device *dev);
 extern int drm_agp_release_ioctl(struct drm_device *dev, void *data,
 				 struct drm_file *file_priv);
 extern int drm_agp_enable(struct drm_device *dev, struct drm_agp_mode mode);
 extern int drm_agp_enable_ioctl(struct drm_device *dev, void *data,
 				struct drm_file *file_priv);
 extern int drm_agp_info(struct drm_device *dev, struct drm_agp_info *info);
 extern int drm_agp_info_ioctl(struct drm_device *dev, void *data,
 			struct drm_file *file_priv);
 extern int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request);
 extern int drm_agp_alloc_ioctl(struct drm_device *dev, void *data,
 			 struct drm_file *file_priv);
 extern int drm_agp_free(struct drm_device *dev, struct drm_agp_buffer *request);
 extern int drm_agp_free_ioctl(struct drm_device *dev, void *data,
 			struct drm_file *file_priv);
 extern int drm_agp_unbind(struct drm_device *dev, struct drm_agp_binding *request);
 extern int drm_agp_unbind_ioctl(struct drm_device *dev, void *data,
 			  struct drm_file *file_priv);
 extern int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request);
 extern int drm_agp_bind_ioctl(struct drm_device *dev, void *data,
 			struct drm_file *file_priv);
 				/* Stub support (drm_stub.h) */
 extern int drm_setmaster_ioctl(struct drm_device *dev, void *data,
 			       struct drm_file *file_priv);
 extern int drm_dropmaster_ioctl(struct drm_device *dev, void *data,
 				struct drm_file *file_priv);
 struct drm_master *drm_master_create(struct drm_minor *minor);
 extern struct drm_master *drm_master_get(struct drm_master *master);
 extern void drm_master_put(struct drm_master **master);
 extern void drm_put_dev(struct drm_device *dev);
 extern int drm_put_minor(struct drm_minor **minor);
 extern void drm_unplug_dev(struct drm_device *dev);
 extern unsigned int drm_debug;
 extern unsigned int drm_vblank_offdelay;
 extern unsigned int drm_timestamp_precision;
 extern unsigned int drm_timestamp_monotonic;
 extern struct class *drm_class;
 extern struct proc_dir_entry *drm_proc_root;
 extern struct dentry *drm_debugfs_root;
 extern struct idr drm_minors_idr;
 extern struct drm_local_map *drm_getsarea(struct drm_device *dev);
 				/* Proc support (drm_proc.h) */
 extern int drm_proc_init(struct drm_minor *minor, int minor_id,
 			 struct proc_dir_entry *root);
 extern int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root);
 				/* Debugfs support */
 #if defined(CONFIG_DEBUG_FS)
 extern int drm_debugfs_init(struct drm_minor *minor, int minor_id,
 			    struct dentry *root);
 extern int drm_debugfs_create_files(struct drm_info_list *files, int count,
 				    struct dentry *root, struct drm_minor *minor);
 extern int drm_debugfs_remove_files(struct drm_info_list *files, int count,
                                     struct drm_minor *minor);
 extern int drm_debugfs_cleanup(struct drm_minor *minor);
 #endif
 #ifndef __NetBSD__
 				/* Info file support */
 extern int drm_name_info(struct seq_file *m, void *data);
 extern int drm_vm_info(struct seq_file *m, void *data);
 extern int drm_bufs_info(struct seq_file *m, void *data);
 extern int drm_vblank_info(struct seq_file *m, void *data);
 extern int drm_clients_info(struct seq_file *m, void* data);
 extern int drm_gem_name_info(struct seq_file *m, void *data);
 #endif
 extern int drm_gem_prime_handle_to_fd(struct drm_device *dev,
 		struct drm_file *file_priv, uint32_t handle, uint32_t flags,
 		int *prime_fd);
 extern int drm_gem_prime_fd_to_handle(struct drm_device *dev,
 		struct drm_file *file_priv, int prime_fd, uint32_t *handle);
 extern int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data,
 					struct drm_file *file_priv);
 extern int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data,
 					struct drm_file *file_priv);
 #ifndef __NetBSD__		/* XXX temporary measure 20130212 */
 extern int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages,
 					    dma_addr_t *addrs, int max_pages);
 extern struct sg_table *drm_prime_pages_to_sg(struct page **pages, int nr_pages);
 extern void drm_prime_gem_destroy(struct drm_gem_object *obj, struct sg_table *sg);
 #endif
 #ifndef __NetBSD__		/* XXX drm prime */
 void drm_prime_init_file_private(struct drm_prime_file_private *prime_fpriv);
 void drm_prime_destroy_file_private(struct drm_prime_file_private *prime_fpriv);
 int drm_prime_add_imported_buf_handle(struct drm_prime_file_private *prime_fpriv, struct dma_buf *dma_buf, uint32_t handle);
 int drm_prime_lookup_imported_buf_handle(struct drm_prime_file_private *prime_fpriv, struct dma_buf *dma_buf, uint32_t *handle);
 void drm_prime_remove_imported_buf_handle(struct drm_prime_file_private *prime_fpriv, struct dma_buf *dma_buf);
 int drm_prime_add_dma_buf(struct drm_device *dev, struct drm_gem_object *obj);
 int drm_prime_lookup_obj(struct drm_device *dev, struct dma_buf *buf,
 			 struct drm_gem_object **obj);
 #endif
 #if DRM_DEBUG_CODE
 #ifndef __NetBSD__
 extern int drm_vma_info(struct seq_file *m, void *data);
 #endif
 #endif
 				/* Scatter Gather Support (drm_scatter.h) */
 extern void drm_sg_cleanup(struct drm_sg_mem * entry);
 extern int drm_sg_alloc_ioctl(struct drm_device *dev, void *data,
 			struct drm_file *file_priv);
 extern int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request);
 extern int drm_sg_free(struct drm_device *dev, void *data,
 		       struct drm_file *file_priv);
 			       /* ATI PCIGART support (ati_pcigart.h) */
 extern int drm_ati_pcigart_init(struct drm_device *dev,
 				struct drm_ati_pcigart_info * gart_info);
 extern int drm_ati_pcigart_cleanup(struct drm_device *dev,
 				   struct drm_ati_pcigart_info * gart_info);
 extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size,
 				       size_t align);
 extern void __drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah);
 extern void drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah);
 #ifdef __NetBSD__
 extern void drm_pci_attach(device_t, const struct pci_attach_args *,
     struct pci_dev *, struct drm_device *);
 extern int drm_pci_detach(struct drm_device *, int);
 #endif
 			       /* sysfs support (drm_sysfs.c) */
 struct drm_sysfs_class;
 extern struct class *drm_sysfs_create(struct module *owner, char *name);
 extern void drm_sysfs_destroy(void);
 extern int drm_sysfs_device_add(struct drm_minor *minor);
 extern void drm_sysfs_hotplug_event(struct drm_device *dev);
 extern void drm_sysfs_device_remove(struct drm_minor *minor);
 #ifndef __NetBSD__
 extern char *drm_get_connector_status_name(enum drm_connector_status status);
 #endif
 extern int drm_sysfs_connector_add(struct drm_connector *connector);
 extern void drm_sysfs_connector_remove(struct drm_connector *connector);
 /* Graphics Execution Manager library functions (drm_gem.c) */
 int drm_gem_init(struct drm_device *dev);
 void drm_gem_destroy(struct drm_device *dev);
 void drm_gem_object_release(struct drm_gem_object *obj);
 void drm_gem_object_free(struct kref *kref);
 struct drm_gem_object *drm_gem_object_alloc(struct drm_device *dev,
 					    size_t size);
 int drm_gem_object_init(struct drm_device *dev,
 			struct drm_gem_object *obj, size_t size);
 int drm_gem_private_object_init(struct drm_device *dev,
 			struct drm_gem_object *obj, size_t size);
 void drm_gem_object_handle_free(struct drm_gem_object *obj);
 #ifdef __NetBSD__
 void drm_gem_pager_reference(struct uvm_object *);
 void drm_gem_pager_detach(struct uvm_object *);
 int drm_gem_mmap_object(struct drm_device *, off_t *, size_t,
     struct uvm_object **);
 #else
 void drm_gem_vm_open(struct vm_area_struct *vma);
 void drm_gem_vm_close(struct vm_area_struct *vma);
 int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma);
 #endif
 #include <drm/drm_global.h>
 static inline void
 drm_gem_object_reference(struct drm_gem_object *obj)
+{
 	kref_get(&obj->refcount);
+}
 static inline void
 drm_gem_object_unreference(struct drm_gem_object *obj)
+{
 	if (obj != NULL)
 		kref_put(&obj->refcount, drm_gem_object_free);
+}
 static inline void
 drm_gem_object_unreference_unlocked(struct drm_gem_object *obj)
+{
 	if (obj != NULL) {
 		struct drm_device *dev = obj->dev;
 		mutex_lock(&dev->struct_mutex);
 		kref_put(&obj->refcount, drm_gem_object_free);
 		mutex_unlock(&dev->struct_mutex);
+	}
+}
 int drm_gem_handle_create(struct drm_file *file_priv,
 			  struct drm_gem_object *obj,
 			  u32 *handlep);
 int drm_gem_handle_delete(struct drm_file *filp, u32 handle);
 static inline void
 drm_gem_object_handle_reference(struct drm_gem_object *obj)
+{
 	drm_gem_object_reference(obj);
 	atomic_inc(&obj->handle_count);
+}
 static inline void
 drm_gem_object_handle_unreference(struct drm_gem_object *obj)
+{
 	if (obj == NULL)
 		return;
 	if (atomic_read(&obj->handle_count) == 0)
 		return;
 	/*
 	 * Must bump handle count first as this may be the last
 	 * ref, in which case the object would disappear before we
 	 * checked for a name
 	 */
 	if (atomic_dec_and_test(&obj->handle_count))
 		drm_gem_object_handle_free(obj);
 	drm_gem_object_unreference(obj);
+}
 static inline void
 drm_gem_object_handle_unreference_unlocked(struct drm_gem_object *obj)
+{
 	if (obj == NULL)
 		return;
 	if (atomic_read(&obj->handle_count) == 0)
 		return;
 	/*
 	* Must bump handle count first as this may be the last
 	* ref, in which case the object would disappear before we
 	* checked for a name
 	*/
 	if (atomic_dec_and_test(&obj->handle_count))
 		drm_gem_object_handle_free(obj);
 	drm_gem_object_unreference_unlocked(obj);
+}
 void drm_gem_free_mmap_offset(struct drm_gem_object *obj);
 int drm_gem_create_mmap_offset(struct drm_gem_object *obj);
 struct drm_gem_object *drm_gem_object_lookup(struct drm_device *dev,
 					     struct drm_file *filp,
 					     u32 handle);
 int drm_gem_close_ioctl(struct drm_device *dev, void *data,
 			struct drm_file *file_priv);
 int drm_gem_flink_ioctl(struct drm_device *dev, void *data,
 			struct drm_file *file_priv);
 int drm_gem_open_ioctl(struct drm_device *dev, void *data,
 		       struct drm_file *file_priv);
 void drm_gem_open(struct drm_device *dev, struct drm_file *file_private);
 void drm_gem_release(struct drm_device *dev, struct drm_file *file_private);
 extern void drm_core_ioremap(struct drm_local_map *map, struct drm_device *dev);
 extern void drm_core_ioremap_wc(struct drm_local_map *map, struct drm_device *dev);
 extern void drm_core_ioremapfree(struct drm_local_map *map, struct drm_device *dev);
 static __inline__ struct drm_local_map *drm_core_findmap(struct drm_device *dev,
 							 unsigned int token)
+{
 	struct drm_map_list *_entry;
 	list_for_each_entry(_entry, &dev->maplist, head)
 	    if (_entry->user_token == token)
 		return _entry->map;
 	return NULL;
+}
 static __inline__ void drm_core_dropmap(struct drm_local_map *map)
+{
+}
 #include <drm/drm_mem_util.h>
 extern int drm_fill_in_dev(struct drm_device *dev,
 			   const struct pci_device_id *ent,
 			   struct drm_driver *driver);
 int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int type);
 /*@}*/
 /* PCI section */
 static __inline__ int drm_pci_device_is_agp(struct drm_device *dev)
+{
 	if (dev->driver->device_is_agp != NULL) {
 		int err = (*dev->driver->device_is_agp) (dev);
 		if (err != 2) {
 			return err;
+		}
+	}
 	return pci_find_capability(dev->pdev, PCI_CAP_ID_AGP);
+}
 extern int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver);
 extern void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver);
 extern int drm_get_pci_dev(struct pci_dev *pdev,
 			   const struct pci_device_id *ent,
 			   struct drm_driver *driver);
 #define DRM_PCIE_SPEED_25 1
 #define DRM_PCIE_SPEED_50 2
 #define DRM_PCIE_SPEED_80 4
 extern int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *speed_mask);
 /* platform section */
 extern int drm_platform_init(struct drm_driver *driver, struct platform_device *platform_device);
 extern void drm_platform_exit(struct drm_driver *driver, struct platform_device *platform_device);
 extern int drm_get_platform_dev(struct platform_device *pdev,
 				struct drm_driver *driver);
 /* returns true if currently okay to sleep */
 static __inline__ bool drm_can_sleep(void)
+{
 #ifdef __NetBSD__
 	return false;		/* XXX */
 #else
 	if (in_atomic() || in_dbg_master() || irqs_disabled())
 		return false;
 	return true;
 #endif
+}
 #ifdef __NetBSD__
 static inline bool
 DRM_IS_BUS_SPACE(struct drm_local_map *map)
+{
 	switch (map->type) {
 	case _DRM_FRAME_BUFFER:
 		panic("I don't know how to access drm frame buffer memory!");
 	case _DRM_REGISTERS:
 		return true;
 	case _DRM_SHM:
 		panic("I don't know how to access drm shared memory!");
 	case _DRM_AGP:
 		panic("I don't know how to access drm agp memory!");
 	case _DRM_SCATTER_GATHER:
 		panic("I don't know how to access drm scatter-gather memory!");
 	case _DRM_CONSISTENT:
 		/*
 		 * XXX Old drm uses bus space access for this, but
 		 * consistent maps don't have bus space handles!  They
 		 * do, however, have kernel virtual addresses in the
 		 * map->handle, so maybe that's right.
 		 */
 #if 0
 		return false;
 #endif
 		panic("I don't know how to access drm consistent memory!");
 	case _DRM_GEM:
 		panic("I don't know how to access drm gem memory!");
 	default:
 		panic("I don't know what kind of memory you mean!");
+	}
+}
 static inline uint8_t
 DRM_READ8(struct drm_local_map *map, bus_size_t offset)
+{
 	if (DRM_IS_BUS_SPACE(map))
 		return bus_space_read_1(map->lm_data.bus_space.bst,
 		    map->lm_data.bus_space.bsh, offset);
 	else
 		return *(volatile uint8_t *)((vaddr_t)map->handle + offset);
+}
 static inline uint16_t
 DRM_READ16(struct drm_local_map *map, bus_size_t offset)
+{
 	if (DRM_IS_BUS_SPACE(map))
 		return bus_space_read_2(map->lm_data.bus_space.bst,
 		    map->lm_data.bus_space.bsh, offset);
 	else
 		return *(volatile uint16_t *)((vaddr_t)map->handle + offset);
+}
 static inline uint32_t
 DRM_READ32(struct drm_local_map *map, bus_size_t offset)
+{
 	if (DRM_IS_BUS_SPACE(map))
 		return bus_space_read_4(map->lm_data.bus_space.bst,
 		    map->lm_data.bus_space.bsh, offset);
 	else
 		return *(volatile uint32_t *)((vaddr_t)map->handle + offset);
+}
 static inline uint64_t
 DRM_READ64(struct drm_local_map *map, bus_size_t offset)
+{
 	if (DRM_IS_BUS_SPACE(map))
 		return bus_space_read_8(map->lm_data.bus_space.bst,
 		    map->lm_data.bus_space.bsh, offset);
 	else
 		return *(volatile uint64_t *)((vaddr_t)map->handle + offset);
+}
 static inline void
 DRM_WRITE8(struct drm_local_map *map, bus_size_t offset, uint8_t value)
+{
 	if (DRM_IS_BUS_SPACE(map))
 		bus_space_write_1(map->lm_data.bus_space.bst,
 		    map->lm_data.bus_space.bsh, offset, value);
 	else
 		*(volatile uint8_t *)((vaddr_t)map->handle + offset) = value;
+}
 static inline void
 DRM_WRITE16(struct drm_local_map *map, bus_size_t offset, uint16_t value)
+{
 	if (DRM_IS_BUS_SPACE(map))
 		bus_space_write_2(map->lm_data.bus_space.bst,
 		    map->lm_data.bus_space.bsh, offset, value);
 	else
 		*(volatile uint16_t *)((vaddr_t)map->handle + offset) = value;
+}
 static inline void
 DRM_WRITE32(struct drm_local_map *map, bus_size_t offset, uint32_t value)
+{
 	if (DRM_IS_BUS_SPACE(map))
 		bus_space_write_4(map->lm_data.bus_space.bst,
 		    map->lm_data.bus_space.bsh, offset, value);
 	else
 		*(volatile uint32_t *)((vaddr_t)map->handle + offset) = value;
+}
 static inline void
 DRM_WRITE64(struct drm_local_map *map, bus_size_t offset, uint64_t value)
+{
 	if (DRM_IS_BUS_SPACE(map))
 		bus_space_write_8(map->lm_data.bus_space.bst,
 		    map->lm_data.bus_space.bsh, offset, value);
 	else
 		*(volatile uint64_t *)((vaddr_t)map->handle + offset) = value;
+}
 #endif	/* defined(__NetBSD__) */
 #ifdef __NetBSD__
 /* XXX This is pretty kludgerific.  */
 #include <linux/io-mapping.h>
 static inline struct io_mapping *
 drm_io_mapping_create_wc(struct drm_device *dev, resource_size_t addr,
     unsigned long size)
+{
 	return bus_space_io_mapping_create_wc(dev->bst, addr, size);
+}
 #endif	/* defined(__NetBSD__) */
 #endif				/* __KERNEL__ */
 #endif

 @@ -1,162 +1,184 @@
-/*	$NetBSD: drm_pci.c,v 1.1.2.1 2013/07/24 02:35:07 riastradh Exp $	*/
+/*	$NetBSD: drm_pci.c,v 1.1.2.2 2013/07/24 03:24:03 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.1.2.1 2013/07/24 02:35:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.1.2.2 2013/07/24 03:24:03 riastradh Exp $");
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/systm.h>
 #include <dev/pci/pcivar.h>
 #include <drm/drmP.h>
 static int	drm_pci_get_irq(struct drm_device *);
 static int	drm_pci_irq_install(struct drm_device *,
 		    irqreturn_t (*)(void *), int, const char *, void *,
 		    struct drm_bus_irq_cookie **);
 static void	drm_pci_irq_uninstall(struct drm_device *,
 		    struct drm_bus_irq_cookie *);
 static const char *
 		drm_pci_get_name(struct drm_device *);
 static int	drm_pci_set_busid(struct drm_device *, struct drm_master *);
 static int	drm_pci_set_unique(struct drm_device *, struct drm_master *,
 		    struct drm_unique *);
 static int	drm_pci_irq_by_busid(struct drm_device *,
 		    struct drm_irq_busid *);
 static int	drm_pci_agp_init(struct drm_device *);
 const struct drm_bus drm_pci_bus = {
 	.bus_type = DRIVER_BUS_PCI,
 	.get_irq = drm_pci_get_irq,
 	.irq_install = drm_pci_irq_install,
 	.irq_uninstall = drm_pci_irq_uninstall,
 	.get_name = drm_pci_get_name,
 	.set_busid = drm_pci_set_busid,
 	.set_unique = drm_pci_set_unique,
 	.irq_by_busid = drm_pci_irq_by_busid,
 	.agp_init = drm_pci_agp_init,
 };
 static const struct pci_attach_args *
 drm_pci_attach_args(struct drm_device *dev)
+{
 	return &dev->pdev->pd_pa;
+}
 void
 drm_pci_attach(device_t self, const struct pci_attach_args *pa,
     struct pci_dev *pdev, struct drm_device *dev)
+{
 	linux_pci_dev_init(pdev, self, pa, false);
 	dev->pdev = pdev;
 	dev->pci_vendor = pdev->vendor;
 	dev->pci_device = pdev->device;
 	/* XXX Set the power state to D0?  */
+}
 int
 drm_pci_detach(struct drm_device *dev __unused, int flags __unused)
+{
 	/* XXX Disestablish irqs or anything?  */
 	return 0;
+}
 static int
 drm_pci_get_irq(struct drm_device *dev)
+{
 	pci_intr_handle_t ih_pih;
 	int ih_int;
 	/*
 	 * This is a compile-time assertion that the types match.  If
 	 * this fails, we have to change a bunch of drm code that uses
 	 * int for intr handles.
 	 */
 	KASSERT(&ih_pih != &ih_int);
 	if (pci_intr_map(drm_pci_attach_args(dev), &ih_pih))
 		return -1;	/* XXX Hope -1 is an invalid intr handle.  */
 	ih_int = ih_pih;
 	return ih_int;
+}
 static int
 drm_pci_irq_install(struct drm_device *dev, irqreturn_t (*handler)(void *),
     int flags, const char *name, void *arg,
     struct drm_bus_irq_cookie **cookiep)
+{
 	const struct pci_attach_args *const pa = drm_pci_attach_args(dev);
 	pci_intr_handle_t ih;
 	const char *intrstr;
 	void *ih_cookie;
 	if (pci_intr_map(pa, &ih))
 		return -ENOENT;
 	intrstr = pci_intr_string(pa->pa_pc, ih);
 	ih_cookie = pci_intr_establish(pa->pa_pc, ih, IPL_DRM, handler, arg);
 	if (ih_cookie == NULL) {
 		aprint_error_dev(dev->dev,
 		    "couldn't establish interrupt at %s (%s)\n",
 		    intrstr, name);
 		return -ENOENT;
+	}
 	aprint_normal_dev(dev->dev, "interrupting at %s (%s)\n",
 	    intrstr, name);
 	*cookiep = (struct drm_bus_irq_cookie *)ih_cookie;
 	return 0;
+}
 static void
 drm_pci_irq_uninstall(struct drm_device *dev,
     struct drm_bus_irq_cookie *cookie)
+{
 	const struct pci_attach_args *pa = drm_pci_attach_args(dev);
 	pci_intr_disestablish(pa->pa_pc, (void *)cookie);
+}
 static const char *
 drm_pci_get_name(struct drm_device *dev)
+{
 	return "pci";		/* XXX PCI bus names?  */
+}
 static int
 drm_pci_set_busid(struct drm_device *dev, struct drm_master *master)
+{
 	return -ENOSYS;		/* XXX PCI bus ids?  */
+}
 static int
 drm_pci_set_unique(struct drm_device *dev, struct drm_master *master,
     struct drm_unique *unique)
+{
 	return -ENOSYS;		/* XXX */
+}
 static int
 drm_pci_irq_by_busid(struct drm_device *dev, struct drm_irq_busid *busid)
+{
 	return -ENOSYS;		/* XXX */
+}
 static int
 drm_pci_agp_init(struct drm_device *dev)
+{
 	return -ENOSYS;		/* XXX */
+}