summaryrefslogtreecommitdiff
path: root/sys/dev/pci/drm/radeon_drv.c
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2013-03-18 12:36:53 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2013-03-18 12:36:53 +0000
commit1e83ebc015e3e708142fa767510ae65e6892c20d (patch)
treed1f5f7f40202ef7b50c703a9c3ac746a96dd93ed /sys/dev/pci/drm/radeon_drv.c
parentc48141c1d8bd41bf9e7298c54917eaa386e56689 (diff)
Significantly increase the wordlist for ddb hangman,
and update our device independent DRM code and the Intel DRM code to be mostly in sync with Linux 3.8.3. Among other things this brings support for kernel modesetting and enables use of the rings on gen6+ Intel hardware. Based on some earlier work from matthieu@ with some hints from FreeBSD and with lots of help from kettenis@ (including a beautiful accelerated wscons framebuffer console!) Thanks to M:Tier and the OpenBSD Foundation for sponsoring this work.
Diffstat (limited to 'sys/dev/pci/drm/radeon_drv.c')
-rw-r--r--sys/dev/pci/drm/radeon_drv.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/radeon_drv.c b/sys/dev/pci/drm/radeon_drv.c
index 6a0bf3652c8..7a31210bd24 100644
--- a/sys/dev/pci/drm/radeon_drv.c
+++ b/sys/dev/pci/drm/radeon_drv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: radeon_drv.c,v 1.62 2013/01/04 05:31:35 jsg Exp $ */
+/* $OpenBSD: radeon_drv.c,v 1.63 2013/03/18 12:36:51 jsg Exp $ */
/* radeon_drv.c -- ATI Radeon driver -*- linux-c -*-
* Created: Wed Feb 14 17:10:04 2001 by gareth@valinux.com
*/
@@ -686,7 +686,7 @@ const static struct drm_pcidev radeondrm_pciidlist[] = {
{0, 0, 0}
};
-static const struct drm_driver_info radeondrm_driver = {
+static struct drm_driver_info radeondrm_driver = {
.buf_priv_size = sizeof(drm_radeon_buf_priv_t),
.file_priv_size = sizeof(struct drm_radeon_file),
.firstopen = radeon_driver_firstopen,
@@ -802,6 +802,9 @@ radeondrm_attach(struct device *parent, struct device *self, void *aux)
TAILQ_INIT(&dev_priv->fb_heap);
dev_priv->drmdev = drm_attach_pci(&radeondrm_driver, pa, is_agp, self);
+
+ if (drm_vblank_init((struct drm_device *)dev_priv->drmdev, 2))
+ printf(": drm_vblank_init failed\n");
}
int