git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
char
/
drm
/
i915_drv.h
diff --git
a/drivers/char/drm/i915_drv.h
b/drivers/char/drm/i915_drv.h
index
2d56503
..
7a65666
100644
(file)
--- a/
drivers/char/drm/i915_drv.h
+++ b/
drivers/char/drm/i915_drv.h
@@
-45,10
+45,9
@@
* 1.2: Add Power Management
* 1.3: Add vblank support
* 1.4: Fix cmdbuffer path, add heap destroy
* 1.2: Add Power Management
* 1.3: Add vblank support
* 1.4: Fix cmdbuffer path, add heap destroy
- * 1.5: Add vblank pipe configuration
*/
#define DRIVER_MAJOR 1
*/
#define DRIVER_MAJOR 1
-#define DRIVER_MINOR
5
+#define DRIVER_MINOR
4
#define DRIVER_PATCHLEVEL 0
typedef struct _drm_i915_ring_buffer {
#define DRIVER_PATCHLEVEL 0
typedef struct _drm_i915_ring_buffer {
@@
-97,7
+96,6
@@
typedef struct drm_i915_private {
int allow_batchbuffer;
struct mem_block *agp_heap;
unsigned int sr01, adpa, ppcr, dvob, dvoc, lvds;
int allow_batchbuffer;
struct mem_block *agp_heap;
unsigned int sr01, adpa, ppcr, dvob, dvoc, lvds;
- int vblank_pipe;
} drm_i915_private_t;
extern drm_ioctl_desc_t i915_ioctls[];
} drm_i915_private_t;
extern drm_ioctl_desc_t i915_ioctls[];
@@
-121,8
+119,6
@@
extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS);
extern void i915_driver_irq_preinstall(drm_device_t * dev);
extern void i915_driver_irq_postinstall(drm_device_t * dev);
extern void i915_driver_irq_uninstall(drm_device_t * dev);
extern void i915_driver_irq_preinstall(drm_device_t * dev);
extern void i915_driver_irq_postinstall(drm_device_t * dev);
extern void i915_driver_irq_uninstall(drm_device_t * dev);
-extern int i915_vblank_pipe_set(DRM_IOCTL_ARGS);
-extern int i915_vblank_pipe_get(DRM_IOCTL_ARGS);
/* i915_mem.c */
extern int i915_mem_alloc(DRM_IOCTL_ARGS);
/* i915_mem.c */
extern int i915_mem_alloc(DRM_IOCTL_ARGS);