diff options
| author | Thomas Hellstrom <unichrome@shipmail.org> | 2005-03-28 21:21:42 +0000 |
|---|---|---|
| committer | Thomas Hellstrom <unichrome@shipmail.org> | 2005-03-28 21:21:42 +0000 |
| commit | 532ccb98b5f2946f574a747b90c39edbe783f888 (patch) | |
| tree | cfbdf4e8e2b8e0827b35b92a7e57e7f6104e18f1 /linux-core | |
| parent | c6161eff86b250f3113791edcc162dc97322c401 (diff) | |
Via updates:
New PCI command parser. Moved from via_dma.c to via_verifier.c so functions
with similar functionality are close to eachother.
Moved video related functions to via_video.c, which might be extended in
the future, as new video functionality is added.
New device-specific generic IRQ IOCTL, similar to the general VBLANK IOCTL,
but with support for multiple device IRQ sources and functionality.
Support for Unichrome Pro PM800/CN400 video DMA commands in verifier and
PCI parser.
Support for Unichrome Pro PM800/CN400 HQV IRQs in the new generic IRQ
IOCTL.
Bumped minor. New version 2.6.0.
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/Makefile | 2 | ||||
| -rw-r--r-- | linux-core/Makefile.kernel | 3 | ||||
| -rw-r--r-- | linux-core/drm_irq.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/linux-core/Makefile b/linux-core/Makefile index bc9c00a0..64704a35 100644 --- a/linux-core/Makefile +++ b/linux-core/Makefile @@ -93,7 +93,7 @@ VIAHEADERS = via_drm.h via_drv.h via_mm.h via_ds.h \ via_3d_reg.h via_verifier.h $(DRMHEADERS) VIASHARED = via_drm.h via_drv.h via_mm.h via_ds.h \ via_3d_reg.h via_drv.c via_ds.c via_irq.c via_map.c \ - via_mm.c via_dma.c via_verifier.c via_verifier.h + via_mm.c via_dma.c via_verifier.c via_verifier.h via_video.c MACH64HEADERS = mach64_drv.h mach64_drm.h $(DRMHEADERS) MACH64SHARED = mach64_drv.h mach64_drm.h mach64_dma.c \ mach64_irq.c mach64_state.c diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel index 6868aa0f..93082355 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -22,7 +22,8 @@ radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o sis-objs := sis_drv.o sis_ds.o sis_mm.o ffb-objs := ffb_drv.o ffb_context.o savage-objs := savage_drv.o savage_bci.o savage_state.o -via-objs := via_irq.o via_drv.o via_ds.o via_map.o via_mm.o via_dma.o via_verifier.o +via-objs := via_irq.o via_drv.o via_ds.o via_map.o via_mm.o via_dma.o via_verifier.o \ + via_video.o mach64-objs := mach64_drv.o mach64_dma.o mach64_irq.o mach64_state.o obj-m += drm.o diff --git a/linux-core/drm_irq.c b/linux-core/drm_irq.c index a6ebb173..27c9bc18 100644 --- a/linux-core/drm_irq.c +++ b/linux-core/drm_irq.c @@ -222,12 +222,12 @@ int drm_control(struct inode *inode, struct file *filp, * Wait for VBLANK. * * \param inode device inode. - * \param filp file pointer. + * \param filp file pointer.rm. * \param cmd command. * \param data user argument, pointing to a drm_wait_vblank structure. * \return zero on success or a negative number on failure. * - * Verifies the IRQ is installed. + * Verifies the IRQ is installed * * If a signal is requested checks if this task has already scheduled the same signal * for the same vblank sequence number - nothing to be done in |