631c6af4d9
Fix green offset
2008-03-13 11:47:37 +00:00
b6dc381fab
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
...
Conflicts:
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
2008-03-12 10:18:33 +00:00
2a618e5a7f
Bug # 14712
...
Disable page saving for GPU read-only TTMs.
2008-03-12 10:36:40 +01:00
5bebcd7a0b
Dont allow !sysadmin clients to alter the memory type of
...
NO_EVICT buffers.
2008-03-12 10:19:36 +01:00
88be276a42
Fix for debug memory routines
2008-03-12 10:13:22 +01:00
3262577407
Add error message
2008-03-12 10:11:49 +01:00
c0a1cd052a
Add an emergency pinnable memory quota for root-only processes.
2008-03-12 10:10:03 +01:00
7bcce66a1d
Fix kernel crash when we hit OOM conditions.
...
(Alan Hourihane)
2008-03-12 10:07:56 +01:00
f1a681ebe5
Avoid duplicate calls to drm_ttm_bind in some cases.
2008-03-12 10:02:09 +01:00
fa1d88e3b2
Make sure other TTM memory types than TT is really unbound when evicted.
2008-03-12 09:56:06 +01:00
981f515e2b
drm: fix fd closing ordering.
...
If the master fd goes away before the aiglx fd, we try and get a lock
that actually doesn't exist.
2008-03-12 14:48:01 +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
52748d1792
drm: hopefully fix cursors on 965
2008-03-11 13:23:33 +10:00
a7e6ca62ad
Merge branch 'modesetting-101' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
2008-03-10 23:36:27 +01:00
a7dc4d08b9
rradeon_ms: rework fence code and bring radeon ms up to date
2008-03-10 23:35:07 +01:00
07ba3b7193
remove unneeded load call
2008-03-10 18:30:17 +10:00
9f19e79f95
drm: we already worked out the pitch. multiplying by 4 is just madness..
2008-03-07 17:09:51 +11:00
33cb42a9f7
make startup of Xorg smoother if the mode doesn't change.
...
just flip the framebuffer in when required.
2008-03-07 13:03:42 +11:00
348d95e00b
worst merge effort ever
2008-03-07 12:25:26 +11:00
47b7ec71fe
drm/modesetting: fixup irq removal on exit
2008-03-07 12:15:38 +11:00
f96baf1e1e
Merge branch 'master' of ../../drm into modesetting-101
2008-03-07 11:59:21 +11:00
2540ea7dc6
flush_agp_mappings commit
2008-03-07 09:29:35 +10:00
92a30dd608
drm/bo: allow non-suser priv to add kernel BOs.
...
modprobe can be run with dropped capabilities we still want the kernel bos
to work.
2008-03-06 14:43:23 +10:00
fef1c93aa8
build fix
2008-03-05 10:35:47 +00:00
1a959a2095
Check mode before adding to EDID
2008-03-05 10:35:46 +00:00
8bfe29d9e4
Use ARRAY_SIZE
2008-03-05 10:35:46 +00:00
3ea1902be9
propogate failed fixups back up
2008-03-05 10:35:46 +00:00
5662934ee4
Fix connector description table
2008-03-05 10:35:46 +00:00
e00dea812d
Merge branch 'master' of ../../drm into modesetting-101
...
Conflicts:
linux-core/drmP.h
linux-core/drm_drv.c
linux-core/drm_proc.c
linux-core/drm_stub.c
linux-core/drm_sysfs.c
2008-03-06 05:26:23 +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
a875821f7b
drm: Fix for non-coherent DMA PowerPC
...
This patch fixes bits of the DRM so to make the radeon DRI work on
non-cache coherent PCI DMA variants of the PowerPC processors.
It moves the few places that needs change to wrappers to that
other architectures with similar issues can easily add their
own changes to those wrappers, at least until we have more useful
generic kernel API.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2008-03-05 19:25:03 +10:00
d5c0101252
ttm: make sure userspace can't destroy kernel create memory managers
...
this adds something to say the kernel initialised the memory region not
the userspace. and blocks userspace from deallocating kernel areas
2008-03-06 05:37:54 +10: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
638353103d
i915: Evict if relocatee buffer is CACHED_MAPPED before
...
writting relocations, otherwise the GPU probably sees some
inconsistent data. Fix fd.o bug#14656
2008-03-05 15:09:17 +08:00
f78cdac8e5
fixup previous merge
2008-03-05 15:28:59 +10:00
4dbf447f43
drm: fixup compat with old x.org drivers
2008-03-05 15:28:38 +10:00
43891ff2d0
Merge remote branch 'origin/master' into modesetting-101
...
Conflicts:
linux-core/drm_compat.c
2008-03-05 10:37:02 +10:00
d41846adb7
Clarify through the names what drm_ttm_alloc_pages() and friend actually did.
...
These are all about the page directory (pointers to pages) rather than the
actual pages backing the allocation.
2008-03-04 13:40:46 -08:00
09999c90ab
FIX_KMAP_BEGIN requires CONFIG_HIMEM (see include/asm-i386.h/fixmap.h)
2008-02-29 21:57:40 +01:00
1d068973d5
Fix compilation breakage on x86-64.
2008-02-29 13:32:25 +01:00
cdbd616ea5
agp: export the correct symbol
2008-02-29 10:16:24 +10:00
8ef838e5ff
Add a compat kmap_atomic_prot_pfn to do quick kernel map / unmaps of
...
PCI- or high memory.
This is substantially more efficient than drm_bo_kmap,
since the mapping only lives on a single processor.
Unmapping is done use kunmap_atomic(). Flushes only a single tlb() entry.
Add a support utility int drm_bo_pfn_prot() that returns the
pfn and desired page protection for a given bo offset.
This is all intended for relocations in bound TTMS or vram.
Mapping-accessing-unmapping must be atomic, either using preempt_xx() macros
or a spinlock.
2008-02-28 14:06:46 +01: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
75c9e0d346
radeon: remove TTM from an earlier merge
2008-02-26 23:30:45 +01:00
1e66322633
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
...
Conflicts:
shared-core/i915_dma.c
2008-02-26 15:42:41 +00:00
73cb02b543
DRM_INFO -> DRM_DEBUG
2008-02-26 15:21:44 +00:00
191385d518
DRM_INFO -> DRM_DEBUG
2008-02-26 15:20:59 +00:00
89f65c50d7
define PRETHAW
2008-02-26 15:20:29 +00:00
2476cb209e
Implement short circuit for base change only
...
Allow mode to be set with fb_id set to -1, meaning set
the mode with the current fb (if we have one bound).
Allow intelfb to hook back up it's fb if modesetting
clears it (maybe temporary).
Move any crtc->fb related register changes to set_base
in intel_fb.
General intelfb cleanups.
2008-02-26 15:19:34 +00:00
879fb12e28
drm: fix pick crtcs mode selection code
2008-02-26 17:11:03 +11:00
Alan Hourihane
Thomas Hellstrom
Dave Airlie
Jerome Glisse
Dave Airlie
Dave Airlie
Alan Hourihane
Benjamin Herrenschmidt
Xiang, Haihao
Eric Anholt
Patrice Mandin