diff options
| author | Jens Owen <jens@tungstengraphics.com> | 2002-04-09 21:54:56 +0000 |
|---|---|---|
| committer | Jens Owen <jens@tungstengraphics.com> | 2002-04-09 21:54:56 +0000 |
| commit | 3903e5ac94c07cf31f0bc24eff5011ef8cc7afba (patch) | |
| tree | 93515f920b8f69e9502a0a74396f10bfdd0c5a58 /bsd/radeon | |
| parent | a820c741374743065540546c92b1d5e1a2089225 (diff) | |
Merged drmcommand-0-0-1
Diffstat (limited to 'bsd/radeon')
| -rw-r--r-- | bsd/radeon/radeon_cp.c | 4 | ||||
| -rw-r--r-- | bsd/radeon/radeon_drv.c | 2 | ||||
| -rw-r--r-- | bsd/radeon/radeon_state.c | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/bsd/radeon/radeon_cp.c b/bsd/radeon/radeon_cp.c index ed5128b2..9c262ae3 100644 --- a/bsd/radeon/radeon_cp.c +++ b/bsd/radeon/radeon_cp.c @@ -30,6 +30,8 @@ #include "radeon.h" #include "drmP.h" +#include "drm.h" +#include "radeon_drm.h" #include "radeon_drv.h" #include <vm/vm.h> @@ -624,7 +626,7 @@ static void radeon_cp_init_ring_buffer( drm_device_t *dev, RADEON_WRITE( RADEON_CP_RB_RPTR_ADDR, entry->busaddr[page_ofs]); - DRM_DEBUG( "ring rptr: offset=0x%08x handle=0x%08lx\n", + DRM_DEBUG( "ring rptr: offset=0x%08x handle=0x%08x\n", entry->busaddr[page_ofs], entry->handle + tmp_ofs ); } diff --git a/bsd/radeon/radeon_drv.c b/bsd/radeon/radeon_drv.c index 61be65f7..009f90c1 100644 --- a/bsd/radeon/radeon_drv.c +++ b/bsd/radeon/radeon_drv.c @@ -36,6 +36,8 @@ #include "radeon.h" #include "drmP.h" +#include "drm.h" +#include "radeon_drm.h" #include "radeon_drv.h" #if __REALLY_HAVE_SG #include "ati_pcigart.h" diff --git a/bsd/radeon/radeon_state.c b/bsd/radeon/radeon_state.c index a7e301e7..cbb9d1f6 100644 --- a/bsd/radeon/radeon_state.c +++ b/bsd/radeon/radeon_state.c @@ -29,8 +29,9 @@ #include "radeon.h" #include "drmP.h" -#include "radeon_drv.h" #include "drm.h" +#include "radeon_drm.h" +#include "radeon_drv.h" /* ================================================================ |