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
7e27b3ba88
libdrm_intel: fix warnings on 64 bit
...
Cast a couple of %llx args to unsigned long long.
2008-11-13 13:58:32 -08:00
276c07d885
libdrm: add support for i915 GTT mapping ioctl
...
Add a drm_intel_gem_bo_map_gtt() function for mapping a buffer object
through the aperture rather than directly to its CPU cacheable memory.
2008-11-13 13:52:04 -08:00
9a4cb7eab4
mode: Minor reodering and renaming
2008-11-12 19:17:18 +01:00
17789a409d
mode: Reorder the ioctls and numbering
...
This is to fill in the gaps left by the removal of
the hotplug ioctls. And they also look better :)
2008-11-12 19:10:50 +01:00
ea849d7ca6
mode: Unify userspace API to uint_t
2008-11-12 18:50:05 +01:00
1ead45c8f0
mode: Remove hotplug support from ioctl interface
2008-11-12 18:40:04 +01:00
13948c635d
mode: Unify types for ids and strings
2008-11-12 18:16:38 +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
6d59bad8e9
Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem
2008-11-10 22:21:32 +01:00
72997fb372
libdrm-radeon: be verbose on bo failure and cleanup cs a bit
2008-11-10 22:18:22 +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
994f240503
radeon: fix ring tail overflow issue since alignment
2008-11-10 15:25:27 +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
31b0c4cd20
radeon: fixup vram visible calculation to take a/c pinned objects for now
2008-11-10 15:13:08 +10:00
7abb8416a7
radeon: add more packet3 relocations handling
2008-11-09 18:48:46 +01:00
751d024dd5
libdrm-radeon: update libdrm-radeon to match current CS relocation structures
2008-11-09 18:45:43 +01:00
930c0e7cf4
intel: Restart on interrupt of bo_wait_rendering instead of complaining.
2008-11-07 12:59:43 -08:00
273cc1a698
radeon: lib radeon add bo & cs gem backend
2008-11-06 00:40:06 +01:00
2d822542c7
radeon: libdrm_radeon add handle to debug string
2008-11-05 16:00:04 +01:00
ddfb12b32e
Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem
2008-11-05 15:59:37 +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
2b9a7d5381
radeon: disable AGP for certain chips if not specified until we figure it out
2008-11-03 09:51:57 +10:00
d3aa052f61
radeon: disable debugging message
2008-11-03 09:51:33 +10:00
28c9eb7b74
radeon: commit ring after emitting the buffer discards
2008-11-03 09:50:46 +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
e829d5b6bc
radeon: setup isync cntl properly
2008-11-03 09:47:49 +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
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
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
35f0805592
radeon: don't copy to user the cs ids
2008-11-03 09:40:24 +10:00
Jesse Barnes
Jakob Bornecrantz
Jerome Glisse
Dave Airlie
Eric Anholt