Commit Graph

4450 Commits (412d370b9ae4b2882691863a1c5e13a507574e92)

Author SHA1 Message Date
Jesse Barnes b718b93d75 Update .gitignore with new modetest program 2008-12-10 15:37:29 -08:00
Jesse Barnes 6656db1055 Merge branch 'modesetting-gem' 2008-12-09 10:23:43 -08:00
Dave Airlie c99566fb81 libdrm: bump to 2.4 for lib version
we already have a 2.3.x version out there
2008-12-08 14:05:32 +10:00
Jesse Barnes 12e68f8059 Merge branch 'master' into modesetting-gem 2008-12-03 11:54:07 -08:00
Jesse Barnes d5d5aca7f9 Merge branch 'master' into modesetting-gem 2008-12-03 11:53:36 -08:00
Eric Anholt b0d93c74d8 Bump version to 2.4.2 to signal new libdrm_intel functions. 2008-12-02 12:19:37 -08:00
Eric Anholt 6fb1ad767d intel: Add a function for setting (GTT,GTT) domain, for use by UXA.
This function can also serve the role that the bo_wait_rendering did, when
write_enable is unset.
2008-12-02 12:19:34 -08:00
Ben Skeggs 7e4e0fbbb8 nv50: support NV94 chipset 2008-11-23 18:49:09 +11:00
Ben Skeggs 52232ad702 nv50: update context-related tables for original 8800GTS
I either messed up when I pulled these from a mmio-trace last time, or
the previous values didn't work on my card.  Hopefully it's the former!

In any case, at least one of the original NV50 chipsets work now.
2008-11-21 13:18:58 +11:00
Jesse Barnes 10c3e1a8b5 Merge branch 'master' into modesetting-gem 2008-11-20 11:01:24 -08:00
Jesse Barnes 2e2fd6c632 DRM: make drm_map_type match upstream kernel
Since the TTM type isn't upstream yet, we need to make sure libdrm uses
what the kernel uses, which is _DRM_GEM = 6.
2008-11-20 11:00:29 -08:00
Jesse Barnes 5923831baf DRM: make drm_map_type match kernel
GEM is upstream, but TTM isn't, so _DRM_GEM needs to be 6, not 7.
2008-11-20 10:57:33 -08:00
Stephane Marchesin c029ed2510 Unbreak drm build. 2008-11-19 23:17:27 +01:00
Jesse Barnes c67a83dfe1 Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem 2008-11-19 12:42:49 -08:00
Jesse Barnes 60c1e3a09e libdrm_intel: fix merge error
don't take the lock twice
2008-11-19 10:56:48 -08:00
Jesse Barnes 8f5d8ba97e Update modetest 2008-11-19 10:54:11 -08:00
Jerome Glisse e98eda9159 Revert "gem: protect idr_pre with the spinlock"
This reverts commit f46aba4332.
2008-11-17 13:35:51 +01:00
Jerome Glisse 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
Jerome Glisse 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
Jerome Glisse c0ba14fd90 libdrm-radeon: add print callback to cs & small fixes 2008-11-16 18:04:43 +01:00
Jerome Glisse 5ae79e7edd libdrm-radeon: unref return current BO ptr to reflect BO destruction 2008-11-15 10:39:37 +01:00
Dave Airlie 1f66021854 drm/bo: fix stupid lock imbalance 2008-11-15 12:30:09 +10:00
Jerome Glisse 080a45624b libdrm-radeon: unreference buffer once cs stream is submited or on cs clean
BO are referenced once by reloc to make sure that they not destroyed
before we get a chance to flush the cmd stream, so we need to unreference
them once in cs submit or cs erase if cs i never submitted so bo can
be destructed.
2008-11-14 12:16:10 +01:00
Jerome Glisse bfbecc5c42 libdrm-radeon: new tracker tools
To keep record of bo activities and print them when necessary,
should help in tracking unbalanced ref/unref calls.
2008-11-14 12:16:10 +01:00
Jesse Barnes 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
Jesse Barnes 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
Jesse Barnes 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
Jakob Bornecrantz 9a4cb7eab4 mode: Minor reodering and renaming 2008-11-12 19:17:18 +01:00
Jakob Bornecrantz 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
Jakob Bornecrantz ea849d7ca6 mode: Unify userspace API to uint_t 2008-11-12 18:50:05 +01:00
Jakob Bornecrantz 1ead45c8f0 mode: Remove hotplug support from ioctl interface 2008-11-12 18:40:04 +01:00
Jakob Bornecrantz 13948c635d mode: Unify types for ids and strings 2008-11-12 18:16:38 +01:00
Jerome Glisse 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
Jerome Glisse 6d59bad8e9 Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem 2008-11-10 22:21:32 +01:00
Jerome Glisse 72997fb372 libdrm-radeon: be verbose on bo failure and cleanup cs a bit 2008-11-10 22:18:22 +01:00
Dave Airlie 15464f5181 radeon: add gart useable size to report to userspace 2008-11-10 15:38:32 +10:00
Dave Airlie 532c63cddd radeon: upgrade atom headers 2008-11-10 15:37:51 +10:00
Dave Airlie 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
Dave Airlie 195cc0d817 drm/radeon: add dpms connector functions 2008-11-10 15:37:16 +10:00
Dave Airlie 327631c8b5 radeon: avivo cursors are across the full surface.
fixes cursor on second head
2008-11-10 15:35:34 +10:00
Dave Airlie b1cf46378a modesetting: set the crtc x,y after the mode base change 2008-11-10 15:35:16 +10:00
Dave Airlie 241a9b6414 drm/radeon: add uncached allocator to drm ttm code. 2008-11-10 15:30:21 +10:00
Dave Airlie 994f240503 radeon: fix ring tail overflow issue since alignment 2008-11-10 15:25:27 +10:00
Dave Airlie 758376e6eb radeon: disable HDP read cache for now 2008-11-10 15:25:12 +10:00
Dave Airlie 08ef5b5e67 radeon: force all ring writes to 16-dword alignment. 2008-11-10 15:24:42 +10:00
Dave Airlie 31b0c4cd20 radeon: fixup vram visible calculation to take a/c pinned objects for now 2008-11-10 15:13:08 +10:00
Jerome Glisse 7abb8416a7 radeon: add more packet3 relocations handling 2008-11-09 18:48:46 +01:00
Jerome Glisse 751d024dd5 libdrm-radeon: update libdrm-radeon to match current CS relocation structures 2008-11-09 18:45:43 +01:00
Eric Anholt 930c0e7cf4 intel: Restart on interrupt of bo_wait_rendering instead of complaining. 2008-11-07 12:59:43 -08:00
Jerome Glisse 273cc1a698 radeon: lib radeon add bo & cs gem backend 2008-11-06 00:40:06 +01:00