diff options
author | Jeff Hartmann <jhartmann@valinux.com> | 2001-08-13 23:23:47 +0000 |
---|---|---|
committer | Jeff Hartmann <jhartmann@valinux.com> | 2001-08-13 23:23:47 +0000 |
commit | aa09e3611490d6a2f12f211c3c834f1237126313 (patch) | |
tree | 0938669d60d1697e119ed218f276aaa38830e29e /linux/r128_cce.c | |
parent | 2d4b2cf6f69de2ceaf0c2b00ccbb24aad412b202 (diff) |
Sync with Linus 2.4.9-pre2 + make all nopage routines more alike
Diffstat (limited to 'linux/r128_cce.c')
-rw-r--r-- | linux/r128_cce.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/r128_cce.c b/linux/r128_cce.c index 24b6de8d..fb19010c 100644 --- a/linux/r128_cce.c +++ b/linux/r128_cce.c @@ -358,10 +358,10 @@ static void r128_cce_init_ring_buffer( drm_device_t *dev, entry->handle + tmp_ofs ); #else R128_WRITE( R128_PM4_BUFFER_DL_RPTR_ADDR, - virt_to_bus(entry->pagelist[page_ofs]->virtual)); + page_to_bus(entry->pagelist[page_ofs])); DRM_DEBUG( "ring rptr: offset=0x%08lx handle=0x%08lx\n", - virt_to_bus(entry->pagelist[page_ofs]->virtual), + page_to_bus(entry->pagelist[page_ofs]), entry->handle + tmp_ofs ); #endif } |