f79ed55462
NV50: enable hotplug irq
2008-08-09 19:47:06 +02:00
2b7feebb8a
NV50: call drm_sysfs_hotplug_event when appropriate
2008-08-09 19:33:32 +02:00
12e6a114cf
drm: TRUE/true
2008-08-09 17:19:16 +10:00
f7a9940715
Drop TTM interfaces from the userland library.
2008-08-08 15:57:47 -07:00
9e9d9b1741
Fix compile warning from check_aperture change.
2008-08-08 14:08:43 -07:00
e1b8e79796
Merge branch 'drm-gem'
...
Conflicts:
shared-core/i915_dma.c
This brings in kernel support and userland interface for intel GEM.
2008-08-08 14:05:01 -07:00
46e9274e85
Replace the check_aperture API with one we can make thread-safe.
...
While the bufmgr isn't thread-safe at the moment, we need it to be for shared
objects between contexts.
2008-08-08 13:58:29 -07:00
0c47151a57
nouveau: wait for pgraph idle after loading or saving a context
...
the nvidia driver does this, and it stops the error message appearing on nv40
2008-08-08 16:25:05 +01:00
c2184e450e
radeon: add initial support for legacy crtc/encoders.
...
not all there yet
2008-08-08 16:04:45 +10:00
8074b2e83d
Make modesetting-gem build with recent kernels
...
Needed to merge in VM fault changes & pci_read_base API update.
2008-08-07 17:15:50 -07:00
5968e061db
Make flink save the kernel-assigned name and return it instead of creating another name
2008-08-07 15:26:30 -07:00
c7fb19e9b0
Merge branch 'drm-gem' into modesetting-gem
2008-08-07 14:02:04 -07:00
ac20e14d23
Switch from shmem_getpage to read_mapping_page
2008-08-06 10:11:11 -07:00
8c042a0b05
radeon: fixup PCI GART table with GEM enabled
2008-08-06 15:59:31 +10:00
6435958673
radeon: just evict to TT not cached
2008-08-06 15:58:09 +10:00
a6c075fca6
drm: don't teardown things in modeset paths
2008-08-06 15:57:38 +10:00
04b5584c62
pcigart: fixup memset + remove wbinvd
2008-08-06 15:56:08 +10:00
513d4c3ff1
radeon: fix setting new memmap in right place
2008-08-06 10:21:20 +10:00
dc0546c87f
[gem-intel] Retiring flush requests should clear flushed write_domains
...
When i915_gem_retire_request has a flush which matches an object write
domain, clear the write domain. This will move the object to the inactive
list rather than the flushing list, avoiding trouble with objects left stuck
on the flushing list.
2008-08-05 16:06:40 -07:00
ceb3d5e383
[gem-intel] Don't clear write_domain until flush completes
...
In i915_gem_object_wait_rendering, if the object write domain is being
written by the GPU, the appropriate flushing commands are written to the
device and an additional request queued to mark that flush. Finally, the
function blocks on that new request.
The bug was that the write_domain in the object was cleared before the
function blocked.
If the wait is interrupted by a signal, the flushing commands may still be
pending. With the current write_domain information lost, the restarted
syscall will drop right through the write_domain test as that value was
lost, and so the function will not block at all. Oops.
Fixed by simply moving the write_domain clear until after the wait_request
succeeds. Note that the restarted system call will generate an additional
flush sequence and request, but that should be 'harmless', aside from a
slight performance impact.
Someday we'll track flushing more accurately and clear write_domains more
efficiently, but for now, this should suffice.
This bug was discovered in the 2d gem development by running x11perf
-copypixwin500 and noticing that the window got cleared accidentally.
2008-08-05 14:44:53 -07:00
8e41ce17b4
Expose pin/unpin/set_tiling/flink APIs
2008-08-04 23:34:16 -07:00
4748fbcbd7
radeon: fix blit due to registers wrong
2008-08-05 11:36:37 +10:00
fd75c02ddd
drm: finish bo after lastclose
2008-08-04 14:59:49 +10:00
aa8e15f8b5
radeon: add userspace mm enable switch
2008-08-04 14:59:17 +10:00
29649ddede
radeon: don't use ring if cp not going
2008-08-04 14:56:08 +10:00
dff8485151
drm: remove unused types
2008-08-04 14:55:12 +10:00
717dd804d0
drm: fixup master code to use krefs
2008-08-04 14:54:32 +10:00
af6efc3d77
i915/radeon: use rmmap locked
2008-08-04 14:54:02 +10:00
129c8a1181
modesetting: pick_crtcs can't be static
2008-08-04 14:53:14 +10:00
922f74f3c9
drm: remove unneeded debugging
2008-08-04 14:52:58 +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
4585787bd1
Revert "i915: Move all of the irq install/uninstall to load time."
...
This reverts commit 965a72202b
2008-08-01 07:43:58 +10: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
d2d7f3069d
drm: userspace rip out TTM API
2008-07-31 13:31:30 +10:00
10d5b037b8
drm: add fault handler support so as to be more like possible upstream
2008-07-31 13:12:36 +10:00
55761b2fe7
drm: add fault handler support so as to be more like possible upstream
...
(cherry picked from commit 10d5b037b8
2008-07-31 13:11:28 +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
ccbaad52f7
intel-gem: Replace version bump signalling GEM with I915_PARAM_HAS_GEM.
2008-07-30 14:10:36 -07:00
6d4e147480
Make it compile again.
2008-07-30 16:34:37 -04:00
689548b527
intel-gem: Remove dead field from reverted changes.
2008-07-30 11:29:32 -07: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
fb5542aaa8
radeon: hack gem to get an offset back for Mesa.
2008-07-30 17:06:11 +10:00
d659302e09
radeon: add some handles to the sarea + kernel mm available check
2008-07-30 17:05:50 +10:00
95c02743c9
i915: more version checks
2008-07-30 16:52:13 +10:00
02b09d271c
i915: add version checks for opregion on old kernels
2008-07-30 16:26:59 +10:00
8fc72aef70
intel-gem: actually add i915_gem_debug.c.
2008-07-29 20:26:38 -07:00
0f78e30e0a
intel-gem: Check return value of pci_read_base.
2008-07-29 11:10:47 -07:00
90b90c65dc
r300: Fix cliprect emit
...
This makes our handling of cliprects sane. drm_clip_rect always has exclusive
bottom-right corners, but the hardware expects inclusive bottom-right corners,
so we adjust this here.
This complements Michel Daenzer's commit 57aea290e1e0a26d1e74df6cff777eb9f038f1f8
to Mesa. See also http://bugs.freedesktop.org/show_bug.cgi?id=16123 .
2008-07-29 19:59:08 +02:00
0452be8826
radeon: move code around putting emit into cs
2008-07-29 18:05:11 +10:00
Maarten Maathuis
Dave Airlie
Eric Anholt
Stuart Bennett
Dave Airlie
Jesse Barnes
Keith Packard
Kristian Høgsberg
Nicolai Haehnle