2d4420c666
Merge branch 'radeon-gem-cs' into modesetting-gem
...
Conflicts:
libdrm/xf86drm.c
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_compat.h
linux-core/drm_drv.c
linux-core/drm_stub.c
linux-core/drm_vm.c
shared-core/i915_dma.c
shared-core/r300_cmdbuf.c
shared-core/radeon_drv.h
2008-08-14 09:36:34 +10:00
957c71ff52
radeon: FEDORA: add old DMA buffers on top of GEM
...
This really shouldn't go upstream, it just lets me
run the old 3D driver on GEM setup system
2008-08-14 09:10:11 +10: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
a6c075fca6
drm: don't teardown things in modeset paths
2008-08-06 15:57:38 +10:00
fd75c02ddd
drm: finish bo after lastclose
2008-08-04 14:59:49 +10:00
717dd804d0
drm: fixup master code to use krefs
2008-08-04 14:54:32 +10:00
086716c8e2
Merge commit 'origin/drm-gem' into modesetting-gem
...
Conflicts:
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_mm.c
linux-core/drm_stub.c
linux-core/i915_gem.c
linux-core/i915_opregion.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
2008-08-01 13:35:56 -04:00
5052e966ec
Merge commit 'origin/master' into modesetting-gem
...
Conflicts:
linux-core/Makefile.kernel
linux-core/ati_pcigart.c
linux-core/drm_compat.h
linux-core/drm_irq.c
linux-core/drm_lock.c
linux-core/i915_drv.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
shared-core/nouveau_mem.c
shared-core/radeon_cp.c
shared-core/radeon_drv.h
2008-07-31 15:18:32 -04:00
296073dc5f
drm: remove object hash
2008-07-31 14:39:25 +10:00
9b8d71b5eb
TTM: remove API and userspace objects.
...
This removes all the TTM userspace API and all userspace objects.
It also removes the drm_bo_lock.c code
2008-07-31 12:54:48 +10:00
33c8e03787
Revert "Rename drm_mm.c and its fuctions to drm_memrange."
...
This reverts commit 3ad8db2071
2008-07-30 11:25:34 -07:00
1d2bb68d28
Merge commit 'origin/master' into drm-gem
...
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
2008-07-28 23:12:26 -07:00
fb05c4d621
Merge remote branch 'origin/modesetting-101' into modesetting-gem
2008-07-26 08:38:59 +10:00
e2ffee839e
drm: As a workaround don't tear down sg with a modesetting driver.
...
- This allows me to maintain a useful prototype driver.
2008-07-20 00:09:06 +02:00
2556341f8b
Merge remote branch 'origin/modesetting-101' into modesetting-gem
2008-07-09 14:53:47 +10:00
38a5f6686c
Add back flink, open and close ioctls.
...
They fell through the cracks in 86accbcb
2008-07-07 18:00:23 -04:00
3e02f7fd31
Merge commit 'origin/drm-gem' into ms-gem
...
Conflicts:
linux-core/drmP.h
linux-core/drm_drv.c
linux-core/drm_stub.c
linux-core/i915_drv.c
linux-core/i915_gem.c
shared-core/i915_drv.h
shared-core/i915_irq.c
2008-07-07 15:43:43 -04:00
70ba087191
drm: fix encoders get permissions
2008-07-03 08:00:39 +10:00
2bd9799e4c
Add device-specific proc_init and proc_cleanup hooks
...
This allows device drivers to add proc files
2008-06-20 16:40:14 -07:00
1915de2c56
drm: only use kernel ioctl cmd when doing a core ioctl.
...
Need to overhaul the mess that is driver ioctls
2008-06-20 15:35:47 +10:00
8712f0a17b
drm: fix the ioctl to not believe userspace.
...
believing userspace causes oopses
2008-06-20 12:03:41 +10: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
2655005762
[gem] Move potentially device-specific ioctls to the intel driver.
...
This is the create (may want location flags), pread/pwrite/mmap
(performance tuning hints), and set_domain (will 32 bits be enough for
everyone?) ioctls. Left in the generic set are just flink/open/close.
The 2D driver must be updated for this change, and API but not ABI is broken
for 3D. The driver version is bumped to mark this.
2008-06-11 14:42:40 -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
6b520005c6
Revert "don't copy back if an error was returned."
...
This reverts commit 6671ad1917
2008-06-03 11:27:39 +02:00
4e7b246398
drm: add functions to get/set gamma ramps
2008-06-02 14:04:41 +10:00
9d38448ed3
modesetting: the great renaming.
...
Okay we have crtc, encoder and connectors.
No more outputs exposed beyond driver internals
I've broken intel tv connector stuff.
Really for TV we should have one TV connector, with a sub property for the
type of signal been driven over it
2008-05-30 15:10:04 +10:00
8ae82f3a2f
drm: add encoder / get encoder to the modesetting resources interface
2008-05-30 12:03:36 +10:00
3f66a0005c
drm: remove root only from a lot of drm ioctls to get stuff running as non-root
2008-05-12 16:29:22 +10:00
1e26ca44c9
[gem] API cleanup. allocate->create unreference->close name->flink
...
Make the API names a bit more consistent.
2008-05-09 12:18:09 -07:00
9af4c49743
[intel-gem] Move domains to relocation records. add set_domain ioctl.
...
Domain information is about buffer relationships, not buffer contents. That
means a relocation contains the domain information as it knows how the
source buffer references the target buffer.
This also adds the set_domain ioctl so that user space can move buffers to
the cpu domain.
2008-05-08 10:44:02 -07:00
ed072ed075
drm_mode: initial replacefb implemenation
2008-05-08 14:02:05 +10:00
39e20bcd5f
Add name/open ioctls, separate handle and pointer ref counts.
...
Names are just another unique integer set (from another idr object).
Names are removed when the user refernces (handles) are all destroyed --
this required that handles for objects be counted separately from
internal kernel references (so that we can tell when the handles are all
gone).
2008-05-02 12:29:17 -07:00
2140e102f9
checkpoint: rename to GEM and a few more i915 bits.
2008-05-01 11:39:20 -07:00
dabd056bf3
Move mmfs ioctls into the DRM. Untested.
2008-04-29 13:32:52 -07:00
3ad8db2071
Rename drm_mm.c and its fuctions to drm_memrange.
...
It's not really a graphics memory allocator, just something to track ranges
of address space. It doesn't involve actual allocation, and was consuming
some desired namespace.
2008-04-28 16:54:53 -07:00
607964ed9e
drm: add master set/drop protocol
...
this may not survive long - just need something for testing
2008-03-17 16:38:20 +10:00
903d9231d6
Add support for monitor hotplug signals/waits
...
Also adjust i915 irq handling as it follows the 16bit'ism's
of the i8xx series.
2008-03-11 20:30:25 +00:00
180c9188f4
drm/ttm: add ioctl to get back memory managed area sized
...
taken from modesetting branch but could be useful outside it.
2008-03-06 05:31:50 +10:00
12574590cd
drm: reorganise minor number handling using code from modesetting branch
...
Rip out the whole head thing and replace it with an idr and drm_minor
structure.
2008-03-06 05:21:50 +10:00
4dbf447f43
drm: fixup compat with old x.org drivers
2008-03-05 15:28:38 +10:00
01dcc47d89
drm: add modesetting as a driver feature.
...
This change adds a driver feature that for i915 is controlled by a module
parameter. You now need to do insmod i915.ko modeset=1 to enable it the
modesetting paths.
It also fixes up lots of X paths. I can run my new DDX driver on this code
with and without modesetting enabled
2008-02-28 16:24:17 +10:00
cdad850ebc
add ioctl to get back memory managed area sized - used for kernel inited areas
2008-02-22 13:49:51 +10:00
0fbee62ec1
major port of multi-master ideas into modesetting
2008-02-13 15:19:42 +10:00
f276c845bd
drm: re-write minor number allocation to use an idr.
...
Fixup the minor number allocation scheme to use an idr and move the control
nodes up higher.
2008-02-13 12:12:52 +10:00
fe83c06861
Revert "DRM_CONTROL_ALLOW logic was reversed"
...
This reverts commit 7af1bb874d
2008-02-07 21:18:37 +00:00
0618ac8a07
Added kernel part of hotplug ioctl
2008-02-07 19:24:58 +01:00
7af1bb874d
DRM_CONTROL_ALLOW logic was reversed
2008-02-05 15:12:46 +00:00
a2254c5a96
Added cursor support
2008-01-28 03:14:56 +01:00
Dave Airlie
Jesse Barnes
Kristian Høgsberg
Eric Anholt
Dave Airlie
Maarten Maathuis
Keith Packard
Jesse Barnes
Jesse Barnes
Michel Dänzer
Dave Airlie
Alan Hourihane
Jakob Bornecrantz