ccae12a837
I really screwed up that merge somehow
2008-03-07 08:58:24 +10:00
add7d21c79
drm: fixup for new sysfs API
2008-03-07 08:56:20 +10:00
48a166af14
woah somehow got these upstream
2008-03-07 08:49:27 +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
b87c7ff79e
Add property info.
...
fix bo handle
2008-03-05 10:35:46 +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
44a2209790
Merge branch 'master' of ../../drm into modesetting-101
...
Conflicts:
shared-core/drm.h
2008-03-06 05:39:07 +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
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
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
4aa7efe398
libdrm: fix warnings in mode code
2008-03-05 10:41:54 +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
81db48536c
remove unused functions + include header file
2008-03-05 10:36:42 +10:00
a6a2f2c8c4
Clarify when WAIT_LAZY is relevant to users.
2008-03-04 13:45:41 -08:00
3332a0add6
Remove unused DRM_FENCE_FLAG_WAIT_IGNORE_SIGNALS.
2008-03-04 13:41:30 -08: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
eedf3fa2f0
Don't shortcut the info syscall for drmBOBusy on nonshareable objects.
...
This broke the results when you're trying to check if a buffer you dispatched
some time ago is done being rendered from.
2008-03-04 12:16:51 -08:00
63fd6f284d
[i915] 2D driver may reset Frame count value, this may lead driver
...
to leap it's vblank count a huge value.
This will stall some applications that switch video mode if vblank_mode is set to a non zero value in drirc.
2008-03-03 14:49:49 +08:00
9c5ba9f5d1
Add FENCE registers to MMIO list
2008-03-02 21:48:40 +00:00
09999c90ab
FIX_KMAP_BEGIN requires CONFIG_HIMEM (see include/asm-i386.h/fixmap.h)
2008-02-29 21:57:40 +01:00
612c22f131
Working revision.
2008-02-29 15:38:55 +01:00
1d068973d5
Fix compilation breakage on x86-64.
2008-02-29 13:32:25 +01:00
2305100c0f
More post-ioctl work.
2008-02-29 13:25:55 +01:00
0e72819629
drm: change fb api to take a bo handle not the bo pointer.
2008-02-29 14:07:29 +10: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
28d4d02d67
Initial commit.
2008-02-28 14:05:53 +01:00
40c9e6a26d
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 13:47:15 +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
132ba667f4
drm: add a check for if modesetting is supported.
...
This is Linux only code, it just uses sysfs to see if a control
device has been registered on the requested PCI ID
2008-02-28 12:59:39 +10:00
fd595fa4dc
Reinstate buffer idle before applying relocations.
2008-02-27 21:44:40 +01:00
72983ff301
Don't wait for buffer idle before applying relocations.
2008-02-27 19:46:28 +01: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
e87cec1968
[i915] Relocation fixes.
2008-02-26 10:47:05 +01:00
b92e343dc4
i915: fix typos
2008-02-26 16:20:27 +10:00
35d1b13b4a
i915_mmio: add overlay regs
2008-02-26 16:13:06 +10:00
Dave Airlie
Dave Airlie
Alan Hourihane
Dave Airlie
Benjamin Herrenschmidt
Xiang, Haihao
Eric Anholt
Zou Nan hai
Alan Hourihane
Patrice Mandin
Thomas Hellstrom
Jerome Glisse
Alan Hourihane