9583c099b4
Revert "Merge branch 'modesetting-gem'"
...
This reverts commit 6656db1055
2008-12-10 15:50:22 -08:00
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
bffbb497e2
Change git-describe into git describe.
2008-08-27 02:27:10 +02:00
2f03ba4aad
Merge branch 'master' into modesetting-gem
...
Conflicts:
libdrm/Makefile.am
libdrm/xf86drm.h
shared-core/i915_dma.c
shared-core/i915_irq.c
2008-08-13 10:08:02 -07:00
280d415957
drm: add OS_HAS_GEM option.
...
To build i915 driver pass OS_HAS_GEM=1 to make for now
2008-08-11 10:47:00 +10:00
2556341f8b
Merge remote branch 'origin/modesetting-101' into modesetting-gem
2008-07-09 14:53:47 +10:00
473a1997ac
NV50: Initial import of kernel modesetting.
2008-06-22 16:29:00 +02:00
86accbcb34
Merge commit 'origin/drm-gem' into modesetting-gem
...
Lots of conflicts, seems to load ok, but I'm sure some bugs snuck in.
Conflicts:
linux-core/drmP.h
linux-core/drm_lock.c
linux-core/i915_gem.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
2008-06-18 15:25:54 -07:00
f378319b56
Use /bin/pwd instead of trusting shell built-in
2008-06-13 14:29:45 -07:00
2a35d857b3
Remove override of drm module list in preparation for merge.
2008-06-11 12:20:56 -07:00
a1d9600724
Merge commit 'origin/drm-gem' into modesetting-gem
...
Passed the compile test; it's ready to ship.
Conflicts:
libdrm/Makefile.am
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_memrange.c
linux-core/drm_stub.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
2008-06-10 17:31:54 -07:00
ee5afc6342
modeset: disable radeon ms by default
...
as I'm going to break it.
2008-05-29 13:58:26 +10:00
4867780bd6
Emit clflush and chipset flush when mapping objects to gtt
2008-05-05 13:32:28 -07:00
81ba8ded7e
Remove the remainder of the mmfs device.
2008-04-29 13:48:51 -07:00
7f269bec7e
Merge branch 'master' into modesetting-101
...
Conflicts:
linux-core/Makefile.kernel
linux-core/drm_compat.c
linux-core/drm_fops.c
linux-core/drm_lock.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
2008-04-28 12:10:44 +02:00
47a2b7dc03
Initial add of mmfs module.
2008-04-23 10:42:06 -07:00
b3967765c0
linux-core Makefile: add GIT_REVISION
...
This tries to automatically fetch a git revision string and if succeeds,
it #defines GIT_REVISION string macro. Packagers can override it by
'make GIT_REVISION=foo'.
Update Nouveau to use GIT_REVISION, if defined, instead of DRIVER_DATE
in struct drm_driver.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
2008-04-22 22:07:21 +03:00
fb9ea12438
Made radeon_ms not always compile
2008-01-18 15:00:31 +01:00
34797ff67c
radeon_ms: radeon modesetting first commit.
...
This should work on all radeon but there is still many things todo:
- add crtc2
- tmds
- lvds
- add bios data table so we don't need to hardcode dac/crtc infos
- separate clock control to make power saving easier & cleaner
- tiling (warning tiling shouldn't be enable in double scan or interlace)
- surface reg manager (this goes along with tiling)
- suspend/resume hook
- avivo & r500 family support
- atom bios support (for posting card mostly)
- finish superioctl skeleton
- what else ? :)
2007-12-04 23:03:12 +01:00
12b989a710
Revert "Remove the pinned buffer from the LRU when pinning."
...
This reverts 3a0bc518e3
2007-10-17 10:59:48 +02:00
215eab6ccf
Don't build without any optimization on Linux.
...
Building without optimization causes the drm module not to link correctly on
ppc.
2007-09-29 18:07:55 +02:00
24cdd2f8c4
Allow parallel module compile
2007-09-26 14:25:13 -07:00
3d3a96ad4e
Merge branch 'origin' into bo-set-pin
2007-09-19 15:55:58 -07:00
3a0bc518e3
Remove the pinned buffer from the LRU when pinning.
...
Also, be a little safer with setting the pinned flag within the struct lock.
I'm not 100% sure if this is required, but it seems like it might be.
2007-08-02 14:08:04 -07:00
5ba94c2ab8
Initial pass at converting driver to DRM infrastructure.
2007-07-19 10:29:18 -07:00
3a776fa01e
Add XGI driver to Makefiles.
2007-06-26 13:26:10 -07:00
ea98d7e796
nouveau: don't build the module by default
2007-05-17 17:35:51 +02:00
b25558bb73
fixup install target, not sure what I was smokin...
2007-04-07 07:21:05 +10:00
9c79371659
add an install target to the drm modules makefile
2007-04-05 11:18:00 +10:00
cbe31d0dc7
Remove old i830 kernel driver.
2007-03-19 11:46:35 +00:00
e5c4a26a29
Merge branch 'nouveau-1'
2006-12-20 10:30:16 +11:00
dc1b68aacb
fixup symlinks via Makefile
2006-12-20 10:29:43 +11:00
86ff2aeb9b
drm: remove all 2.4 support for drm development tree.
...
Bye bye 2.4 you served us well..
2006-12-19 20:29:03 +11:00
4a0e61d910
Track linux-core symlinks in git.
2006-12-01 10:37:55 +01:00
93fee5cf22
Merge branch 'master' of git://anongit.freedesktop.org/git/mesa/drm into nouveau-1
2006-10-15 00:12:13 +02:00
29598e5253
Add support for tracking drawable information to core
...
Actually make the existing ioctls for adding and removing drawables do
something useful, and add another ioctl for the X server to update drawable
information. The only kind of drawable information tracked so far is cliprects.
2006-09-28 15:41:35 +02:00
fef9b30a2b
initial import of nouveau code from nouveau CVS
2006-08-27 08:55:02 +10:00
6bacb180ce
Merge in the drm-sman-branch
2006-06-06 14:19:00 +00:00
4791dc8856
major realigment of DRM CVS with kernel code, makes integration much easier
2006-02-18 02:53:36 +00:00
62a4673034
Skeleton nv drm driver, to enable DMA in EXA. (Lars Knoll, minor updates by
...
me)
2005-10-06 23:31:29 +00:00
29326c1a89
fix makefile bug
2005-09-11 07:08:46 +00:00
ab59dd285c
Add latest r300 support from r300.sf.net CVS. Patch submitted by volodya,
...
with BSD fix from jkim and the r300_reg.h license from Nicolai Haehnle.
Big thanks to everyone involved!
2005-07-20 21:17:47 +00:00
1b4ce02506
Remove the AGP requirement from Makefile and Kconfig for MGA. Remove the
...
AGP requirement from Kconfig for SIS. There never was a requirement in
Makefile, and Eric Anholt confirms that the Makefile was correct.
2005-06-29 23:20:30 +00:00
2b427bee9b
Move to linux specific directory
2005-06-29 11:36:37 +00:00
6d4b9a830b
Savage doesn't require AGP any more. Enable build even without CONFIG_AGP.
2005-05-17 02:08:02 +00:00
532ccb98b5
Via updates:
...
New PCI command parser. Moved from via_dma.c to via_verifier.c so functions
with similar functionality are close to eachother.
Moved video related functions to via_video.c, which might be extended in
the future, as new video functionality is added.
New device-specific generic IRQ IOCTL, similar to the general VBLANK IOCTL,
but with support for multiple device IRQ sources and functionality.
Support for Unichrome Pro PM800/CN400 video DMA commands in verifier and
PCI parser.
Support for Unichrome Pro PM800/CN400 HQV IRQs in the new generic IRQ
IOCTL.
Bumped minor. New version 2.6.0.
2005-03-28 21:21:42 +00:00
9620a0b8bb
Fix cut & paste problem
2005-01-19 10:03:33 +00:00
fb6a4d0a7d
via updates: moved the verifier state struct to dev_priv. Implemented AGP
...
alignment check.
2005-01-07 11:37:01 +00:00
04842e8bcf
Completeley rewritten Savage DRM which can be considered secure (modulo
...
implementation errors). Direct hardware (MMIO, BCI) access is no longer
needed in the Mesa driver. Bumped version to 2.0.0. Corresponding
changes to the DDX and Mesa drivers are being committed.
2005-01-01 20:22:58 +00:00
267e064527
Added 3D functionality to the via command verifier. Modified the via
...
ring-buffer code somewhat to workaround hardware problems. Bumped via
minor version number.
2004-12-03 23:03:36 +00:00
Jesse Barnes
Dave Airlie
Stephane Marchesin
Maarten Maathuis
Jesse Barnes
Keith Packard
Eric Anholt
Jesse Barnes
Thomas Hellstrom
Pekka Paalanen
Jakob Bornecrantz
Jerome Glisse
Michel Dänzer
Keith Packard
Ian Romanick
Dave Airlie
Alan Hourihane
Dave Airlie
Thomas Hellstrom
Adam Jackson
Eric Anholt
Felix Kuehling
Thomas Hellstrom