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
e98eda9159
Revert "gem: protect idr_pre with the spinlock"
...
This reverts commit f46aba4332
2008-11-17 13:35:51 +01:00
f46aba4332
gem: protect idr_pre with the spinlock
...
There seems to be an issue if we don't protect idr_pre with
the spinlock we use for idr operations.
2008-11-16 18:13:16 +01:00
1f66021854
drm/bo: fix stupid lock imbalance
2008-11-15 12:30:09 +10: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
9a4cb7eab4
mode: Minor reodering and renaming
2008-11-12 19:17:18 +01:00
1ead45c8f0
mode: Remove hotplug support from ioctl interface
2008-11-12 18:40:04 +01:00
a7457915f5
radeon+libdrm-radeon: change relocation informations
...
Relocation now consist of the following informations (in this order) :
handle buffer object handle identifier
start_offset start offset of first data of the buffer object used by the cs
end_offset end offset of last data of the buffer object used by the cs
read_domain read domain (either VRAM, or GTT as GPU is invalid for CS)
write_domain write domain (either VRAM, or GTT as GPU is invalid for CS)
flags flags used for further optimization (like discard previous
buffer content or forget buffer content after cs which can
help in avoiding moving content in or out)
2008-11-12 16:57:09 +01:00
15464f5181
radeon: add gart useable size to report to userspace
2008-11-10 15:38:32 +10:00
532c63cddd
radeon: upgrade atom headers
2008-11-10 15:37:51 +10:00
213a71f31b
radeon: fix fence race condition hopefully
...
For some reason reading the SCRATCH reg from RAM causes some race to occur.
Hopefully fix this.
2008-11-10 15:37:36 +10:00
195cc0d817
drm/radeon: add dpms connector functions
2008-11-10 15:37:16 +10:00
327631c8b5
radeon: avivo cursors are across the full surface.
...
fixes cursor on second head
2008-11-10 15:35:34 +10:00
b1cf46378a
modesetting: set the crtc x,y after the mode base change
2008-11-10 15:35:16 +10:00
241a9b6414
drm/radeon: add uncached allocator to drm ttm code.
2008-11-10 15:30:21 +10:00
31b0c4cd20
radeon: fixup vram visible calculation to take a/c pinned objects for now
2008-11-10 15:13:08 +10:00
273cc1a698
radeon: lib radeon add bo & cs gem backend
2008-11-06 00:40:06 +01:00
68fcb7770e
radeon: make build again
2008-11-03 09:58:12 +10:00
b7108445c9
radeon: fix ROP values for the paint ROP
2008-11-03 09:52:40 +10:00
0e1df6216e
radeon: add mtrr support for VRAM aperture.
2008-11-03 09:52:25 +10:00
c153a86af7
radeon: add more HDMI bits
2008-11-03 09:49:59 +10:00
49551f87fc
radeon: set dma bufs bo type to a kernel type
2008-11-03 09:49:41 +10:00
cdddff8355
radeon: enable DVI-D + HDMI connectors.
...
This allows the rs690 to work on DVI
2008-11-03 09:48:10 +10:00
13d9acd311
radeon: add more debugging
2008-11-03 09:47:14 +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
ce2cd141c3
radeon: fix race in sysfs
2008-11-03 09:46:07 +10:00
4ef8ace9a9
radeon: add proc debugging for interrupts/ring
2008-11-03 09:45:43 +10:00
be3dac976e
radeon: only enable dynclks if asked for
2008-11-03 09:44:32 +10:00
31f8d4218c
radeon: add wait rendering API
2008-11-03 09:44:03 +10:00
4ccec67a23
radeon: remove unused gem indirect ioctl
2008-11-03 09:42:01 +10:00
f5e6dbef79
radeon: fix some warnings
2008-11-03 09:41:30 +10:00
e57072b5ee
radeon: fix free after refcount
2008-11-03 09:41:12 +10:00
6000fa6862
radeon: CS2 make it all work with new relocs style
2008-11-03 09:40:52 +10:00
8b2925468d
radeon: make new CS2 command submission interface port older interface to this
2008-11-03 09:39:53 +10:00
563e7e5930
radeon/drm: fixup ref counting in on fb objs
2008-11-03 09:36:03 +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
653b16f2dd
radeon: fix accessible VRAM sizing
2008-11-03 09:31:17 +10:00
0dbe3436ee
radeon: fix some warnings
2008-11-03 09:28:36 +10:00
a8f07db596
radeon: workaround failure to parse some rs48x edid
2008-11-03 09:26:32 +10:00
87e90c7362
nouveau: compat fix for set_page_locked().
...
The set_page_locked() function has changed its name again.
2.6.28 offers __set_page_locked() instead, which uses non-atomic
__set_bit() to do the work. In this case, offer our own
set_page_locked() using the atomic set_bit(), because I do not know
if atomic access is really necessary. Atomic behaviour is the one
previously expected.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
2008-11-02 13:55:23 +02:00
e47ab7a508
nv50: symlink nv50_grctx.h to linux-core...
2008-10-28 12:00:08 +11:00
89ef1b5483
drm: missing init_mm symbol, compatibility fix
...
The drm_compat.c version of kmap_atomic_prot_pfn() uses the macro
pgd_offset_k(), which references the symbol init_mm.
Starting in 2.6.25, init_mm is no longer exported by default.
The only user of kmap_atomic_prot_pfn() is i915, so this should
not hurt anyone, and it allows people to load drm.ko.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
2008-10-27 21:21:15 +02:00
34a3ebffc3
mode: Try to settle on a standard for struct fields
2008-10-24 18:46:47 +02:00
26076bf24a
radeon: add initial agp support.
...
This add agpmode command line option.
2008-10-16 10:59:31 +10:00
66740cbd54
radeon: fixup interrupt suspend/resume
2008-10-16 10:55:24 +10:00
318770a78d
radeon: fixup suspend/resume bus master enable
2008-10-16 10:53:55 +10:00
9c5819fc60
radeon: re-enable hw blits for copying from VRAM
2008-10-16 10:53:26 +10:00
b18e6b0a0d
radeon: fix buffer copying for VRAM->TT
2008-10-16 10:52:53 +10:00
Jesse Barnes
Jerome Glisse
Dave Airlie
Jakob Bornecrantz
Pekka Paalanen
Ben Skeggs