Module Name: src
Committed By: mrg
Date: Thu Feb 24 07:59:44 UTC 2011
Modified Files:
src/sys/external/bsd/drm/dist/bsd-core: drmP.h drm_irq.c
src/sys/external/bsd/drm/dist/shared-core: i915_drv.h i915_irq.c
mach64_drv.h mach64_irq.c mga_drv.h mga_irq.c r128_drv.h r128_irq.c
radeon_drv.h radeon_irq.c via_drv.h via_irq.c
Log Message:
convert all crtc values passed in from userland to be unsigned instead
of signed. there's still some more internal to the i915 driver that
should be converted.
tested on a radeon x1550.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/drm/dist/bsd-core/drmP.h
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm/dist/shared-core/i915_drv.h
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm/dist/shared-core/i915_irq.c \
src/sys/external/bsd/drm/dist/shared-core/radeon_irq.c \
src/sys/external/bsd/drm/dist/shared-core/via_drv.h \
src/sys/external/bsd/drm/dist/shared-core/via_irq.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm/dist/shared-core/mach64_drv.h
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/sys/external/bsd/drm/dist/shared-core/mach64_irq.c \
src/sys/external/bsd/drm/dist/shared-core/mga_irq.c \
src/sys/external/bsd/drm/dist/shared-core/r128_drv.h \
src/sys/external/bsd/drm/dist/shared-core/r128_irq.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm/dist/shared-core/mga_drv.h
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/drm/dist/shared-core/radeon_drv.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm/dist/bsd-core/drmP.h
diff -u src/sys/external/bsd/drm/dist/bsd-core/drmP.h:1.20 src/sys/external/bsd/drm/dist/bsd-core/drmP.h:1.21
--- src/sys/external/bsd/drm/dist/bsd-core/drmP.h:1.20 Fri Feb 18 14:26:09 2011
+++ src/sys/external/bsd/drm/dist/bsd-core/drmP.h Thu Feb 24 07:59:44 2011
@@ -728,9 +728,9 @@
int (*irq_postinstall)(struct drm_device *dev);
void (*irq_uninstall)(struct drm_device *dev);
irqreturn_t (*irq_handler)(DRM_IRQ_ARGS);
- u32 (*get_vblank_counter)(struct drm_device *dev, int crtc);
- int (*enable_vblank)(struct drm_device *dev, int crtc);
- void (*disable_vblank)(struct drm_device *dev, int crtc);
+ u32 (*get_vblank_counter)(struct drm_device *dev, unsigned int crtc);
+ int (*enable_vblank)(struct drm_device *dev, unsigned int crtc);
+ void (*disable_vblank)(struct drm_device *dev, unsigned int crtc);
drm_pci_id_list_t *id_entry; /* PCI ID, name, and chipset private */
@@ -1075,14 +1075,14 @@
void drm_driver_irq_preinstall(struct drm_device *dev);
void drm_driver_irq_postinstall(struct drm_device *dev);
void drm_driver_irq_uninstall(struct drm_device *dev);
-void drm_handle_vblank(struct drm_device *dev, int crtc);
-u32 drm_vblank_count(struct drm_device *dev, int crtc);
-int drm_vblank_get(struct drm_device *dev, int crtc);
-void drm_vblank_put(struct drm_device *dev, int crtc);
+void drm_handle_vblank(struct drm_device *dev, unsigned int crtc);
+u32 drm_vblank_count(struct drm_device *dev, unsigned int crtc);
+int drm_vblank_get(struct drm_device *dev, unsigned int crtc);
+void drm_vblank_put(struct drm_device *dev, unsigned int crtc);
void drm_vblank_cleanup(struct drm_device *dev);
int drm_vblank_wait(struct drm_device *dev, unsigned int *vbl_seq);
int drm_vblank_init(struct drm_device *dev, int num_crtcs);
-void drm_vbl_send_signals(struct drm_device *dev, int crtc);
+void drm_vbl_send_signals(struct drm_device *dev, unsigned int crtc);
int drm_modeset_ctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c:1.12 src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c:1.13
--- src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c:1.12 Thu Jul 1 02:38:29 2010
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c Thu Feb 24 07:59:44 2011
@@ -79,7 +79,7 @@
static void vblank_disable_fn(void *arg)
{
struct drm_device *dev = (struct drm_device *)arg;
- int i;
+ unsigned int i;
#if defined(__NetBSD__)
mutex_enter(&dev->vbl_lock);
@@ -298,12 +298,12 @@
}
}
-u32 drm_vblank_count(struct drm_device *dev, int crtc)
+u32 drm_vblank_count(struct drm_device *dev, unsigned int crtc)
{
return atomic_read(&dev->vblank[crtc].count);
}
-static void drm_update_vblank_count(struct drm_device *dev, int crtc)
+static void drm_update_vblank_count(struct drm_device *dev, unsigned int crtc)
{
u32 cur_vblank, diff;
@@ -329,7 +329,7 @@
atomic_add(diff, &dev->vblank[crtc].count);
}
-int drm_vblank_get(struct drm_device *dev, int crtc)
+int drm_vblank_get(struct drm_device *dev, unsigned int crtc)
{
unsigned long irqflags;
int ret = 0;
@@ -353,7 +353,7 @@
return ret;
}
-void drm_vblank_put(struct drm_device *dev, int crtc)
+void drm_vblank_put(struct drm_device *dev, unsigned int crtc)
{
unsigned long irqflags;
@@ -375,7 +375,8 @@
{
struct drm_modeset_ctl *modeset = data;
unsigned long irqflags;
- int crtc, ret = 0;
+ int ret = 0;
+ unsigned int crtc;
DRM_DEBUG("num_crtcs=%d\n", dev->num_crtcs);
/* If drm_vblank_init() hasn't been called yet, just no-op */
@@ -527,12 +528,12 @@
return ret;
}
-void drm_vbl_send_signals(struct drm_device *dev, int crtc)
+void drm_vbl_send_signals(struct drm_device *dev, unsigned int crtc)
{
}
#if 0 /* disabled */
-void drm_vbl_send_signals(struct drm_device *dev, int crtc )
+void drm_vbl_send_signals(struct drm_device *dev, unsigned int crtc )
{
drm_vbl_sig_t *vbl_sig;
unsigned int vbl_seq = atomic_read( &dev->vbl_received );
@@ -558,7 +559,7 @@
}
#endif
-void drm_handle_vblank(struct drm_device *dev, int crtc)
+void drm_handle_vblank(struct drm_device *dev, unsigned int crtc)
{
atomic_inc(&dev->vblank[crtc].count);
DRM_WAKEUP(&dev->vblank[crtc].queue);
Index: src/sys/external/bsd/drm/dist/shared-core/i915_drv.h
diff -u src/sys/external/bsd/drm/dist/shared-core/i915_drv.h:1.2 src/sys/external/bsd/drm/dist/shared-core/i915_drv.h:1.3
--- src/sys/external/bsd/drm/dist/shared-core/i915_drv.h:1.2 Fri Jan 21 21:57:16 2011
+++ src/sys/external/bsd/drm/dist/shared-core/i915_drv.h Thu Feb 24 07:59:44 2011
@@ -432,10 +432,10 @@
struct drm_file *file_priv);
extern int i915_vblank_pipe_get(struct drm_device *dev, void *data,
struct drm_file *file_priv);
-extern int i915_enable_vblank(struct drm_device *dev, int crtc);
-extern void i915_disable_vblank(struct drm_device *dev, int crtc);
-extern u32 i915_get_vblank_counter(struct drm_device *dev, int crtc);
-extern u32 gm45_get_vblank_counter(struct drm_device *dev, int crtc);
+extern int i915_enable_vblank(struct drm_device *dev, unsigned int crtc);
+extern void i915_disable_vblank(struct drm_device *dev, unsigned int crtc);
+extern u32 i915_get_vblank_counter(struct drm_device *dev, unsigned int crtc);
+extern u32 gm45_get_vblank_counter(struct drm_device *dev, unsigned int crtc);
extern int i915_vblank_swap(struct drm_device *dev, void *data,
struct drm_file *file_priv);
Index: src/sys/external/bsd/drm/dist/shared-core/i915_irq.c
diff -u src/sys/external/bsd/drm/dist/shared-core/i915_irq.c:1.3 src/sys/external/bsd/drm/dist/shared-core/i915_irq.c:1.4
--- src/sys/external/bsd/drm/dist/shared-core/i915_irq.c:1.3 Fri Jun 19 03:50:05 2009
+++ src/sys/external/bsd/drm/dist/shared-core/i915_irq.c Thu Feb 24 07:59:44 2011
@@ -133,7 +133,7 @@
/* Called from drm generic code, passed a 'crtc', which
* we use as a pipe index
*/
-u32 i915_get_vblank_counter(struct drm_device *dev, int pipe)
+u32 i915_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
unsigned long high_frame;
@@ -167,7 +167,7 @@
return count;
}
-u32 gm45_get_vblank_counter(struct drm_device *dev, int pipe)
+u32 gm45_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
int reg = pipe ? PIPEB_FRMCOUNT_GM45 : PIPEA_FRMCOUNT_GM45;
@@ -376,7 +376,7 @@
/* Called from drm generic code, passed 'crtc' which
* we use as a pipe index
*/
-int i915_enable_vblank(struct drm_device *dev, int pipe)
+int i915_enable_vblank(struct drm_device *dev, unsigned int pipe)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
unsigned long irqflags;
@@ -400,7 +400,7 @@
/* Called from drm generic code, passed 'crtc' which
* we use as a pipe index
*/
-void i915_disable_vblank(struct drm_device *dev, int pipe)
+void i915_disable_vblank(struct drm_device *dev, unsigned int pipe)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
unsigned long irqflags;
Index: src/sys/external/bsd/drm/dist/shared-core/radeon_irq.c
diff -u src/sys/external/bsd/drm/dist/shared-core/radeon_irq.c:1.3 src/sys/external/bsd/drm/dist/shared-core/radeon_irq.c:1.4
--- src/sys/external/bsd/drm/dist/shared-core/radeon_irq.c:1.3 Sat Aug 8 17:59:25 2009
+++ src/sys/external/bsd/drm/dist/shared-core/radeon_irq.c Thu Feb 24 07:59:44 2011
@@ -61,7 +61,7 @@
RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg);
}
-int radeon_enable_vblank(struct drm_device *dev, int crtc)
+int radeon_enable_vblank(struct drm_device *dev, unsigned int crtc)
{
drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -99,7 +99,7 @@
return 0;
}
-void radeon_disable_vblank(struct drm_device *dev, int crtc)
+void radeon_disable_vblank(struct drm_device *dev, unsigned int crtc)
{
drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -287,7 +287,7 @@
return ret;
}
-u32 radeon_get_vblank_counter(struct drm_device *dev, int crtc)
+u32 radeon_get_vblank_counter(struct drm_device *dev, unsigned int crtc)
{
drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -298,7 +298,7 @@
if (!dev_priv->mmio)
return 0;
- if (crtc < 0 || crtc > 1) {
+ if (crtc > 1) {
DRM_ERROR("Invalid crtc %d\n", crtc);
return -EINVAL;
}
Index: src/sys/external/bsd/drm/dist/shared-core/via_drv.h
diff -u src/sys/external/bsd/drm/dist/shared-core/via_drv.h:1.3 src/sys/external/bsd/drm/dist/shared-core/via_drv.h:1.4
--- src/sys/external/bsd/drm/dist/shared-core/via_drv.h:1.3 Fri Feb 18 14:26:10 2011
+++ src/sys/external/bsd/drm/dist/shared-core/via_drv.h Thu Feb 24 07:59:44 2011
@@ -132,9 +132,9 @@
extern int via_final_context(struct drm_device * dev, int context);
extern int via_do_cleanup_map(struct drm_device * dev);
-extern uint32_t via_get_vblank_counter(struct drm_device *dev, int crtc);
-extern int via_enable_vblank(struct drm_device *dev, int crtc);
-extern void via_disable_vblank(struct drm_device *dev, int crtc);
+extern uint32_t via_get_vblank_counter(struct drm_device *dev, unsigned int crtc);
+extern int via_enable_vblank(struct drm_device *dev, unsigned int crtc);
+extern void via_disable_vblank(struct drm_device *dev, unsigned int crtc);
extern irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS);
extern void via_driver_irq_preinstall(struct drm_device * dev);
Index: src/sys/external/bsd/drm/dist/shared-core/via_irq.c
diff -u src/sys/external/bsd/drm/dist/shared-core/via_irq.c:1.3 src/sys/external/bsd/drm/dist/shared-core/via_irq.c:1.4
--- src/sys/external/bsd/drm/dist/shared-core/via_irq.c:1.3 Fri Feb 18 14:26:10 2011
+++ src/sys/external/bsd/drm/dist/shared-core/via_irq.c Thu Feb 24 07:59:44 2011
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: via_irq.c,v 1.3 2011/02/18 14:26:10 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via_irq.c,v 1.4 2011/02/24 07:59:44 mrg Exp $");
#include "drmP.h"
#include "drm.h"
@@ -99,7 +99,7 @@
1000000 - (then->tv_usec - now->tv_usec);
}
-uint32_t via_get_vblank_counter(struct drm_device *dev, int crtc)
+uint32_t via_get_vblank_counter(struct drm_device *dev, unsigned int crtc)
{
drm_via_private_t *dev_priv = dev->dev_private;
if (crtc != 0)
@@ -175,7 +175,7 @@
}
}
-int via_enable_vblank(struct drm_device *dev, int crtc)
+int via_enable_vblank(struct drm_device *dev, unsigned int crtc)
{
drm_via_private_t *dev_priv = dev->dev_private;
uint32_t status;
@@ -194,7 +194,7 @@
return 0;
}
-void via_disable_vblank(struct drm_device *dev, int crtc)
+void via_disable_vblank(struct drm_device *dev, unsigned int crtc)
{
drm_via_private_t *dev_priv = dev->dev_private;
Index: src/sys/external/bsd/drm/dist/shared-core/mach64_drv.h
diff -u src/sys/external/bsd/drm/dist/shared-core/mach64_drv.h:1.4 src/sys/external/bsd/drm/dist/shared-core/mach64_drv.h:1.5
--- src/sys/external/bsd/drm/dist/shared-core/mach64_drv.h:1.4 Tue Jun 23 04:42:01 2009
+++ src/sys/external/bsd/drm/dist/shared-core/mach64_drv.h Thu Feb 24 07:59:44 2011
@@ -164,9 +164,9 @@
struct drm_file *file_priv);
extern int mach64_driver_load(struct drm_device * dev, unsigned long flags);
-extern u32 mach64_get_vblank_counter(struct drm_device *dev, int crtc);
-extern int mach64_enable_vblank(struct drm_device *dev, int crtc);
-extern void mach64_disable_vblank(struct drm_device *dev, int crtc);
+extern u32 mach64_get_vblank_counter(struct drm_device *dev, unsigned int crtc);
+extern int mach64_enable_vblank(struct drm_device *dev, unsigned int crtc);
+extern void mach64_disable_vblank(struct drm_device *dev, unsigned int crtc);
extern irqreturn_t mach64_driver_irq_handler(DRM_IRQ_ARGS);
extern void mach64_driver_irq_preinstall(struct drm_device *dev);
extern int mach64_driver_irq_postinstall(struct drm_device *dev);
Index: src/sys/external/bsd/drm/dist/shared-core/mach64_irq.c
diff -u src/sys/external/bsd/drm/dist/shared-core/mach64_irq.c:1.1.1.2 src/sys/external/bsd/drm/dist/shared-core/mach64_irq.c:1.2
--- src/sys/external/bsd/drm/dist/shared-core/mach64_irq.c:1.1.1.2 Fri Jun 19 03:22:24 2009
+++ src/sys/external/bsd/drm/dist/shared-core/mach64_irq.c Thu Feb 24 07:59:44 2011
@@ -68,7 +68,7 @@
return IRQ_NONE;
}
-u32 mach64_get_vblank_counter(struct drm_device * dev, int crtc)
+u32 mach64_get_vblank_counter(struct drm_device * dev, unsigned int crtc)
{
const drm_mach64_private_t *const dev_priv = dev->dev_private;
@@ -78,7 +78,7 @@
return atomic_read(&dev_priv->vbl_received);
}
-int mach64_enable_vblank(struct drm_device * dev, int crtc)
+int mach64_enable_vblank(struct drm_device * dev, unsigned int crtc)
{
drm_mach64_private_t *dev_priv = dev->dev_private;
u32 status = MACH64_READ(MACH64_CRTC_INT_CNTL);
@@ -98,7 +98,7 @@
return 0;
}
-void mach64_disable_vblank(struct drm_device * dev, int crtc)
+void mach64_disable_vblank(struct drm_device * dev, unsigned int crtc)
{
if (crtc != 0) {
DRM_ERROR("tried to disable vblank on non-existent crtc %d\n",
@@ -112,7 +112,7 @@
*/
}
-static void mach64_disable_vblank_local(struct drm_device * dev, int crtc)
+static void mach64_disable_vblank_local(struct drm_device * dev, unsigned int crtc)
{
drm_mach64_private_t *dev_priv = dev->dev_private;
u32 status = MACH64_READ(MACH64_CRTC_INT_CNTL);
Index: src/sys/external/bsd/drm/dist/shared-core/mga_irq.c
diff -u src/sys/external/bsd/drm/dist/shared-core/mga_irq.c:1.1.1.2 src/sys/external/bsd/drm/dist/shared-core/mga_irq.c:1.2
--- src/sys/external/bsd/drm/dist/shared-core/mga_irq.c:1.1.1.2 Fri Jun 19 03:22:24 2009
+++ src/sys/external/bsd/drm/dist/shared-core/mga_irq.c Thu Feb 24 07:59:44 2011
@@ -36,7 +36,7 @@
#include "mga_drm.h"
#include "mga_drv.h"
-u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
+u32 mga_get_vblank_counter(struct drm_device *dev, unsigned int crtc)
{
const drm_mga_private_t *const dev_priv =
(drm_mga_private_t *) dev->dev_private;
@@ -92,7 +92,7 @@
return IRQ_NONE;
}
-int mga_enable_vblank(struct drm_device *dev, int crtc)
+int mga_enable_vblank(struct drm_device *dev, unsigned int crtc)
{
drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private;
@@ -107,7 +107,7 @@
}
-void mga_disable_vblank(struct drm_device *dev, int crtc)
+void mga_disable_vblank(struct drm_device *dev, unsigned int crtc)
{
if (crtc != 0) {
DRM_ERROR("tried to disable vblank on non-existent crtc %d\n",
Index: src/sys/external/bsd/drm/dist/shared-core/r128_drv.h
diff -u src/sys/external/bsd/drm/dist/shared-core/r128_drv.h:1.1.1.2 src/sys/external/bsd/drm/dist/shared-core/r128_drv.h:1.2
--- src/sys/external/bsd/drm/dist/shared-core/r128_drv.h:1.1.1.2 Fri Jun 19 03:22:25 2009
+++ src/sys/external/bsd/drm/dist/shared-core/r128_drv.h Thu Feb 24 07:59:44 2011
@@ -151,9 +151,9 @@
extern int r128_do_cce_idle(drm_r128_private_t * dev_priv);
extern int r128_do_cleanup_cce(struct drm_device * dev);
-extern int r128_enable_vblank(struct drm_device *dev, int crtc);
-extern void r128_disable_vblank(struct drm_device *dev, int crtc);
-extern u32 r128_get_vblank_counter(struct drm_device *dev, int crtc);
+extern int r128_enable_vblank(struct drm_device *dev, unsigned int crtc);
+extern void r128_disable_vblank(struct drm_device *dev, unsigned int crtc);
+extern u32 r128_get_vblank_counter(struct drm_device *dev, unsigned int crtc);
extern irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS);
extern void r128_driver_irq_preinstall(struct drm_device * dev);
extern int r128_driver_irq_postinstall(struct drm_device * dev);
Index: src/sys/external/bsd/drm/dist/shared-core/r128_irq.c
diff -u src/sys/external/bsd/drm/dist/shared-core/r128_irq.c:1.1.1.2 src/sys/external/bsd/drm/dist/shared-core/r128_irq.c:1.2
--- src/sys/external/bsd/drm/dist/shared-core/r128_irq.c:1.1.1.2 Fri Jun 19 03:22:25 2009
+++ src/sys/external/bsd/drm/dist/shared-core/r128_irq.c Thu Feb 24 07:59:44 2011
@@ -35,7 +35,7 @@
#include "r128_drm.h"
#include "r128_drv.h"
-u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
+u32 r128_get_vblank_counter(struct drm_device *dev, unsigned int crtc)
{
const drm_r128_private_t *dev_priv = dev->dev_private;
@@ -63,7 +63,7 @@
return IRQ_NONE;
}
-int r128_enable_vblank(struct drm_device *dev, int crtc)
+int r128_enable_vblank(struct drm_device *dev, unsigned int crtc)
{
drm_r128_private_t *dev_priv = dev->dev_private;
@@ -76,7 +76,7 @@
return 0;
}
-void r128_disable_vblank(struct drm_device *dev, int crtc)
+void r128_disable_vblank(struct drm_device *dev, unsigned int crtc)
{
if (crtc != 0)
DRM_ERROR("%s: bad crtc %d\n", __FUNCTION__, crtc);
Index: src/sys/external/bsd/drm/dist/shared-core/mga_drv.h
diff -u src/sys/external/bsd/drm/dist/shared-core/mga_drv.h:1.1.1.1 src/sys/external/bsd/drm/dist/shared-core/mga_drv.h:1.2
--- src/sys/external/bsd/drm/dist/shared-core/mga_drv.h:1.1.1.1 Sat Jul 19 05:30:42 2008
+++ src/sys/external/bsd/drm/dist/shared-core/mga_drv.h Thu Feb 24 07:59:44 2011
@@ -182,9 +182,9 @@
extern int mga_warp_init(drm_mga_private_t * dev_priv);
/* mga_irq.c */
-extern int mga_enable_vblank(struct drm_device *dev, int crtc);
-extern void mga_disable_vblank(struct drm_device *dev, int crtc);
-extern u32 mga_get_vblank_counter(struct drm_device *dev, int crtc);
+extern int mga_enable_vblank(struct drm_device *dev, unsigned int crtc);
+extern void mga_disable_vblank(struct drm_device *dev, unsigned int crtc);
+extern u32 mga_get_vblank_counter(struct drm_device *dev, unsigned int crtc);
extern int mga_driver_fence_wait(struct drm_device * dev, unsigned int *sequence);
extern int mga_driver_vblank_wait(struct drm_device * dev, unsigned int *sequence);
extern irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS);
Index: src/sys/external/bsd/drm/dist/shared-core/radeon_drv.h
diff -u src/sys/external/bsd/drm/dist/shared-core/radeon_drv.h:1.9 src/sys/external/bsd/drm/dist/shared-core/radeon_drv.h:1.10
--- src/sys/external/bsd/drm/dist/shared-core/radeon_drv.h:1.9 Mon Jul 5 20:32:24 2010
+++ src/sys/external/bsd/drm/dist/shared-core/radeon_drv.h Thu Feb 24 07:59:44 2011
@@ -473,9 +473,9 @@
extern int radeon_irq_wait(struct drm_device *dev, void *data, struct drm_file *file_priv);
extern void radeon_do_release(struct drm_device * dev);
-extern u32 radeon_get_vblank_counter(struct drm_device *dev, int crtc);
-extern int radeon_enable_vblank(struct drm_device *dev, int crtc);
-extern void radeon_disable_vblank(struct drm_device *dev, int crtc);
+extern u32 radeon_get_vblank_counter(struct drm_device *dev, unsigned int crtc);
+extern int radeon_enable_vblank(struct drm_device *dev, unsigned int crtc);
+extern void radeon_disable_vblank(struct drm_device *dev, unsigned int crtc);
extern irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS);
extern void radeon_driver_irq_preinstall(struct drm_device * dev);
extern int radeon_driver_irq_postinstall(struct drm_device * dev);
