Commit Graph

4341 Commits (2c113a1b159f57ab94b54316ece49c677cfe04ce)

Author SHA1 Message Date
Dave Airlie 972f657265 Merge remote branch 'origin/master' into modesetting-gem
Conflicts:

	libdrm/Makefile.am
	libdrm/dri_bufmgr.h
	linux-core/drm_irq.c
	linux-core/drm_sysfs.c
	linux-core/drm_ttm.c
	shared-core/i915_dma.c
	shared-core/i915_irq.c
	shared-core/nouveau_drv.h
	shared-core/radeon_cp.c
2008-09-30 14:13:49 +10:00
Xiang, Haihao 073cb5ee1d intel: Copy data from card memory back to backing store when mapping.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=17705
2008-09-27 11:01:24 +08:00
Alex Deucher 9c6732e790 radeon: use atom for ext tmds on r4xx 2008-09-26 17:32:15 -04:00
Alex Deucher 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
Alex Deucher 89126bb58e Merge branch 'modesetting-gem' of git+ssh://agd5f@git.freedesktop.org/git/mesa/drm into modesetting-gem 2008-09-25 18:47:47 -04:00
Alex Deucher d883347f08 radeon: first pass at using atombios on r4xx hw 2008-09-25 18:45:07 -04:00
Jakob Bornecrantz ea9711b954 Seperate modesetting userspace bits into drm_mode.h 2008-09-25 23:13:19 +02:00
Dave Airlie 35e379ce5a radeon: add r600 modesetting registers writes 2008-09-24 15:25:35 +10:00
Dave Airlie dcf73de059 radeon: add parsing for r6xx object tables 2008-09-24 13:58:26 +10:00
Eric Anholt 2db8e0c8ef intel: Allow up to 15 seconds chewing on one buffer before acknowledging -EBUSY.
The gltestperf demo in some cases took over seven seconds to make it through
one batchbuffer on a GM965.

Bug #17004.
2008-09-23 17:10:04 -07:00
Eric Anholt 0dccf017ab intel: Replace wraparound test logic in bufmgr_fake. Again.
I'd swapped the operands, so if we weren't in lockstep with the hardware we
said the sequence was always passed.  Additionally, a race was available that
we might have failed at recovering from.  Instead, I've replaced the logic
with new stuff that should be more robust and not rely on all the parties in
userland following the same IRQ_EMIT() == 1 protocol.  Also, in a radical
departure from past efforts, include a long comment describing the failure
modes and how we're working around them.

Thanks to haihao for catching the original issue.
2008-09-23 17:10:04 -07:00
Eric Anholt 1b3abe62b5 intel: Do strerror on errno, not on the -1 return value from ioctl. 2008-09-23 17:10:04 -07:00
Kristian Høgsberg 840c9a3054 Update intel modesetting to use mm_private instead of mm_handle. 2008-09-23 16:52:06 +10:00
Dave Airlie 0130aa0de9 radeon: fix minor cursor issues 2008-09-23 16:50:39 +10:00
Kristian Høgsberg 3d18257293 radeon: Fix type in check for tmds type. 2008-09-23 16:50:22 +10:00
Kristian Høgsberg 5fdfbee22a Store the buffer object backing the fb as a void pointer, not a handle.
This lets us defer handle creation until userspace acutally asks for
one, at which point we also have a drm_file to associate it with.
2008-09-23 16:49:32 +10:00
Dave Airlie a2216491c6 drm: fix brace placement 2008-09-23 15:36:50 +10:00
Xiang, Haihao 3949f3c9ea intel: Fix driver-supplied argument to exec function (fd.o bug #17653). 2008-09-22 10:16:19 +08:00
Alex Deucher 66237cd3c2 radeon: rmx_fixup() fixes for legacy chips 2008-09-19 11:19:00 -04:00
Dave Airlie d6b853cf81 radeon: fix voverplus calculation 2008-09-20 00:48:11 +10:00
Dave Airlie dc3a6834f6 radeon: tmds bracket failure found by krh. 2008-09-19 08:03:34 +10:00
Alex Deucher 075ed1d6fd radeon: pll and interlace updates from the ddx
also some formatting cleanup in radeon_reg.h
2008-09-18 17:27:00 -04:00
Alex Deucher 6988176195 radeon: Add functions to set mem/eng clocks 2008-09-18 16:42:22 -04:00
Alex Deucher 34af71c42a radeon: add function to configure PCIE lanes 2008-09-18 16:07:41 -04:00
Alex Deucher e1e782af5d Radeon: restructure PLL data
- store pixel clocks, core clock, and memory clocks separately
- grab all pll limits from bios tables
2008-09-18 15:11:48 -04:00
Alex Deucher 6d0de5a899 Export drm_put_minor 2008-09-18 14:30:05 -04:00
Robert Noland 8ca06eb492 [FreeBSD] Convert to using cdevpriv for file_priv tracking 2008-09-17 23:15:08 -04:00
Dave Airlie 6a0248cbf2 fixup radeon stuff - need to checkout irqs 2008-09-18 10:28:42 +10:00
Dave Airlie 3a497db786 radeon: fixup buffer and cs bits 2008-09-18 10:22:23 +10:00
Dave Airlie f426f458f7 [PATCH] radeon: fixup GEM domain setting - allows more userspace paths
also dirty buffer on validate
2008-09-18 10:20:29 +10:00
Dave Airlie 13e24fa7c0 [PATCH] radeon: disable blit moves 2008-09-18 10:19:53 +10:00
Dave Airlie 8f38c28a39 radeon: fail properly if we can't create the ring.
Normally this will be due to an AGP driver needing updating
2008-09-18 10:19:08 +10:00
Dave Airlie 515aa0800c radeon: do proper memory controller init and setup 2008-09-18 10:17:27 +10:00
Dave Airlie b6c1a2f7ee radeon: fix return value 2008-09-18 10:16:41 +10:00
Dave Airlie 9b728fe4b0 radeon: fixup reference counting properly 2008-09-18 10:16:09 +10:00
Dave Airlie 5081ce1221 radeon: sort out atom vs combios tables for r400 cards 2008-09-18 10:15:43 +10:00
Dave Airlie ed961cb428 radeon: remove unneeded debugging 2008-09-18 10:14:32 +10:00
Dave Airlie 0e384803c5 radeon: don't do full edid for detection purposes 2008-09-18 10:13:30 +10:00
Dave Airlie 8f23d4a44c make text reserve 256k 2008-09-18 10:12:13 +10:00
Dave Airlie 2a6dad31d8 radeon: add initial suspend/resume support
plus a bunch of fixes
2008-09-18 10:11:23 +10:00
Dave Airlie 1062d8dcff modesetting: Add helper to force restore modes on crtcs at resume time 2008-09-18 09:59:08 +10:00
Alex Deucher e23d5c03c4 radeon: fix legacy LVDS 2008-09-17 18:16:25 -04:00
Ben Skeggs ee6bcabc50 nv50: add initial context for chipset 0xaa
This just doesn't look right..
2008-09-17 22:18:03 +10:00
Ben Skeggs d55e8090fa nv50: add initial context to match ctxprog for chipset 0x50 2008-09-17 22:03:38 +10:00
Ben Skeggs 4d2f1257fa nv50: add ctxprog for chipset 0x50 2008-09-17 15:13:27 +10:00
Ben Skeggs 301be1dc9b nv50: add ctxprog for chipset 0xaa 2008-09-17 15:02:54 +10:00
Ben Skeggs f152482bde nv50: add support for chipset 0x92 2008-09-17 14:52:22 +10:00
vehemens 973c634eaa Remove incomplete and obsolete free/net/open code.
Signed-off-by: Robert Noland <rnoland@2hip.net>
2008-09-10 23:35:10 -04:00
Eric Anholt b54d15d8fd Add missing \ to libdrm_la_SOURCES
Reported by jcristau.
2008-09-10 20:05:02 -07:00
Eric Anholt 368b392e6d intel: don't forget to include config.h in bufmgr code.
Thanks to airlied for catching this.
2008-09-10 14:07:19 -07:00