9583c099b4
Revert "Merge branch 'modesetting-gem'"
...
This reverts commit 6656db1055
2008-12-10 15:50:22 -08:00
c67a83dfe1
Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem
2008-11-19 12:42:49 -08:00
7270731a8b
radeon: protect cs ioctl atomic part with a mutex
...
A small subset of CS need to be atomic (relocation+IB commit to
ring) right now, because of the way relocation are handled, we
need to protect the whole ioctl.
2008-11-16 18:11:00 +01:00
965b4d662a
Merge branch 'master' into modesetting-gem
...
Conflicts:
libdrm/Makefile.am
libdrm/intel/intel_bufmgr.h
libdrm/intel/intel_bufmgr_fake.c
libdrm/intel/intel_bufmgr_gem.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_irq.c
shared-core/radeon_cp.c
shared-core/radeon_drv.h
2008-11-13 15:30:06 -08:00
15464f5181
radeon: add gart useable size to report to userspace
2008-11-10 15:38:32 +10:00
758376e6eb
radeon: disable HDP read cache for now
2008-11-10 15:25:12 +10:00
08ef5b5e67
radeon: force all ring writes to 16-dword alignment.
2008-11-10 15:24:42 +10:00
68fcb7770e
radeon: make build again
2008-11-03 09:58:12 +10:00
0e1df6216e
radeon: add mtrr support for VRAM aperture.
2008-11-03 09:52:25 +10:00
31b8a640db
radeon: overhaul ring interactions
...
emit in 16-dword blocks, emit irqs at same time as everything else
2008-11-03 09:46:54 +10:00
4ef8ace9a9
radeon: add proc debugging for interrupts/ring
2008-11-03 09:45:43 +10:00
31f8d4218c
radeon: add wait rendering API
2008-11-03 09:44:03 +10:00
fc25c81eab
radeon: rs480 fixes for bus mastering
2008-11-03 09:43:29 +10:00
4ccec67a23
radeon: remove unused gem indirect ioctl
2008-11-03 09:42:01 +10:00
8b2925468d
radeon: make new CS2 command submission interface port older interface to this
2008-11-03 09:39:53 +10:00
624da91277
radeon: add r423 bits to modesetting
2008-11-03 09:33:12 +10:00
1c817cc3fc
radeon: pull bus master enable into its own function
2008-11-03 09:32:39 +10:00
3fd0e1483e
radeon: fixup scratch register interactions properly
2008-11-03 09:29:22 +10:00
48f2227516
radeon: export radeon_modeset
2008-11-03 09:25:32 +10:00
848f00d773
radeon: fix some fallout from the busmaster disable cleanup
...
rs400 is just like rs480. I mixed up the internal
chipset names for rs600 and rs400.
2008-10-27 12:59:39 -04:00
26076bf24a
radeon: add initial agp support.
...
This add agpmode command line option.
2008-10-16 10:59:31 +10:00
d958cd7bb9
radeon: use discardable flags on no backing store objects
2008-10-16 10:51:31 +10:00
728d8e226f
radeon: add comment to clarify bus mastering on PCIE chips
2008-10-06 12:12:49 -04:00
6f9dfa098f
radeon: fix duplicate define in my last commit
...
That's what I get for committing at 3 AM.
2008-10-06 12:01:11 -04:00
4b98f6d74f
radeon: fix bus master enabled bits on newer asics
2008-10-06 03:08:27 -04:00
5a36cce349
radeon: fix missing bit from rs740 patch
...
See bug 17908
2008-10-06 00:49:15 -04:00
ce40261012
radeon: Add support for HD2100 IGP (RS740)
2008-10-04 20:43:21 -04:00
09b2dfcedc
radeon: make atom on r4xx a module option
...
default is legacy modesetting. pass module option r4xx_atom
to try using atom on r4xx.
2008-09-26 17:20:04 -04:00
34af71c42a
radeon: add function to configure PCIE lanes
2008-09-18 16:07:41 -04:00
515aa0800c
radeon: do proper memory controller init and setup
2008-09-18 10:17:27 +10:00
8f23d4a44c
make text reserve 256k
2008-09-18 10:12:13 +10:00
2a6dad31d8
radeon: add initial suspend/resume support
...
plus a bunch of fixes
2008-09-18 10:11:23 +10:00
2d4cf9cc0f
radeon: oops set correct scratch
2008-08-19 08:20:09 +10:00
30ff279e42
radeon: add support for memory map init
2008-08-14 14:43:51 +10:00
2d4420c666
Merge branch 'radeon-gem-cs' into modesetting-gem
...
Conflicts:
libdrm/xf86drm.c
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_compat.h
linux-core/drm_drv.c
linux-core/drm_stub.c
linux-core/drm_vm.c
shared-core/i915_dma.c
shared-core/r300_cmdbuf.c
shared-core/radeon_drv.h
2008-08-14 09:36:34 +10:00
b486ed7f7d
Get legacy working finally
...
- extra ~ in RADEON_WRITE_P()
- re-arrange crtc setup a bit
- add debugging for tracing calls
- fix pitch calculation
2008-08-14 09:19:03 +10:00
5f427e9aae
Brute force port of legacy crtc/encoder code
...
- removed save/init/restore chain with set functions
2008-08-14 09:19:02 +10:00
b0ee12e6bb
radeon: use mm_enabled variable to denote memory manager running
2008-08-14 09:14:14 +10:00
18020e5e96
radeon: make buffer swap for older drivers work again on GEM
2008-08-14 09:12:36 +10:00
957c71ff52
radeon: FEDORA: add old DMA buffers on top of GEM
...
This really shouldn't go upstream, it just lets me
run the old 3D driver on GEM setup system
2008-08-14 09:10:11 +10:00
c2184e450e
radeon: add initial support for legacy crtc/encoders.
...
not all there yet
2008-08-08 16:04:45 +10:00
513d4c3ff1
radeon: fix setting new memmap in right place
2008-08-06 10:21:20 +10:00
aa8e15f8b5
radeon: add userspace mm enable switch
2008-08-04 14:59:17 +10:00
5052e966ec
Merge commit 'origin/master' into modesetting-gem
...
Conflicts:
linux-core/Makefile.kernel
linux-core/ati_pcigart.c
linux-core/drm_compat.h
linux-core/drm_irq.c
linux-core/drm_lock.c
linux-core/i915_drv.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
shared-core/nouveau_mem.c
shared-core/radeon_cp.c
shared-core/radeon_drv.h
2008-07-31 15:18:32 -04:00
0452be8826
radeon: move code around putting emit into cs
2008-07-29 18:05:11 +10:00
4234f82acc
radeon_cs: add relocate hook for mm and non-mm relocations
2008-07-29 16:51:47 +10:00
dc3a7c023d
r300: initial command stream parser for packet 0.
...
this at least parses the DDX stream and lets me run gnome-terminal/metacity
2008-07-28 17:27:24 +10:00
38835f9cd2
radeon command submission start
...
take code from Jerome munge into a TTM IB re-use
2008-07-28 15:21:13 +10:00
df9871064e
radeon: add initial atombios modesetting and GEM -> TTM translation layer.
...
This is an initial import of the atom bios parser with modesetting support
for r500 hw using atombios. It also includes a simple memory manager
layer that translates a radeon GEM style interface onto TTM internally.
So far this memory manager has only been used for pinned object allocation
for the DDX to test modesetting.
2008-07-26 08:56:23 +10:00
589f968173
radeon: fix typo with a better typo
2008-07-22 18:47:27 +10:00
Jesse Barnes
Jerome Glisse
Dave Airlie
Alex Deucher
Mihail Zenkov
Dave Airlie
Kristian Høgsberg