Tag 'drm-snapshot-2.3.1-git+20080602+ac4da86-1' created by Chris Lamb <[EMAIL
PROTECTED]> at 2008-06-06 05:28 +0000
Tagging upload of drm-snapshot 2.3.1~git+20080602+ac4da86-1 to experimental
Changes since the dawn of time:
Aapo Tahkola (5):
Sync from r300_reg.h from Mesa.
Add support for texture cache flushes (R300_TX_CNTL)
Add general-purpose packet for manipulating scratch registers (r300)
ia64 support for r300_scratch. (not tested)
Sync r300_reg.h from mesa driver. #10210
Adam Jackson (37):
Bug #979: Don't include <sys/sysmacros.h> on linux, it occasionally emits
Shared libdrm work:
Add xf86drm.h to the install target.
Add a Savage3D PCI ID
Add drm.h to the install target.
Final pass of libdrm.so work:
momentary revert. libdrm build may be broken now, but no one uses it
yet...
Bug #2567: Fix reversed memset arguments. (David Krause)
Add skeletal imagine driver (but don't build it yet).
autoconfiscate libdrm
distcheck fixes
Fix the pkgconfig info. (Donnie Berkholz)
version bump
Add r300_reg.h. Bump to 1.0.2.
Fix silly install issue by moving the header install rules for shared-core
Skeleton nv drm driver, to enable DMA in EXA. (Lars Knoll, minor updates
by
Better pkgconfig-fu: -ldrm in Libs:
Remove bogus Xlib dependency.
via and r300 still need installed reg headers.
Remove the remaining references to Xlib. libdrm is totally independent
now.
Bump to 1.0.4.
Bug #328: Silence read-from-uninitialized warnings in DRM_CAS on Alpha.
Bump to 1.0.5 for new via header
remove xf86drmCompat.*, unused since about XFree86 4.2.
Error checking for drmStrdup (Tilman Sauerbeck)
Remove redundant #ifdef stanza
Add TODO based on my email from a while ago
Resync from Xorg head (Bug #3815, GNU/kFreeBSD hack)
Resync from Xorg head: conditional include of xorg-config.h
Bump package and DSO numbers to 2.0 to reflect 32/64 ABI change
Formatting cleanup, dead code removal. Remove N() namespacing macro,
Avoid walking off the end of the hash table. (Coverity report #465)
Bump driver date to reflect airlied's last fix.
Disable building static libraries. Bump to 2.0.2 for header updates.
Make sure busmastering gets disabled on module unload.
Delete the pre-core DRM code with extreme prejudice.
Fix some outdated URLs, remove others.
Adrian Bunk (1):
drm_rmmap_ioctl(): remove dead code
Alan Hourihane (122):
Include new updated gamma support.
Fix define of PCI_DEVICE_ID_3DLABS_GAMMA when not available in the kernel
Import of XFree86 4.0.1
Merge XFree86 4.0.1
Final misc changes to bring upto 4.0.1
Merged tdfx-2-1-branch
axp cast fix.
Import of XFree86 4.0.1d-pre
Import of XFree86 4.0.1d-pre (2)
commit xfree86 4.0.1d-pre update
file gamma.h was initially added on branch mga-1-0-0-branch.
file gamma_drm.c was initially added on branch mga-1-0-0-branch.
file gamma_context.c was initially added on branch mga-1-0-0-branch.
Don't try and setup the MTRR for AGP when AGP not available. Check
fix that last patch to initialize the MTRR when AGP available.
allow dristat to find out whether AGP is write-combined or not.
surround agp calls in drm_memory with __REALLY_HAVE_AGP instead of
file agpgart.diff was initially added on branch gamma-2-0-0-branch.
merge in 2.4.3 kernel change.
make 2.4.2 -> 2.4.3 change conditional. works with older than 2.4.3
kernels
include 2.4.2
Handle drivers that don't have __HAVE_SG defined.
search /lib/modules/<version>/build/include first, then the others....
file Makefile was initially added on branch bsd-2-0-0-branch.
file drm_os_linux.h was initially added on branch bsd-2-0-0-branch.
file drm_os_freebsd.h was initially added on branch bsd-2-0-0-branch.
file drm_sysctl.h was initially added on branch bsd-2-0-0-branch.
file drm_vm.h was initially added on branch bsd-2-0-0-branch.
fix build of i810 kernel driver for 2.4.3 or greater kernels
remove deprecated file
Make SiS driver compile with the new templated format. Not tested. minor
add new file
file drm_agpsupport.h was initially added on branch bsd-2-0-0-branch.
file drm_linux.h was initially added on branch bsd-2-0-0-branch.
add some commented enclosures around the BUS_BASE calls for Alpha
Make the SiS module work again. At least glxinfo reports it's working, yet
new multihead code was missing Voodoo3 2000 and Voodoo4 support.
No one's maintaining 2.2.x support - so remove all the cruft.
file convert.c was initially added on branch bsd-2-0-0-branch.
Use CCE for 2D acceleration (Gerd Knorr)
bumped the DRM versions (already done in ddx and client side drivers).
remove Linux 2.3.x cruft.
merge with 2.4.10 kernel
commit Abraham vd Merwe fix.
merge kernel 2.4.13-pre6.
wrap the MODULE_LICENSE definition.
merge with linux kernel 2.4.15
first pass at merging mesa 4.0 kernel drivers into new bsd-3-0-0 branch.
i830 & mga contain minor changes from 4.2.0 for mesa 4.0 bsd merge
fixup the radeon driver (not tested)
missing file
fixups for *BSD
file trident.h was initially added on branch trident-0-0-1-branch.
file trident_drv.c was initially added on branch trident-0-0-1-branch.
same udelay fixes
Remove some older Linux 2.3.99 code
gamma_alloc -> DRM(alloc)
merged bsd-3-0-0-branch
remove files missed by merge
remove obsolete files
Import of XFree86 4.2.99.2
final part of XFree86 4.2.99.2 merge
XFree86 4.3.0 merge
linux merge for drm
fix gamma headers
remove unused variable
change PREINSTALL/POSTINSTALL/UNINSTALL irq code to real functions as per
DRM_READ/WRITEMEMORYBARRIER was given an argument in the bsd tree, fix for
file savage_state.c was initially added on branch savage-1_0_0-branch.
file savage_dma.c was initially added on branch savage-1_0_0-branch.
resolve merge conflicts
linux drm fixes
bsd drm fixes
compatibility layer still uses agp (not gart)
post merge fix
Changes to DRM(irq_install)...... wrap dev->dma usage with __HAVE_DMA in
disable PCI DMA ioctls as they are not used currently until SAVAGE_CMD_DMA
fix build problem
remove Imakefile
drm_pciids.h should only 'cleaned' when the shared/ directory exists.
Which
Add i915GM support Add resume functionality (must be used with later DDX)
Fix a cut & paste problem
Fix cut & paste problem
Don't know who set the i915GM PCI ID incorrectly but it should be 0x2592
Re-implement the power management.
Actually check for drm_fb_loaded before trying to initialize the sysdev
Fix copyrights
Force AGP always for Intel chipsets.
Fix suspend problem when i915 private hasn't been initialized yet.
Fix the sysdev approach for power management.
Save state of registers for suspend/resume.
Check dev_priv
Check for 2.6.12 suspend/resume changes (pm_message_t)
Reverse the pm_message_t patch for now, it appears that the 2.6.12 release
Comment out the .resume function as without programming their dependent
Given that BenH says using the sysdev approach for DRM is bogus, I'll yank
Move to linux specific directory
silence warning
add i915_ioc32.c
add remaining calls
remove i915_pm code as it causes too many issues with current software
remove the README in the linux-2.6 directory
Don't set MTRR's for intel hardware
Fix bug #4908 for now. Alternative is highlighted in this bug report as
the
add Intel i945GM support
Fix CMDBUFFER path, add heap destroy and flesh out sarea for rotation
put back some of Dave's code related to vblank support - accidentally
other part of revert
fix an error message typo Unkown -> Unknown
add missing name, desc, date, major, minor and patchlevel entries
Fix compilation problem on 2.6.9 kernels (bug #6211)
Add support for Intel i965G chipsets.
Fix bug #8839 - a comment
Remove old i830 kernel driver.
remove i830 reference
don't copy back if an error was returned.
Add brackets
catch an out of memory condition
fix SAREA
Add error message
Fix for debug memory routines
fix build problems
Alex Deucher (17):
r300: Document more of the RADEON_RBBM_STATUS register.
Fix chip family for RV550
RADEON: production microcode for all radeons, r1xx-r6xx
RADEON: switch over to new production microcode
Radeon IGP: clean up registers and magic numbers
Radeon IGP: wrap MCIND access
Radeon IGP: merge RS4xx/RS6xx gart setup
R300+: fixup PURGE/FLUSH macros
RADEON: write AGP_BASE_2 on chips that support it
RS4xx: fix MCIND index mask
R300+: fixup pixcache flush
RADEON: cleanup radeon_do_engine_reset()
R3/4/5: init pipe setup in drm
RADEON: fix copy/pasto in last commit
RS4xx: separate out RS400 and RS480 IGP chips
RADEON: add get_param for number of GB pipes
RADEON: fix typo in last commit
Anish Mistry (1):
bug 7092 : add pci ids for mach64 in Dell poweredge 4200
Arthur Huillet (12):
Made drm_sg_alloc accessible from inside the DRM - drm_sg_alloc_ioctl is
the ioctl wrapper
Added support for PCIGART for PCI(E) cards. Bumped DRM interface
patchlevel.
fixed bug that prevented PCIE cards from actually using PCIGART - NV50
will probably still have a problem
NV50 will not attempt to use PCIGART now
fixed object creation code to not Oops on 64bits, worked around memalloc
not working on 64bit for PCIGART
now attempting to create PCI object only when there is a pci_heap
now attempting to create PCI object only when there is a pci_heap
Merge commit 'public/master'
applied patch from Ian Romanick fixing PCI DMA object creation code
nouveau: creating notifier in PCI memory for PCIGART
nouveau: added support for software methods, and implemented those
necessary for NV04 (TNT1) to start X
nouveau: mandatory "oops I forgot half of the files" commit
B. Rathmann (1):
nouveau: fix memory initialization with multiple cards.
Ben Skeggs (171):
Add stub {get,set}param ioctls.
Use DMA_IN_MEMORY for DMA objects. This is needed for a DDX change that
will
Allow cmdbuf location(AGP,VRAM) and size to be configured.
Fix second start of X server without module reload beforehand, and a
couple of other fixes.
Add copyright notices while I still remember..
Add pciid for GeForce Go 6150 (0x0244).
Fix some randomness in activating a second channel on NV40 (odd GET/PUT
vals). Ch 1 GET now advances, but no ctx_switch.
Some info on NV40's RAMFC
Setup NV40 RAMFC (in wrong location.. but anyway), rearrange the RAMFC
setup code a bit.
NV40: FIFO context switching now WorksForMe(tm)
NV40: *Now* fifo ctx switching works for me..
typo
Useful output on a FIFO error interrupt.
Oops, we have more than 4 subchannels..
Remove hack which delays activation of a additional channel. The
previously active channel's state is saved to RAMFC before PFIFO gets clobbered.
Leave the bottom 64kb of RAMIN untouched.
Hack around yet another "X restart borkage without nouveau.ko reload"
problem.
Merge branch 'nouveau-1' of git+ssh://git.freedesktop.org/git/mesa/drm
into nouveau-1
Restructure initialisation a bit.
Completely untested NV10/20/30 FIFO context switching changes.
Dump some useful info when a PGRAPH error occurs.
Check some return vals, fixes a couple of oopses.
Only return FIFO number if the FIFO is marked as in use..
Don't spam dmesg if PMC_INTSTAT is 0
Wrap access to objects in RAMIN.
Use nouveau_mem.c to allocate RAMIN.
Port remaining NV4 RAMIN access from the ddx into the drm.
nouveau: save/restore endianness flag on FIFO switch
nouveau: Alloc cmdbuf for each channel individually
nouveau: return the *actual* type of memory alloc'd to userspace
nouveau: Only clobber PFIFO if no channels are already alloc'd
nouveau: Add nv40-specific PGRAPH code, not hooked up yet.
nouveau: Hook up grctx code for NV4x.
nouveau: Hookup nv40_graph_init.
nouveau: oops, forgot to free RAMIN..
nouveau: Use PMC_BOOT_0 to determine which ctx_voodoo to load.
nouveau: get c51 doing glxgears without the binary driver's help.
nouveau: map pci resource 2 on >=nv40
nouveau: avoid allocating vram that's used as instance memory.
nouveau: nv43 context stuff
nouveau: oops
nouveau: re-add 6150 Go pciid (0x0244)
nouveau: fix getparam from 32-bit client on 64-bit kernel
nouveau: always print nsource/nstatus regs on PGRAPH errors
nouveau: nv4c default context
nouveau: determine chipset type at startup, instead of every time we use
it.
nouveau: ack PFIFO interrupts at PFIFO, not PMC.
nouveau: remove a hack that's not needed since the last interface change.
nouveau: intrusive drm interface changes
nouveau: s/fifo/channel/
nouveau: associate all created objects with a channel + cleanups
nouveau: make sure cmdbuf object gets destroyed
nouveau: support multiple channels per client (breaks drm interface)
nouveau: remove unused cruft
nouveau: rework nouveau_fifo_alloc() so the drm can create internal FIFOs
nouveau: move card initialisation into the drm
nouveau: Power up all card units by default on startup.
nouveau: make a note about a bit that breaks some cards
nouveau: NV46 support
nouveau: rename engtab functions
nouveau: prototype PFIFO/PGRAPH engtab API
nouveau: (mostly) hook up put_base again
nouveau: split PFIFO/PGRAPH context creation
nouveau: NV4X PFIFO engtab functions
nouveau: NV4X PGRAPH engtab functions
nouveau: NV04 PFIFO engtab functions
nouveau: NV1X/2X/3X PFIFO engtab functions
nouveau: NV3X PGRAPH engtab functions
nouveau: NV04/NV10/NV20 PGRAPH engtab functions
nouveau: kill some dead code
nouveau: NV49/NV4B PGRAPH setup from jb17bsome and stephan_2303
nouveau/nv04: Set NV_PFIFO_CACHE1_PUSH1 correctly + small tweaks
nouveau: Nuke DMA_OBJECT_INIT ioctl (bumps interface to 0.0.7)
nouveau/nv50: skeletal backend
nouveau: name some regs
nouveau: simplify PRAMIN access
nouveau: never touch PRAMIN with NV_WRITE, cleanup RAMHT code a bit
nouveau/nv10: Fix earlier NV1x chips
nouveau: Hack around possible Xv blit adaptor breakage
nouveau: small RAMFC cleanups
nouveau: rewrite gpu object code
nouveau: enable reporting for all PFIFO/PGRAPH irqs
nouveau/nv50: Initial channel/object support
nouveau: Avoid oops
nouveau: Don't be so strict on <NV50
nouveau: Allocate mappable VRAM for notifiers..
nouveau: Some checks on userspace object handles.
nouveau/nv50: G80 fixes.
nouveau: separate region_offset into map_handle and offset.
nouveau: nuke left over debug message
nouveau: mem_alloc() returns offsets, not absolute addresses now.
nouveau: unbreak AGP
nouveau: nuke internal typedefs, and drm_device_t use.
nouveau: G8x PCIEGART
nouveau: Destroy PGRAPH context table on PGRAPH takedown
nouveau/nv50: get non-default push buffer sizes working.
nouveau: Pass channel struct around instead of channel id.
nouveau: Various internal and external API changes
nouveau: Determine trapped channel id from active grctx on >=NV40
nouveau: Give DRM its own gpu channel
nouveau: Remove PGRAPH_SURFACE hack, it wont work now anyway.
Export some useful ttm functions to drivers.
nouveau: ouch, add nouveau_dma.[ch] files..
nouveau: Init global gpuobj list early, unbreaks sgdma code.
nouveau: enable/disable engine-specific interrupts in _init()/_takedown()
nouveau/nv50: hack up initial channel context from current state
nouveau: return channel id
nouveau: Always allocate drm's push buffer in VRAM
nouveau/nv40: add some missing pciids.
nouveau: silence irq handler a bit
nouveau: Allow creation of gpuobjs before any other init has taken place.
nouveau/nv50: demagic instmem setup.
nouveau/nv40: Fix channel scheduling.
nouveau: Catch all NV4x chips instead of just NV_40.
nouveau: Workaround mysterious PRAMIN clobbering by the card.
nouveau: Allow GART notifiers when using sgdma code.
nouveau: Turn some messages into DRM_DEBUGs..
nouveau: Use count parameter in nouveau_notifier_alloc().
nouveau: Detect memory on NFORCE/NFORCE2 correctly.
nouveau: Poke 0x2230 on NV47 also.
nouveau: Add NV44 ctx ucode. Patch from stillunknown.
nouveau/nv50: Correct thinko for 8800 chips + cleanup a bit.
nouveau: NV4c ctx ucode.
nouveau/nv40: Dump extra info on ucode state if ctx switch fails.
nouveau/nv40: Preserve other bits in 0x400304/0x400310 like NVIDIA do.
nouveau: Use nv41 ctxprog/vals on nv42.
nouveau: Handle multiple PFIFO exceptions per irq, cleanup output.
nouveau: Survive PFIFO_CACHE_ERROR.
nouveau: Cleanup PGRAPH handler, attempt to survive PGRAPH exceptions.
nouveau: revert unintended change.
nouveau: crappy ttm mm init, disabled for now.
nouveau: hook up an inital fence irq handler
nouveau: vram is bar1
nouveau: only pass annoying messages if irq isn't handled fully.
nouveau: cleanups
Fill fence sequence after emit ioctl.
nouveau: disable m2mf buffer move for the moment
nouveau: Use a sw method instead of notify interrupt to signal fence
completion.
nouveau: stub superioctl
nouveau: funcs to determine active channel on PFIFO.
nouveau: store user control reg offsets in channel struct
nouveau: Use "new" NV40 USER control regs.
nouveau: Attempt to wait for channel idle before we destroy it.
Merge branch 'fifo-cleanup' into upstream-master
Revert "nouveau: stub superioctl"
nouveau: Also wait until CACHE1 gets emptied.
nv50: some cleanups + small changes
nv50: use dummy page in gart tables
nv50: some needed ctx vals
nv50: abort on chips without ctx ucode
nv50: hook up timer funcs...
nv50: oops, lost some state saving along the way somewhere.
nv50: more small changes
nv05: enable ctx/op methods, and ignore patch valid failures.
nv40: some more nv67 changes
nv40: actually init all tile regs.
nouveau: don't touch NV_USER regs on channel destroy.
nouveau: redo channel idle detection
nv50: force channel vram access through vm
nv40: allocate massive amount of PRAMIN for grctx on all chipsets.
nv40: voodoo - not quite.
nouveau: silence warning
nouveau: enable m2mf for tt<->vram moves, fix fence_poll
nouveau: enable accelerated move to sysmem
nv50: I cave... Add nv84 initial context values.
nv50: PGRAPH exception handling completely different from earlier chips
nouveau: gather nsource in trap_info()
nouveau: restore original NV_PFIFO_CACHES_REASSIGN value in fifo handler
nouveau: disable all card interrupts when unknown PFIFO IRQ occurs.
nouveau: guard against channels potentially not having a context, fix nv50
nv50: enable 0x400500 bit 0 after PGRAPH exception also
Benjamin Herrenschmidt (1):
drm: Fix for non-coherent DMA PowerPC
Brian (6):
More detailed instructions, tips.
s/OJBECTS/OBJECTS/
Clean-ups and reformatting.
reformatting, clean-ups
Added idr_replace() function which was apparently added in Linux 2.6.18
Added bool typedef added in kernel 2.6.19
Brian Paul (36):
Merged glxmisc-1-0-0
file vm.c was initially added on branch bsd-1-0-0-branch.
file tdfx_drv.h was initially added on branch bsd-1-0-0-branch.
file tdfx_context.c was initially added on branch bsd-1-0-0-branch.
file sysctl.c was initially added on branch bsd-1-0-0-branch.
file proc.c was initially added on branch bsd-1-0-0-branch.
file memory.c was initially added on branch bsd-1-0-0-branch.
file lock.c was initially added on branch bsd-1-0-0-branch.
file lists.c was initially added on branch bsd-1-0-0-branch.
file ioctl.c was initially added on branch bsd-1-0-0-branch.
file init.c was initially added on branch bsd-1-0-0-branch.
file fops.c was initially added on branch bsd-1-0-0-branch.
file drmstat.c was initially added on branch bsd-1-0-0-branch.
file drawable.c was initially added on branch bsd-1-0-0-branch.
file dma.c was initially added on branch bsd-1-0-0-branch.
file context.c was initially added on branch bsd-1-0-0-branch.
file bufs.c was initially added on branch bsd-1-0-0-branch.
file auth.c was initially added on branch bsd-1-0-0-branch.
file gamma_dma.c was initially added on branch bsd-1-0-0-branch.
file gamma_drv.c was initially added on branch bsd-1-0-0-branch.
file gamma_drv.h was initially added on branch bsd-1-0-0-branch.
file tdfx_drv.c was initially added on branch bsd-1-0-0-branch.
file drm.h was initially added on branch bsd-1-0-0-branch.
file Imakefile was initially added on branch bsd-1-0-0-branch.
file Makefile.bsd was initially added on branch bsd-1-0-0-branch.
file drmP.h was initially added on branch bsd-1-0-0-branch.
define VM_DONTCOPY to zero if undefined
Merged glxmisc-3-0-0
don't draw if window is unmapped, other updates (Jeff Hartmann)
applied Jeff's xf86cvs-I810copy.patch
include linux/sisfb.h, per David Gaarenstroom
replaced max() macro with conditional expression
merge from mesa-4-1-branch to get cube-map registers. bumped version to
1.7
added missing return fd (Alexander Stohr)
fix mem leak in HashHash() (bug 5171)
check for __FreeBSD_kernel__ (bug 3810)
Chris Lamb (12):
Import Christopher James Halse Rogers' <[EMAIL PROTECTED]> Ubuntu
packaging
Add changelog entry for Debian experimental
Rename source package to drm-snapshot
Set Maintainer to Debian X Strike Force, add Uploaders
Tidy Build-Depends
Bump Standards-Version to 3.7.3
Add Homepage: field
Cosmetic changes to package long descriptions
Add -dbg package
Misc cosmetic changes
Update debian/copyright
Update shlibs to reflect Debian packaging
Christoph Hellwig (1):
drm: remove drm_follow_page, and drm_ioremap and ioremapfree
Daryll Strauss (9):
Initial revision
Import XFree 3.9.16
First DRI release of 3dfx driver.
Move Mesa to xc/extras Update to the latest Mesa 3.2 code Fix the Q3Demo
Rename the device to be /dev/dri instead of /dev/dri to avoid a conflict.
Add a drm_poll function to the tdfx driver. This fixes the problem with
Remove -g from build Fix lost code from tdfx-1-1 merge in tdfx_priv.c
Lower
Only enable DRI for 16bpp mode. Allow GL_BLEND if color is 0,0,0,1 Wrap
Merged the tdfx-2-0 branch onto the trunk
Dave Airlie (549):
add page flipping support to the DRM, up version number to 1.3.0...
fix pitch compile error
DA: fix for bug 484 in Bugzilla, originally from me, reworked by David
DA: code cleanups for i810_dma.c from 2.4 kernel
DA: patch from Matthew upgraded to latest DRI head to solve issue with
i810
DA: loads of whitespace .. some from Linus, some from me
initial shell script to create linux kernel drm from the DRI one
make sure in DRM toplevel
copy correct Makefile
patch from lk
fixes from Linux kernel
patch from Linux kernel 2.6.5
more 2.4 compat fns
2.6 patches for larger dev_t
long dev_t patches from 2.6 tree
2.6 sysfs patches + stubs in drmP.h for 2.4 compatibility
big whitespace .. this aligns all the whitespace in this file with the bk
update from linux kernel for ia64
remove unused code
align code with Linux kernel.
patch from Andrew Morton tree from Arjan van de Ven fixes some oopses seen
update gamma_dma with patch from davej in 2.6
include highmem.h
white space changes to align with kernel
Add mach64 to the trunk
more files for mach64
centralise pci ids into one place and use scripts to generate files for
bug from Linux kernel list caught by checker
add new files to generate pci ids
add sparc ffb files from kernel just to keep things in sync
Add __user annotations from kernel
add another tdfx
better device class support from Jon Smirls patches..
fix 2.4 build
use drm.. not dri for class...
make drm pciids
Commit sysfs and drm PCI changes for 2.6 kernel
do some real testing and fix the DRM initialising and unloading
2.4 compat fix
another 2.4 fix
fixes from kernel: Make users of page->count use the provided macros
2.4 compat
The dev->devname being passed to request_irq in drm_irq.h is null. With
the
gamma_dma_priority and gamma_dma_send_buffers both deref d->send_indices
dirty hack to make mach64 work, (don't worry I'll get around to fixing it
fix bug with pci_disable_device in the wrong place (Paul Mackerras) remove
whitespace align with kernel
fixes from kernel for 0 vs NULL - mika
align with kernel
fix issue in 2.4 kernels with returning NULL from this function
split out backwards compat into a separate file makes it easier for
merging
allow O= usage for Linux 2.6 kernel building in another directory
Fix reference counting for stub for new Linux PCI probe
sparse cleanups from kernel: Al Viro
attempt to clean up stub_register, register_chrdev isn't good enough to
fix some more NULLs from kernel
add x86_64 architecture defines from kernel (leave AMD64 defines in for
Kconfig update add i915 bring over some stuff from kernel
Add NULLs instead of 0 for i915
first set of __user annotations from kernel (Al Viro)
add some more debugging fix ++ and --
ATI Rage 128 and Radeon DRM unconditionally depend on PCI
another logic error returns 0 or greater for success
Patch from Tom Arbuckle for missing bus_address
if the driver has already register don't do another intermodule register
whitespace merge with kernel
sync up with current 2.6 kernel bk tree - mostly __user annotations
check for __user if not there define it
initial port of i915 to BSD, not finished doesn't work.. no idea why...
change to agp not pci ... still not working
add read/write 16
athe patch below optimises the drm code to not do put_user() on memory the
fixes for using userspace pointers found by sparse utility
Patch picked up from Redhat xorg release:
patch from RH xorg-x11 tree ported to drm.h
forgot to check these in.. thanks to Jon for reminding me ..
fix for drm in /proc - from Jon Smirl
bring over fix from i865-agp branch, it now probes the driver, X hangs
2.4 hotplug compat
2.4 compat
Patch from Jon Smirl to add attribute field to the pciids, and use this
for
minor patch from Jon Smirl : sets up some things for later use
2.6.8.1 has changed the links in /lib/modules
preparation patch for radeon permanent mapping registers/framebuffer makes
Merged drmfntbl-0-0-1
set pointers to NULL after freeing, remove some extra debugging
addmap-base-2 patch from Jon Smirl:
Merged drmfntbl-0-0-2
__NO_VERSION__ hasn't been needed since 2.3 days ditch it...
run i915 through lindent
fixup issue caused by fntbl-2 merge
Drop GAMMA DRM from a great height ...
remove hacky context thing that was gamma only
fix up some small things ffb (no idea if it works or not ..)
add context include so fn are defined
drm-memory patch, cleans up alloc/free and makes calloc look more libc
like
implement drm_core_check_feature and use it .. looks lots nicer
Apply patch from Bryan Stine bugzilla #1227
oops called ctor instead of dtor.. found this on the kernel merge
file drmcore_exports.c was initially added on branch drmlib-0-0-1-branch.
file drm_proc.c was initially added on branch drmlib-0-0-1-branch.
file drm_memory_debug.c was initially added on branch drmlib-0-0-1-branch.
file drm_memory.c was initially added on branch drmlib-0-0-1-branch.
file drm_headers.h was initially added on branch drmlib-0-0-1-branch.
file drm_core_memory.h was initially added on branch drmlib-0-0-1-branch.
file drm_agpsupport.c was initially added on branch drmlib-0-0-1-branch.
file drm_core.h was initially added on branch drmlib-0-0-1-branch.
doh.. that makes no sense.. thinko in removal of OS_HAS_AGP
Fixup OS_HAS_AGP/OS_HAS_MTRR along lines of patches going to kernel, as
make the AMD64 check a compat thing
bad code copy for alpha.. fix the member names
merge back bunch of whitespace and misc changes from kernel
missed fix as part of last checkin
another fix after the macro stuff
remove HAVE_COUNTERS
Patch for Kconfig for making i830/i915 not build together
remove unused dma remnants that were gamma only - these could cause an
oops
Lindent the via stuff so I can include it in kernel
fix up whitespacing in Kconfig
cleanup VIA driver to look a bit like others before kernel merge
Vladimir requested support so we can at least load r300 microcode for
Apply radeon r300 microcode patch to non-core
fix pfn vs page for older kernels (2.6.9-rc kernels many not work..)
actually 2.6.10 introduced pfn range so it should work now..
fix inter module put/get
fix for 2.4 build
respect cc and cflags
add some more r300 pci ids
patch from bug 1803 - will try and push to kernel soon
Make 1-bit fields be unsigned (no sign bit :). sparse complains about
them:
Use wbinvd macro instead of assembly for it,
i810/i830 bug with Jon's file operations changes
due to backways compat crap for IRQ_HANDLED etc.. this wouldn't build on
The patch makes drmAddBufs/drmMapBufs can handle buffers in video memory
This table is in radeon_drv.h along with the version number so remove it
remove duplicate drm_sysfs.o
hopefully fix drm_core setversion ioctl... pointed out by Eric on irc
use libdrm after it was updated
fix incorrect PCI id for ATI radeon
fix radeon drv
make more functions static in i810 and fix pageflip cleanup
update i830 similiar to the kernel, add statics
make functions static in i915, remove unused functions
cleanup patch from Adrian Bunk <[EMAIL PROTECTED]>
fix agp detection on linux
change DRIVER_ to CORE_ makes things look nicer, also change it so the
Invalid bound check of driver defined ioctls in drm_ioctl
add some idct type 3 packets for reference
minor pointer cast typo
Fix for bug 2673 from Egbert Eich - memset the version
For 2.6.12 and 2.6.11.x:
3dfx DRM depends on PCI
fix bug with XFree86 4.3 on core drm
verify_area is deprecated, replaced by access_ok. Seems I missed this one
fix up AGP multi-head support for kernel 2.6.12
use linux-core for 2.6 not this stuff..
From Xorg CVS realign the i915_drv.h
Some ia64 platforms may not support write combining on all type of memory,
Description: Rather than use custom code in DRM_WAIT_ON() to do exactly
mirror changes made in main tree.. just happened to be doing this myself
Revert last commit, it affect via things
wrap config.h include with defined for KERNEL
Add i945G pci ids to drm
add radeon registers from VHA code these are the "unknown" registers
Remove warnings about code mixed with declerations..
misc cleanup patch from Adrian Bunk
fix some issues with radeon interrupt handling
add dragonfly #define from Xorg CVS
fix up drm.h for C++ include as this can be included in user programs
fix up drm_alloc_agp to take a dev arg and not pass crappy agpgart around
Add drm and radeon 32/64-bit compat code from Paul Mackerras
Add compat to Makefile
add compat code from Paul Mackerras
Bug in conversion from old DRM to core DRM....
these don't need reclaim buffers their release functions handle it
add mga and r128 32/64 bits
make r128/mga compile properly on sparc cross-compiler
fix some warnings from cross compiler
Egbert noticed this issue, but changing the IOW to IOWR mess up
up the version
revert last change due to me bring up too early
Fix bug in return to userspace resctx code
remove bus address
fix ioctl in r128 drm direction from Egbert Eich.
make some functions static in the savage drm driver
add Egberts 32/64 bit patch (its in kernel already...)
commit toggle switch to make Linux drm_handle_t unsigned int
revert reversion of a part of a patch from Jon, that I did last night
while
add agp buffer token
add powerpc64 to the list of archs that this test doesn't make sense on
remove checks that make ppc64 not work properly... also fix ppc64 check..
add x86_64 to the list as well
We don't need to install all the internal headers files only drm.h and
allocating the PCIE table from GFP_DMA seems to stop it NMI'ing
add options for x86_64 and amd will small letters
check is the map containing the lock
convert ioctl flags to use flags instead of separate ints
fix makefile bug
Add GART in FB support for ati pcigart, and PCIE support for r300
back out change as gart is now in framebuffer for PCIE
make PCI Express work on 64-bit machines, thanks to Alex Deucher (agd5f)
add some pci express chips
update autogen from xserver tree
compat for pci_pretty_name
remove pci_find_class use for alpha
use linux kernel macros don't make our own
add __ATTR
hopefully fix server recycling on PCIE
Add Bens fix for radeon maps on ppc
fixup bens fix so it works..
fix pci overriding from userspace
Add support to turn writeback off via radeon module option
now I've lindented kernel it might be useful again
fix header this is now a c file
remove version not used anymore
Add X300 RV370
the old init path needs to set WAGP_ENABLE by default
dma access also needs some work
fix G550 cards
we don't use this stuff anymore .. remove 1k buffer from driver ..
cleanup / whitespace align with kernel
Fix cpu_to_le32 same as kernel not sure it is correct for ppc
cleanup ioctl/max_ioctl to use header file for extern symbols
whitespace align closer with kernel
convert to use __set_current_state, align some header includes
A bunch of create_proc_dir_entry() calls creating directories had crept in
remove extra spaces
realign whitespace with kernel
copy correct Kconfig
mixing breaks in r128 driver.. fixed in kernel
whitespace align with kernel
fix up radeon whitespace
i810 should be fine with i810.. no idea what this crack is ..
RV200 < R200
enable i915 32/64 bit ioctls
fixes from Egbert for 64bit
Fix from Hugh Dickins for consistent mapping
fixup xf86drm.c for new headers
Fix from SuSE for issue with context creation failure
add texrect support for r300
Lindent some via files
fix radeon memory mapping from Ben Herrenschmidt
step back one reported bugs against that patch
Add vblank support to i915 DRM..
add radeon card type get param so userspace can avoid walking PCI
Realign via driver with changes in Linux kernel (mainly whitespace)
complete fix for attribution
complete fix for historic attribution
some fixes from linux kernel
whitespace cleanup/aligment with kernel
align spacing with kernel
The radeon DRM wasn't passing sparse checking in the kernel, this fixes it
sparse cleanups
use common read/write routines
use drm_cards_limit instead of cards_limit
make max minor more rational
nothing from VIA or S3 in this
Fixup test for memory at end of memory space
fix card unload
major realigment of DRM CVS with kernel code, makes integration much
easier
fix build wrong function call
add benh's memory management patch
add proper checking for bitblt multi
clear i915 interrupts sources on server exit
always enable and set master on pci device
fix brace placement
make some functions static from the kernel
missed a piece of benh patch
experimental PCI DMA fixes use proper Linux interfaces
use coherent memory for PCI allocations with COMP flag
set dma pages reserved
fix some use before NULL check
Fix bug I reintroduced
make some functions static in via driver
fix issue in mga from kernel
radeon fix up the PCI ids for new memory map like the kernel one.. not
make add context non master...
remove stupid init and exit flags..
coverity bugfix from the kernel
Fix from Benh for ppc r300 scratch
fixup GFP_COMP for older kernels and get_page/put_page for newer
add consts to radeon microcode.
rip out unneeded back compat code
switch drm to use Linux mutexes instead of semaphore.
remove incorrect exit marking on cleanup pci as this is called from other
paths
drm: fixup whitespace and style for Linux kernel import
drm: remove extra whitespace from drm_mm.c
drm: whitespace cleanup in new files
drm: ati_pcigart cleanup
clean up script to create an lk drm directory
cleanup some whitespace issue and move compat code to compat header
i965 code and Linux coding style < 0
remove all TRUE/FALSE no need for this in the drm, use 0 or 1
remove all TRUE instances as well
drm: i810_dma.c: fix pointer arithmetic for 64-bit target
fixup some of the comments in drm_context.c
remove some DRM_ARRAY_SIZE from linux core code
remove local copies of pci domain/bus/slot/num
fix const pointer warnings with file_operations
add static function, and remove bad attributions
drm: lots of small cleanups and whitespace issues fixed up
initial import of nouveau code from nouveau CVS
add pci ids for nouveau
drm: i810_dma.c: fix pointer arithmetic for 64-bit target
fixup some of the comments in drm_context.c
remove some DRM_ARRAY_SIZE from linux core code
remove local copies of pci domain/bus/slot/num
fix const pointer warnings with file_operations
add static function, and remove bad attributions
drm: lots of small cleanups and whitespace issues fixed up
Merge branch 'master' into nouveau-1
drm: use radeon specific names for radeon flags
drm: put domain number back to 0, domain support is seriously fubar..
remove config.h from build no longer exists kbuild does it
remove config.h
add powerpc mmio swapper to NV_READ/WRITE macros
nouveau: add compat ioc32 support
Merge branch 'master' into nouveau-1
use a uint64_t for this not a pointer
fixup fifo size so it is page aligned
drm: fixup page alignment on SAREA map on ppc64
libdrm: add support for server side functionality in libdrm
libdrm: add drmOpenOnce + drmCloseOnce to libdrm
drm: ioremap balanced with iounmap for drivers/char/drm
Revert "drm: ioremap balanced with iounmap for drivers/char/drm"
fix missing DRM_ERR from kernel
use spin_lock_init in via dmablit
make a savage function static from kernel
remove inline from large function
make sizeof match the copy struct
fix some sizes in sis_drv.h
fix comment in r128
use unifdef to clean up some code
fix irq args compatiblity with pre 2.6.19
mm: incorrect VM_FAULT_OOM returns from drivers
[SPARC]: Respect vm_page_prot in io_remap_page_range().
drm: remove all 2.4 support for drm development tree.
remove legacy taskqueue code
remove drm pci from 2.5 days
fixup inclusion of agp.h
fixup i915 defines in create script
fixup i915 return values from kernel
remove do munmap 4 args
add kcalloc compat for before 2.6.10
remove unused via/sis files from lk build
add nouveau symlinks via git
fixup symlinks via Makefile
Merge branch 'nouveau-1'
fixup permission along line of kernel
make build against 2.6.20 hopefully
fixup i810/i830 to use drm_core_ioremap instead of drm_ioremap
i830: complete fix for i830 maps
add export symbol for memory manager
novueau: try resource 3 if resource 2 is 0 length
ttm: make ttm alloc/free into alloc_pages/free_pages
Revert "nouveau: Fill in context_init for nv10-nv3x."
nouveau: add missing symlink
drm: remove last usage of VM_OFFSET
ati: make pcigart code able to handle variable size PCI GART aperture
radeon: make PCI GART aperture size variable, but making table size
variable
remove drm_lookup_map unused now
deinline agp_remap along lines of kernel
clean up more of inline functions agp_remap/drm_lookup_map
whitespace cleanup pending a kernel merge
more tab/space conversion
use ARRAY_SIZE
make drm fops const from kernel
oops missing else
cleanup ioctl expansion code
more whitespace issues
fixup return values in drm ioctl
more return values fixup
rename badly named define
drm: remove second spinlock init for tasklet lock
cleanup more whitespace from ttm merge
vm: cleanup drm_vm.c along lines of cleanups queued for kernel
drm/ttm: make sure dev_mapping is set-up for the first opener of the drm
drm/i915: set the bo up at firstopen time not after DMA init
drm/bo: avoid oops if the memory manager for this type isn't initialised
add an install target to the drm modules makefile
i915: use breadcrumb macro everywhere
fixup install target, not sure what I was smokin...
radeon: add support for reverse engineered xpress200m
radeon: bump version for IGPGART support
drm: nopfn warning on 64-bit
remove some whitespace violation
whitespace cleanup
update create_lk_drm.sh script
remove DRM_GETSAREA and replace with drm_getsarea function
remove register usage
drm: add new drm_wait_on function to replace macro
move i915 to new drm_wait_on function
drm: remove unused define DRM_HAS_TTM
drm/ttm: cleanup mm_ioctl ioctls to be separate ioctls.
drm/ttm: cleanup most of fence ioctl split out
libdrm: fix typo on ttm fence interface
drm/ttm: ioctl cleanup for buffer object - user side only
drm/ttm: remove old fence ioctl
ttm: complete drm buffer object ioctl split
drm: cleanup use of Linux list handling macros
drm/ttm: cleanup mm_ioctl ioctls to be separate ioctls.
drm/ttm: cleanup most of fence ioctl split out
ati_pcigart: cut to 80 chars
whitespace fixups from kernel
Revert "drm/ttm: cleanup most of fence ioctl split out"
Revert "drm/ttm: cleanup mm_ioctl ioctls to be separate ioctls."
radeon: add other IGP chipsets
drm: convert drawable handling to use Linux idr
drm: move context handling code to use linux idr
drm: fixup initialisation of list heads and idr
radeon: add support for vblank on crtc2
radeon: refine irq acking for vbl on crtc 2
remove include of linux ioctl32.h from drm drivers
drm: fix radeon setparam alignment issues on 32/64-bit
oops must fix this properly at some point
use krh's idr mods to remove lists from idr code
Merge branch 'master' into cleanup
Merge branch 'drm-ttm-cleanup-branch'
drm: remove typedefs in drm.h to their own section
drm: fix typedef in drm_os_linux.h
drm: detypedef drm.h and fixup all problems
drm: remove ttm userspace typedefs
drm: remove drmP.h internal typedefs
drm: remove hashtab/sman and object typedefs
drm: detypedef ttm/bo/fence code
drm: remove drm_buf_t
drm: remove drm_ref_t
drm: remove internal sman typedef
drm: fixup compat wrappers
drm: fixup old kernel compat code
drm_context: fix braino
drm: remove drm_u64_t, replace with uint64_t everwhere
drm: idr stuff is upstream for 2.6.23
fix some missing whitespace/tab
fix drm no-compile due to BSD :-)
fix missing brace placement for IOC_IN
drm: fix size argument for copy to/from user
drm/bo: set the req pointer for each buffer to validate
drm: fix fencing refcount error
drm/fence: shut up lockdep
drm: add unlocked ioctl code path - not used yet
i915: i965 non-secure batchbuffer bit has moved.
drm: remove XFREE86_VERSION macros
drm_sysfs: update sysfs code from kernel
drm/ttm: fixup fence class naming and interfaces
drm: use fence_class as name instead of class
ttm: returning into dummy causes a buffer object leak
drm: fix page count calculation
Merge branch 'pre-superioctl-branch'
i915: check mask instead of flags for buffer fence types
i915: add superioctl support to i915
i915: fix vbl_swap allocation
drm: rename drmBOUnReference to drmBOUnreference for consistency
drm: drop drm bo list handling code
i915: lock struct mutex about buffer object lookups
i915: split reloc execution into separate function
i915: require mfence before submitting batchbuffer
i915: use a drm memory barrier define
i915: remove relocatee kernel mapping sooner stops mutex taking during
sleep
i915: relocate buffers before validation add memory barrier between two
drm/i915: add driver cache flush entry point
drm: call driver load after initing agp subsystem
i915: add backwards compat chipset flushing code
drm: add chipset flushing via agp support
i915: fix compat code on 965/g33
drm/ttm: add support for cached un-snooped mappings.
radeon: set the address to access the aperture on the CPU side correctly
drm: fix oops since user objects..
drm: move some of the OS stuff into the OS header
drm: remove lots of spurious whitespace.
drm: update kernel generator script using v4l script
drm: fix the the typo
drm/ttm: kernel coding style for bo.c and objects.h
drm/ttm: apply linux kernel coding style to bo_lock/move/object/ttm.c
drm: more kernel coding style cleanups
i915: cleanup most of the whitespace
drm/agp: kernel style fixes
i915: compat code doesn't work in i8xx hw.
i915: disable TTM on 8xx chips for now until flushing is solved
i915: oops disable TTM is backwards
intel: add flushing for i8xx chipsets.
i915: remove excess debug output
radeon: refactor out the fb/agp location read/write.
radeon: add initial r5xx support
r500: suggestion from glisse to not add cliprect offset on r5xx
r500: add pci id for X1650
i915: add context handle to superioctl struct
drm: cleanup drm_regman.c coding style
drm: major whitespace/coding style realignment with kernel
r500: add a bunch of all r5xx pci ids..
i965: oops force mi batchbuffer start
drm: more cleanups
drm: oops not a cleanup..
drm: enable udev node creation
patch from -mm kernel to use upper_32_bits
take down stuff after asking driver to unload
drm: move agp include outside CONFIG_AGP as it isn't dependant on agp in
kernel
Merge branch 'master' into r500-support
remove duplicate pciids
Merge branch 'r500-support'
mach64: cleanup some of the macro formatting
mach64: some more minor cleanups
fixup i915 compat resource allocation
Revert "Fix pipe<->plane mapping vs. vblank handling (again)"
drm/i915: add support for E7221
i915/flush: get the ret the right way around
i915 make relocs use copy from user
i915: fix missing header when copying data from userspace
drm: add support for passing state into the suspend hooks.
agp: export the correct symbol
drm: reorganise minor number handling using code from modesetting branch
drm/ttm: add ioctl to get back memory managed area sized
ttm: make sure userspace can't destroy kernel create memory managers
drm/bo: allow non-suser priv to add kernel BOs.
flush_agp_mappings commit
drm/radeon: check sarea_priv exists
remove unneeded load call
drm: this u32 should be a dma_addr_t
drm: set rs690 gart base completly.
drm/rs690: set AGP_BASE_2 to 0
ati: fix rs690 igp gart by allocating the page table in 32-bit memory
drm/pcigart: fix the pci gart to use the drm_pci wrapper.
initial r500 RS and FP register and upload code
drm: add new rs690 pci id
move some more r300 regs into not allowed on r500
drm: fixup r500fp submission
r500: fragment program upload is also used to upload constants.
Merge branch 'r500-fp'
i915: fix oops on agp=off
drm/r300: fix wait interface mixup
nouveau: fix return from function..
i915: gfx hw and i945gme fixes from upstream
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
