WebSVN – Kolibri OS – Diff – /drivers/include/drm/drmP.h

 #include
 #include
 #include
-#include
-#include
 #include
 #include
 #include
 #include
  *	This is the category used by the DRM_DEBUG_KMS() macro.
+ *
  * PRIME: used in the prime code.
  *	  This is the category used by the DRM_DEBUG_PRIME() macro.
+ *
+ * ATOMIC: used in the atomic code.
+ *	  This is the category used by the DRM_DEBUG_ATOMIC() macro.
+ *
+ * VBL: used for verbose debug message in the vblank code
+ *	  This is the category used by the DRM_DEBUG_VBL() macro.
+ *
  * Enabling verbose debug messages is done through the drm.debug parameter,
  * each category being enabled by a bit.
+ *
  * drm.debug=0x1 will enable CORE messages
  * drm.debug=0x2 will enable DRIVER messages
  * drm.debug=0x3 will enable CORE and DRIVER messages
  * ...
- * drm.debug=0xf will enable all messages
+ * drm.debug=0x3f will enable all messages
+ *
  * An interesting feature is that it's possible to enable verbose logging at
  * run-time by echoing the debug value in its sysfs node:
  *   # echo 0xf > /sys/module/drm/parameters/debug
  */
 #define DRM_UT_CORE 		0x01
 #define DRM_UT_DRIVER		0x02
-#define DRM_UT_KMS          0x04
+#define DRM_UT_KMS		0x04
 #define DRM_UT_PRIME		0x08
+#define DRM_UT_ATOMIC		0x10
+#define DRM_UT_VBL		0x20
 extern __printf(2, 3)
 void drm_ut_debug_printk(const char *function_name,
-				const char *format, ...);
+			 const char *format, ...);
-#define DRIVER_IRQ_SHARED  0x80
+#define DRIVER_IRQ_SHARED		0x80
-#define DRIVER_GEM         0x1000
+#define DRIVER_GEM			0x1000
-#define DRIVER_MODESET     0x2000
+#define DRIVER_MODESET			0x2000
-#define DRIVER_PRIME       0x4000
+#define DRIVER_PRIME			0x4000
-#define DRIVER_RENDER      0x8000
+#define DRIVER_RENDER			0x8000
+#define DRIVER_ATOMIC			0x10000
+#define DRIVER_KMS_LEGACY_CONTEXT	0x20000
 /***********************************************************************/
 /** \name Macros to make printk easier */
+ *
  * \param fmt printf() like format string.
  * \param arg arguments
  */
 #define DRM_ERROR(fmt, ...)				\
-	drm_err(fmt, ##__VA_ARGS__)
+	printk("DRM Error" fmt, ##__VA_ARGS__)
 /**
  * Rate limited error output.  Like DRM_ERROR() but won't flood the log.
+ *
 	} while (0)
 #define DRM_DEBUG_PRIME(fmt, args...)					\
 	do {								\
     printk(KERN_INFO "[" DRM_NAME "] " fmt, ##args);  \
 	} while (0)
+#define DRM_DEBUG_ATOMIC(fmt, args...)					\
+	do {								\
+		printk(KERN_INFO "[" DRM_NAME "] " fmt, ##args);  \
+	} while (0)
+#define DRM_DEBUG_VBL(fmt, args...)					\
+	do {								\
+		printk(KERN_INFO "[" DRM_NAME "] " fmt, ##args);  \
+	} while (0)
 #else
 #define DRM_DEBUG_DRIVER(fmt, args...) do { } while (0)
 #define DRM_DEBUG_KMS(fmt, args...)	do { } while (0)
 #define DRM_DEBUG_PRIME(fmt, args...)	do { } while (0)
 #define DRM_DEBUG(fmt, arg...)		 do { } while (0)
+#define DRM_DEBUG_ATOMIC(fmt, args...) do { } while (0)
+#define DRM_DEBUG_VBL(fmt, args...) do { } while (0)
 #endif
 /*@}*/
 /***********************************************************************/
 /** \name Internal types and structures */
 struct drm_ioctl_desc {
 	unsigned int cmd;
 	int flags;
-	drm_ioctl_t *func;
-	unsigned int cmd_drv;
+	drm_ioctl_t *func;
 	const char *name;
 };
 /**
  * Creates a driver or general drm_ioctl_desc array entry for the given
  * ioctl, for use by drm_ioctl().
  */
+#define DRM_IOCTL_DEF_DRV(ioctl, _func, _flags)				\
+	[DRM_IOCTL_NR(DRM_IOCTL_##ioctl) - DRM_COMMAND_BASE] = {	\
+		.cmd = DRM_IOCTL_##ioctl,				\
+		.func = _func,						\
 		.flags = _flags,					\
-#define DRM_IOCTL_DEF_DRV(ioctl, _func, _flags)			\
+		.name = #ioctl						\
 	[DRM_IOCTL_NR(DRM_##ioctl)] = {.cmd = DRM_##ioctl, .func = _func, .flags = _flags, .cmd_drv = DRM_IOCTL_##ioctl, .name = #ioctl}
 	/*
 	 * true if client understands CRTC primary planes and cursor planes
 	 * in the plane list
 	 */
 	unsigned universal_planes:1;
+	/* true if client understands atomic properties */
+	unsigned atomic:1;
 	struct list_head lhead;
+	struct drm_minor *minor;
 	unsigned long lock_count;
 	/** Mapping of mm object handles to object pointers. */
 	struct idr object_idr;
 	 * the fb object to prevent it from untimely disappearing.
 	 */
 	struct list_head fbs;
 	struct mutex fbs_lock;
+	/** User-created blob properties; this retains a reference on the
+	 *  property. */
+	struct list_head blobs;
 	wait_queue_head_t event_wait;
 	struct list_head event_list;
 	int event_space;
+ *
  * @refcount: Refcount for this master object.
  * @minor: Link back to minor char device we are master for. Immutable.
  * @unique: Unique identifier: e.g. busid. Protected by drm_global_mutex.
  * @unique_len: Length of unique field. Protected by drm_global_mutex.
- * @magiclist: Hash of used authentication tokens. Protected by struct_mutex.
+ * @magic_map: Map of used authentication tokens. Protected by struct_mutex.
- * @magicfree: List of used authentication tokens. Protected by struct_mutex.
  * @lock: DRI lock information.
  * @driver_priv: Pointer to driver-private information.
  */
 struct drm_master {
 	struct kref refcount;
 	struct drm_minor *minor;
 	char *unique;
 	int unique_len;
-	struct drm_open_hash magiclist;
-	struct list_head magicfree;
+	struct idr magic_map;
 	struct drm_lock_data lock;
 	void *driver_priv;
 };
 	int (*open) (struct drm_device *, struct drm_file *);
 	/**
 	 * get_vblank_counter - get raw hardware vblank counter
 	 * @dev: DRM device
-	 * @crtc: counter to fetch
+	 * @pipe: 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
 	 * with in the DRM core code.
+	 *
 	 * RETURNS
 	 * Raw vblank counter value.
 	 */
-	u32 (*get_vblank_counter) (struct drm_device *dev, int crtc);
+	u32 (*get_vblank_counter) (struct drm_device *dev, unsigned int pipe);
 	/**
 	 * enable_vblank - enable vblank interrupt events
 	 * @dev: DRM device
-	 * @crtc: which irq to enable
+	 * @pipe: 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);
+	int (*enable_vblank) (struct drm_device *dev, unsigned int pipe);
 	/**
 	 * disable_vblank - disable vblank interrupt events
 	 * @dev: DRM device
-	 * @crtc: which irq to enable
+	 * @pipe: 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, unsigned int pipe);
+	/**
+	 * 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);
 	void (*disable_vblank) (struct drm_device *dev, int crtc);
 	/**
 	 * Called by vblank timestamping code.
+	 *
 	 * Return the current display scanout position from a crtc, and an
 	 * optional accurate ktime_get timestamp of when position was measured.
 	 *
 	 * \param dev  DRM device.
-	 * \param crtc Id of the crtc to query.
+	 * \param pipe Id of the crtc to query.
 	 * \param flags Flags from the caller (DRM_CALLED_FROM_VBLIRQ or 0).
 	 * \param *vpos Target location for current vertical scanout position.
 	 * \param *hpos Target location for current horizontal scanout position.
 	 * \param *stime Target location for timestamp taken immediately before
 	 *               scanout position query. Can be NULL to skip timestamp.
+	 * \param *etime Target location for timestamp taken immediately after
-	 * \param *etime Target location for timestamp taken immediately after
+	 *               scanout position query. Can be NULL to skip timestamp.
-	 *               scanout position query. Can be NULL to skip timestamp.
+	 * \param mode Current display timings.
+	 *
 	 * Returns vpos as a positive number while in active scanout area.
 	 * Returns vpos as a negative number inside vblank, counting the number
 	 * 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 (*get_scanout_position) (struct drm_device *dev, unsigned int pipe,
-				     unsigned int flags,
+				     unsigned int flags, int *vpos, int *hpos,
-                     int *vpos, int *hpos, void *stime,
+				     ktime_t *stime, ktime_t *etime,
-                     void *etime);
+				     const struct drm_display_mode *mode);
 	/**
 	 * Called by \c drm_get_last_vbltimestamp. Should return a precise
 	 * timestamp when the most recent VBLANK interval ended or will end.
 	 * 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 pipe 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.
 	 * \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 (*get_vblank_timestamp) (struct drm_device *dev, unsigned int pipe,
 				     int *max_error,
 				     struct timeval *vblank_time,
 				     unsigned flags);
  * DRM minor structure. This structure represents a drm minor number.
  */
 struct drm_minor {
 	int index;			/**< Minor device number */
 	int type;                       /**< Control or render */
-//   struct device kdev;     /**< Linux device */
+	struct device *kdev;		/**< Linux device */
 	struct drm_device *dev;
 	struct dentry *debugfs_root;
 	struct list_head debugfs_list;
 	struct mutex debugfs_lock; /* Protects debugfs_list. */
 	/* currently active master for this node. Protected by master_mutex */
-	struct drm_master *master;
+	/* currently active master for this node. Protected by master_mutex */
-	struct drm_mode_group mode_group;
+	struct drm_master *master;
 };
 struct drm_pending_vblank_event {
 	struct drm_pending_event base;
-	int pipe;
+	unsigned int pipe;
-	struct drm_event_vblank event;
-};
+	struct drm_event_vblank event;
+};
+struct drm_vblank_crtc {
+	struct drm_device *dev;		/* pointer to the drm_device */
+	wait_queue_head_t queue;	/**< VBLANK wait queue */
+	struct timer_list disable_timer;		/* delayed disable timer */
 struct drm_vblank_crtc {
-	struct drm_device *dev;		/* pointer to the drm_device */
+	/* vblank counter, protected by dev->vblank_time_lock for writes */
-	wait_queue_head_t queue;	/**< VBLANK wait queue */
+	u32 count;
-	struct timeval time[DRM_VBLANKTIME_RBSIZE];	/**< timestamp of current count */
+	/* vblank timestamps, protected by dev->vblank_time_lock for writes */
-	struct timer_list disable_timer;		/* delayed disable timer */
+	struct timeval time[DRM_VBLANKTIME_RBSIZE];
-	atomic_t count;			/**< number of VBLANK interrupts */
+	atomic_t refcount;		/* number of users of vblank interruptsper crtc */
+	u32 last;			/* protected by dev->vbl_lock, used */
-	atomic_t refcount;		/* number of users of vblank interruptsper crtc */
+					/* for wraparound handling */
-	u32 last;			/* protected by dev->vbl_lock, used */
+	u32 last_wait;			/* Last vblank seqno waited per CRTC */
-					/* for wraparound handling */
+	unsigned int inmodeset;		/* Display driver is setting mode */
-	u32 last_wait;			/* Last vblank seqno waited per CRTC */
+	unsigned int pipe;		/* crtc index */
 	/*@{ */
 	struct kref ref;		/**< Object ref-count */
 	struct device *dev;		/**< Device structure of bus-device */
 	struct drm_driver *driver;	/**< DRM driver managing the device */
 	void *dev_private;		/**< DRM driver private data */
+	struct drm_minor *control;		/**< Control node */
 	struct drm_minor *primary;		/**< Primary node */
+	struct drm_minor *render;		/**< Render node */
 	atomic_t unplugged;			/**< Flag whether dev is dead */
 	/** \name Locks */
 	/*@{ */
 	struct mutex struct_mutex;	/**< For others */
 	struct mutex master_mutex;      /**< For drm_minor::master and drm_file::is_master */
 //   struct drm_device_dma *dma;     /**< Optional pointer for DMA support */
 	/*@} */
 	/** \name Context support */
-	/*@{ */
-	bool irq_enabled;		/**< True if irq handler is enabled */
-	int irq;
+	/*@{ */
 	__volatile__ long context_flag;	/**< Context swapping flag */
 	int last_context;		/**< Last current context */
 	/*@} */
+	/** \name VBLANK IRQ support */
 	/*@{ */
-	/** \name VBLANK IRQ support */
+	bool irq_enabled;
-	/*@{ */
+	int irq;
 /******************************************************************/
 /** \name Internal function definitions */
 /*@{*/
+				/* Driver support (drm_drv.h) */
-				/* Driver support (drm_drv.h) */
+extern int drm_ioctl_permit(u32 flags, struct drm_file *file_priv);
 extern long drm_ioctl(struct file *filp,
-		     unsigned int cmd, unsigned long arg);
+		      unsigned int cmd, unsigned long arg);
 extern long drm_compat_ioctl(struct file *filp,
 			     unsigned int cmd, unsigned long arg);
 				/* Device support (drm_fops.h) */
 extern int drm_open(struct inode *inode, struct file *filp);
 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);
+extern int drm_new_set_master(struct drm_device *dev, struct drm_file *fpriv);
 				/* Mapping support (drm_vm.h) */
 extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait);
 /* Misc. IOCTL support (drm_ioctl.c) */
+int drm_noop(struct drm_device *dev, void *data,
+	     struct drm_file *file_priv);
-int drm_noop(struct drm_device *dev, void *data,
+int drm_invalid_op(struct drm_device *dev, void *data,
-			 struct drm_file *file_priv);
+		   struct drm_file *file_priv);
 /* Cache management (drm_cache.c) */
 				/* IRQ support (drm_irq.h) */
 extern int drm_irq_install(struct drm_device *dev, int irq);
 extern int drm_irq_uninstall(struct drm_device *dev);
-extern int drm_vblank_init(struct drm_device *dev, int num_crtcs);
+extern int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs);
 extern int drm_wait_vblank(struct drm_device *dev, void *data,
+			   struct drm_file *filp);
-			   struct drm_file *filp);
+extern u32 drm_vblank_count(struct drm_device *dev, unsigned int pipe);
+extern u32 drm_crtc_vblank_count(struct drm_crtc *crtc);
+extern u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
-extern u32 drm_vblank_count(struct drm_device *dev, int crtc);
+				     struct timeval *vblanktime);
-extern u32 drm_vblank_count_and_time(struct drm_device *dev, int crtc,
+extern u32 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc,
+					  struct timeval *vblanktime);
+extern void drm_send_vblank_event(struct drm_device *dev, unsigned int pipe,
-				     struct timeval *vblanktime);
+				  struct drm_pending_vblank_event *e);
-extern void drm_send_vblank_event(struct drm_device *dev, int crtc,
+extern void drm_crtc_send_vblank_event(struct drm_crtc *crtc,
+				       struct drm_pending_vblank_event *e);
-				     struct drm_pending_vblank_event *e);
+extern bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe);
-extern bool drm_handle_vblank(struct drm_device *dev, int crtc);
+extern bool drm_crtc_handle_vblank(struct drm_crtc *crtc);
-extern int drm_vblank_get(struct drm_device *dev, int crtc);
+extern int drm_vblank_get(struct drm_device *dev, unsigned int pipe);
-extern void drm_vblank_put(struct drm_device *dev, int crtc);
+extern void drm_vblank_put(struct drm_device *dev, unsigned int pipe);
 extern int drm_crtc_vblank_get(struct drm_crtc *crtc);
 extern void drm_crtc_vblank_put(struct drm_crtc *crtc);
-extern void drm_wait_one_vblank(struct drm_device *dev, int crtc);
+extern void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe);
 extern void drm_crtc_wait_one_vblank(struct drm_crtc *crtc);
-extern void drm_vblank_off(struct drm_device *dev, int crtc);
+extern void drm_vblank_off(struct drm_device *dev, unsigned int pipe);
+extern void drm_vblank_on(struct drm_device *dev, unsigned int pipe);
-extern void drm_vblank_on(struct drm_device *dev, int crtc);
+extern void drm_crtc_vblank_off(struct drm_crtc *crtc);
-extern void drm_crtc_vblank_off(struct drm_crtc *crtc);
+extern void drm_crtc_vblank_reset(struct drm_crtc *crtc);
+extern void drm_crtc_vblank_on(struct drm_crtc *crtc);
-extern void drm_crtc_vblank_on(struct drm_crtc *crtc);
+extern void drm_vblank_cleanup(struct drm_device *dev);
-extern void drm_vblank_cleanup(struct drm_device *dev);
+extern u32 drm_vblank_no_hw_counter(struct drm_device *dev, unsigned int pipe);
 extern int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
-						 int crtc, int *max_error,
-						 struct timeval *vblank_time,
+						 unsigned int pipe, int *max_error,
-						 unsigned flags,
+						 struct timeval *vblank_time,
-						 const struct drm_crtc *refcrtc,
+						 unsigned flags,
 						 const struct drm_display_mode *mode);
+{
 	return &crtc->dev->vblank[drm_crtc_index(crtc)].queue;
+}
 /* Modesetting support */
-extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc);
+extern void drm_vblank_pre_modeset(struct drm_device *dev, unsigned int pipe);
-extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc);
+extern void drm_vblank_post_modeset(struct drm_device *dev, unsigned int pipe);
 				/* Stub support (drm_stub.h) */
 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 void drm_put_dev(struct drm_device *dev);
+extern void drm_unplug_dev(struct drm_device *dev);
-extern void drm_unplug_dev(struct drm_device *dev);
+extern unsigned int drm_debug;
-extern unsigned int drm_debug;
+extern bool drm_atomic;

Subversion Repositories Kolibri OS

(root)/drivers/include/drm/drmP.h – Rev 5270 → 6082