Jesse Barnes
d313108167
Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem
2008-08-16 11:45:53 -07:00
Jesse Barnes
893315d49e
i915: set domain properly on fb mapping, flush out changes
...
The user visible ioctl does this, but since we call into GEM internals
directly, we have to flush things ourselves. Fixes initial fb console
corruption.
2008-08-16 11:35:10 -07:00
Dave Airlie
2030db7532
radeon: reserve 64k of VRAM for now for text mode so we don't trample it
...
need to revisit this later I'm sure
2008-08-15 09:56:42 +10:00
Dave Airlie
e0bbd04eb0
radeon: fix LVDS modes problem
2008-08-15 09:42:06 +10:00
Dave Airlie
30ff279e42
radeon: add support for memory map init
2008-08-14 14:43:51 +10:00
Dave Airlie
eb8f9b9da4
radeon: add copy/solid regs for rn50
2008-08-14 14:41:15 +10:00
Jesse Barnes
5f9e4a764a
i915: update cursor handling to use GEM objects
2008-08-13 16:57:42 -07:00
Dave Airlie
9dff806802
i915: fixup from last merge hopefully
2008-08-14 09:43:23 +10:00
Dave Airlie
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
Alex Deucher
2a65759d15
Add com bios asic init bits
2008-08-14 09:19:03 +10:00
Alex Deucher
f38fff5416
Fill in and make use of more com bios tables on legacy chips
2008-08-14 09:19:03 +10:00
Alex Deucher
9b79d356c1
Add additional quirks from ddx
2008-08-14 09:19:03 +10:00
Alex Deucher
a1f1202470
Fix warnings
2008-08-14 09:19:03 +10:00
Alex Deucher
b486ed7f7d
Get legacy working finally
...
- extra ~ in RADEON_WRITE_P()
- re-arrange crtc setup a bit
- add debugging for tracing calls
- fix pitch calculation
2008-08-14 09:19:03 +10:00
Alex Deucher
8867eca872
set base in legacy crtc mode set
2008-08-14 09:19:03 +10:00
Alex Deucher
ae89ced7de
Convert COM BIOS to table offset lookup function
2008-08-14 09:19:03 +10:00
Alex Deucher
5af426a2b2
Restructure cursor handling and add support for legacy cursors
2008-08-14 09:19:03 +10:00
Alex Deucher
f2351ab38c
atom: implement crtc lock
2008-08-14 09:19:03 +10:00
Alex Deucher
e20c670a5a
LUT updates
...
- Add gamma set for legacy chips
- Add 16 bpp gamma set
2008-08-14 09:19:03 +10:00
Alex Deucher
d4f9eaa55a
various cleanups
...
- white space
- move i2c_lock to radeon_i2c.c
- enable tv dac on legacy
2008-08-14 09:19:03 +10:00
Alex Deucher
019745c417
Add legacy dac detect stubs
2008-08-14 09:19:03 +10:00
Alex Deucher
b6f5b8ec71
unify connector, i2c handling for atom and legacy
2008-08-14 09:19:02 +10:00
Alex Deucher
5f427e9aae
Brute force port of legacy crtc/encoder code
...
- removed save/init/restore chain with set functions
2008-08-14 09:19:02 +10:00
Alex Deucher
7677c2dba5
on_each_cpu() compat fixup from krh
2008-08-14 09:19:02 +10:00
Dave Airlie
b167ccf10f
radeon: fix kernel_mm properly
2008-08-14 09:17:43 +10:00
Dave Airlie
0580785030
radeon: FEDORA: patch to make 3D driver work
...
set gart buffers start
2008-08-14 09:15:28 +10:00
Dave Airlie
58df2fa0ec
radeon: remove debugging
2008-08-14 09:14:56 +10:00
Dave Airlie
b0ee12e6bb
radeon: use mm_enabled variable to denote memory manager running
2008-08-14 09:14:14 +10:00
Dave Airlie
18020e5e96
radeon: make buffer swap for older drivers work again on GEM
2008-08-14 09:12:36 +10:00
Dave Airlie
d59f41b8cf
radeon: add userspace call for mm support check
2008-08-14 09:11:15 +10:00
Dave Airlie
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
Jesse Barnes
1c6abcefdc
i915: setup hardware status page if physical addrs are required
...
Needed for the modesetting case where we initialize the ring at load time.
2008-08-13 11:39:22 -07:00
Jesse Barnes
b8724ae647
Merge branch 'modesetting-101' into modesetting-gem
2008-08-13 10:09:41 -07:00
Jesse Barnes
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
Thomas Hellstrom
af12ef4f6b
Don't call the vblank tasklet with irqs disabled.
...
If a specific tasklet shares data with irq context,
it needs to take a private irq-blocking spinlock within
the tasklet itself.
2008-08-13 10:04:21 +02:00
Kristian Høgsberg
b0e6882946
[intel_bufmgr_gem] Fix flink buffer name caching ( #17085 , #17092 ).
...
Store the global name in global_name, don't overwrite the gem_handle.
2008-08-12 22:22:55 -04:00
Jesse Barnes
085df6491e
Add error checking to framebuffer creation
...
Make the Intel routine return an error if needed and make the core check for
it.
2008-08-12 18:23:58 -07:00
Jesse Barnes
e9648e9107
Export a generic dri_bo handle for use by clients
...
We'll need something like this (either a handle field or a dri_bo_get_handle
function) for kernel mode setting to get at the handles.
2008-08-12 18:22:34 -07:00
Matthieu Herrb
966c783e96
libdrm: Allow build outside of source tree.
2008-08-11 10:48:47 -07:00
Dave Airlie
08faab27e5
drm_vm: fix for build on 2.6.22
...
thanks to malc0 for pointing it out
2008-08-11 10:58:41 +10:00
Dave Airlie
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
Maarten Maathuis
9a2adc442a
NV50: minor changes
2008-08-09 19:50:00 +02:00
Maarten Maathuis
f79ed55462
NV50: enable hotplug irq
2008-08-09 19:47:06 +02:00
Maarten Maathuis
2b7feebb8a
NV50: call drm_sysfs_hotplug_event when appropriate
2008-08-09 19:33:32 +02:00
Dave Airlie
12e6a114cf
drm: TRUE/true
2008-08-09 17:19:16 +10:00
Eric Anholt
f7a9940715
Drop TTM interfaces from the userland library.
2008-08-08 15:57:47 -07:00
Eric Anholt
9e9d9b1741
Fix compile warning from check_aperture change.
2008-08-08 14:08:43 -07:00
Eric Anholt
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
Eric Anholt
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
Stuart Bennett
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