Commit Graph

61 Commits (213247a4416b959738a658f2217d4d01ae9c1e67)

Author SHA1 Message Date
Eric Anholt 5864101ab4 Repo-copy linux/drm/kernel/drm.h to shared/drm/kernel/drm.h and use it on
both Linux and *BSD.
2003-11-05 01:43:47 +00:00
Eric Anholt 69d038eb49 Missed the sis.h header in Makefile.linux in the move to shared/. 2003-10-23 05:52:19 +00:00
Eric Anholt 2950f9e682 - Move IRQ functions from drm_dma.h to new drm_irq.h and disentangle them
from __HAVE_DMA. This will be useful for adding vblank sync support to
    sis and tdfx. Rename dma_service to irq_handler, which is more
    accurately what it is.
- Fix the #if _HAVE_DMA_IRQ in radeon, r128, mga, i810, i830, gamma to have
    the right number of underscores. This may have been a problem in the
    case that the server died without doing its DRM_IOCTL_CONTROL to
    uninit.
2003-10-17 05:13:48 +00:00
Eric Anholt ff58476011 - Converted Linux drivers to initialize DRM instances based on PCI IDs, not
just a single instance. Moved the PCI ID lists from <card>_drv.c in BSD
    to <card>.h. The PCI ID lists include a driver private field, which may
    be used by drivers for chip family or other information. Based on work
    by jonsmirl.
- Make tdfx_drv.c and tdfx.h match other drivers.
- Fixed up linking of sis shared files.
Tested with Radeon and SiS on Linux and FreeBSD, including a Linux setup
    with
2 SiS cards in a machine, but only one head being used (with DRI)
2003-10-17 03:14:39 +00:00
Alan Hourihane c5168016cc linux drm fixes 2003-09-12 20:00:59 +00:00
Eric Anholt fabc64dd57 Port the SiS DRM to FreeBSD. This includes the ability for the DRM to
allocate framebuffer memory without sisfb, and a new ioctl to be used
    by the X Server which tells the DRM what region of framebuffer memory
    to allocate from. Also fixes a possibility to panic the kernel I
    believe. Tested on linux with sisfb and FreeBSD (without sisfb) with
    new DRI only.
2003-08-29 19:24:36 +00:00
Michel Daenzer e5d3c7f260 Support AGP bridges where the AGP aperture can't be accessed directly by
the CPU (David Mosberger, Benjamin Herrenschmidt, myself, Paul
    Mackerras, Jeff Wiedemeier)
2003-05-16 23:41:27 +00:00
David Dawes c3092ead64 Targets for building dristat and drmstat. 2003-04-25 00:57:42 +00:00
David Dawes 9d603b0abe break long line 2003-04-24 02:56:06 +00:00
Leif Delgass 22608a414d Only mga, i810, i830 require AGP (should mga define __MUST_HAVE_AGP?) 2003-04-22 19:42:27 +00:00
Alan Hourihane 0782f0df60 fix gamma headers 2003-04-22 12:41:16 +00:00
David Dawes dbb7beb51d Rework the Linux drm kernel module build to leverage off the standard
kernel build system. This is based on suggestions and examples from
    David Woodhouse. This approach has the advantage that the build
    requirements of a wider range of standard kernels are now supported
    transparently, but the disadvantage of some extra complexity to handle
    building against clean vendor-distributed kernel source trees. This has
    been tested with some recent Red Hat and SuSE distributions.
2003-04-17 18:44:38 +00:00
Leif Delgass 10444e06d4 Use list_entry() to get container struct from struct list_head pointers.
Build fix for RedHat 9 kernel (5 args to remap_page_range()).
2003-04-08 01:30:43 +00:00
Alan Hourihane b3eb34e0ea linux merge for drm 2003-03-25 11:36:43 +00:00
Michel Daenzer b88cc5da26 disable strict aliasing for building the DRM 2003-02-04 19:28:52 +00:00
Eric Anholt e656655a36 Kernel support for vblank syncing on Rage 128 and Matrox. 2002-10-30 06:10:34 +00:00
Michel Daenzer 5e1b8ed88a preserve CRTC{,2}_OFFSET_CNTL in 2D driver to avoid bad effects when
pageflipping after a mode switch
take current page into account in AdjustFrame(); writing the CRTC offset
    via the CP was probably a bad idea as this can happen asynchronously,
    reverted
take frame offset into account when flipping pages
handle CRTC2 as well for pageflipping (untested)
preserve GEN_INT_CNTL on mode switches to prevent interrupts from getting
    disabled
2002-10-29 13:49:26 +00:00
Keith Whitwell f1c8fe9557 merged r200-0-2-branch to trunk 2002-09-23 17:26:43 +00:00
David Dawes c4318a5c64 - Fix various bugs in the DRI support for the i830 and i845G (Keith
Whitwell).
- Major rework of the 2D i830/i845G support, including:
- Improve VESA mode selection, and fix refresh rate selection.
- Don't duplicate functions provided in the vbe modules.
- Don't duplicate functions provided in the vgahw module.
- Rewrite memory allocation.
- Rewrite initialisation and save/restore state handling.
- Decouple the i810 support from i830 and later.
- Remove various unnecessary hacks and workarounds.
- Fix an 845G problem with the ring buffer not in pre-allocated memory.
- Fix screen blanking.
- Fix some HW cursor glitches, and turn HW cursor off at VT switch and
    exit.
- Don't attempt to use the i830's function 1 entity.
- Fix problems with option handling. (David Dawes).
- Add mode VBE-aware mode handling functions to the vbe module (David
    Dawes).
2002-09-11 00:57:49 +00:00
Leif Delgass a697941d4c Don't (re)define vmalloc_to_page for kernel >= 2.4.19, as it has been
backported from 2.5.x. Also fix a couple of incorrect
    LINUX_VERSION_CODE tests and fix header dependency for r128, radeon
    when building without AGP.
2002-08-22 19:35:31 +00:00
David Dawes 44aa4d6297 First pass merge of XFree86 4.2.0 import. 2002-01-27 20:05:42 +00:00
Alan Hourihane f4c2f14002 No one's maintaining 2.2.x support - so remove all the cruft. 2001-08-19 15:20:08 +00:00
Jeff Hartmann ae5b4effc0 Remove module name hacks because we aren't going to implement this anymore
because of Linus' comments
2001-07-20 20:31:30 +00:00
Jeff Hartmann 4eafeec960 Add module version name at a lower layer of the code, allows things to be
more flexible and allow older module versions to still work. Might not
    be final code if we move over to DRI kernel module version, but will be
    if we use XFree86 version. + Only build tdfx.o instead of tdfx-4_1_0.o
    since tdfx.o has never changed its API.
2001-07-18 21:02:58 +00:00
Jeff Hartmann d5749d7603 Added version string to the end of the kernel module name. This allows
multiple versions of the kernel module to co-exist on one machine.
2001-07-16 22:42:36 +00:00
Alan Hourihane 18ce40c9d3 Make the SiS module work again. At least glxinfo reports it's working, yet
trying to run the simple apps return 'out of video memory'
2001-05-17 15:20:40 +00:00
David Dawes 9c775d0b2f finish struct stat type cleanup Fix a build dependencies for the tdfx drm
module
2001-05-14 14:49:58 +00:00
Alan Hourihane 94c6d951a2 Make SiS driver compile with the new templated format. Not tested. minor
cleanups
2001-05-03 14:51:01 +00:00
Alan Hourihane 908d32f84c search /lib/modules/<version>/build/include first, then the others.... 2001-04-06 15:49:42 +00:00
Kevin E Martin 5d6ddbca26 Merged ati-pcigart-1-0-0 2001-04-05 22:16:12 +00:00
David Dawes 404a409ab3 Initial XFree86 4.0.99.1 merge. 2001-03-19 21:39:36 +00:00
Rik Faith 88dbee54ed Implement drmOpen* without /proc dependence (Fallback to /proc is included
for backward compatibility.) Move statistic-gathering drm* calls from
    dristat.c to xf86drm.c
2001-02-28 09:27:44 +00:00
Gareth Hughes 01a14789ed - Clean up the way customization of the templates is done.
- Fix old-style DMA for gamma driver (please test).
- Pull out IRQ handling into drm_dma.h (please test on i810, gamma).
- Lots of general cleanups, remove compiler warnings etc.
2001-02-16 05:24:06 +00:00
Gareth Hughes 360475376c Merge mga-1-0-0-branch into trunk. 2001-02-15 08:12:14 +00:00
Jeff Hartmann 9116644366 Fixed problem preventing compile on system w/o agpgart. 2001-01-18 18:21:05 +00:00
Keith Whitwell 33e8dcf7e9 Makefile.linux was checking $(MACHINE) for 'i386' before building the
i810.o module. However on my i810's, $(MACHINE) is 'i686'.
2001-01-11 20:05:39 +00:00
Nathan Hand 61c15f4a2d Merged tdfx-3-0-0 2001-01-08 16:21:42 +00:00
Kevin E Martin 0994e635b2 Merged ati-5-0-0 2001-01-05 22:57:55 +00:00
Rik Faith 833af23c5d Sync with Linux 2.4.0-prerelease 2001-01-04 18:41:41 +00:00
Gareth Hughes e15a24e154 Merged ati-4-1-1-branch into trunk. 2000-12-02 06:14:18 +00:00
David Dawes 94071289a4 merge with 4.0.1d 2000-11-08 00:07:17 +00:00
Rik Faith 39a659e877 Audit calls to schedule() Remove tags from files shared with Linux kernel
tree Remove debugging statements to make debugging more useful Other
    minor cleanups in preparation for sync with Linux 2.4.0-test9-pre7
2000-09-29 01:47:11 +00:00
Alan Hourihane c7558d8fa4 commit xfree86 4.0.1d-pre update 2000-09-24 09:34:10 +00:00
Alan Hourihane f1bb3c5f5f Merged tdfx-2-1-branch 2000-09-07 12:40:41 +00:00
Rik Faith 32cebaf750 Add compatibility header file to make Linux 2.4.0 kernel patches cleaner. 2000-08-28 19:50:52 +00:00
Rik Faith 68f6795ef4 Improve detection of kill_fasync parameter count Make compilation of sis.o
depend on CONFIG_FB_SIS
2000-08-25 12:44:44 +00:00
David Dawes cba4d3504c first part of 4.0.1b merge 2000-08-16 18:29:06 +00:00
Rik Faith f3ae6786f8 Sync with Linux 2.4.0-test6-pre2 2000-08-04 10:04:55 +00:00
Rik Faith 6dd96a15ed Revert some changes and try alternative way to clean up AGP handling. 2000-07-21 16:57:00 +00:00
Rik Faith 81da79d1ed Changes to make AGP optional for in-kernel builds 2000-07-21 14:20:57 +00:00