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
879fb12e28
drm: fix pick crtcs mode selection code
2008-02-26 17:11:03 +11:00
56bb29cf37
Make the execbuffer code reasonably safe against errors.
...
In particular -EAGAINs, which should be common during Xserver operation.
Also handle the fence creation failure case.
2008-02-26 00:05:26 +01:00
d6098db140
fix texture uploads with large 3d textures (bug 13980)
...
Texture uploads could hit the blitter coordinate limit, adjust the texture
offset when uploading the pieces. Make sure to check the end address of the
upload too.
2008-02-23 11:01:36 +01:00
20d0e53916
i915: put ARX back into index mode before doing restore
...
Fixes resume from hibernate in some configurations.
2008-02-22 13:57:38 -08:00
0d32015974
nouveau: Remove some random (french) comment.
2008-02-22 19:28:54 +01:00
7e5f9c8bd3
nouveau: A single define of dma skips is more than enough.
2008-02-22 19:28:54 +01:00
b7086e6ae5
Fix one last occurance of struct _drm_i915_batchbuffer.
...
Thanks to Todd Merrill for pointing it out.
2008-02-22 11:22:52 -05:00
a72399da2a
silence warning
2008-02-22 11:39:21 +00:00
b0fee67a30
i915: Remove leading underscore from struct tags.
...
This matches the changes in mesa to use the system drm includes
for the definitions of the drm ioctl structs.
2008-02-22 00:12:39 -05:00
fad1db2d73
modesetting: fix memory leak and misallocation
2008-02-22 13:49:51 +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
0d1cb1e840
hopefully shit works now without this...
2008-02-22 13:49:51 +10:00
e85ec6693a
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
2008-02-21 23:56:27 +00:00
32c67922b7
Don't free irq resources until after we've unregistered the handler.
2008-02-21 15:31:48 -05:00
ea3de6daa4
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
...
Conflicts:
linux-core/drm_sysfs.c
2008-02-21 11:37:07 +00:00
374b41e5bc
linux: Clean up vblank related resources from drm_irq_uninstall().
...
This fixes at least two problems:
* The vblank_disable_fn timer callback could get called after the DRM was
de-initialized, e.g. on X server shutdown.
* Leak of vblank related resources when disabling and re-enabling the IRQ, e.g.
on an X server reset.
2008-02-21 11:49:38 +01:00
9d1061b8cf
fix SAREA
2008-02-20 22:23:31 +00:00
3f6c8f64aa
fix SAREA
2008-02-20 22:22:49 +00:00
88cb873045
minor test fixes
2008-02-20 19:55:14 +00:00
66cd6bd666
compatibility code for pci_get_bus_and_slot()
2008-02-20 19:55:14 +00:00
e484681a43
remove more offset
2008-02-20 11:44:10 +10:00
8844245cfc
drm/fb: get rid of offset from structure use bo offset
2008-02-20 11:27:22 +10:00
2c409f9a07
ttm: make sure userspace can't destroy kernel create memory managers
2008-02-20 11:27:22 +10:00
6c41e5381f
drm: add support for passing state into the suspend hooks.
...
fix i915 driver to use state for hibernate save avoidance.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2008-02-20 10:02:20 +10:00
8caf6e9571
Fix up conflicts for DRI2 (untested)
2008-02-19 15:17:24 +00:00
f24ed2ad6c
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
...
Conflicts:
linux-core/i915_fence.c
linux-core/via_fence.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
2008-02-18 22:35:46 +00:00
5d8c754bc2
[915]: more registers for S3 (DSPCLK_GATE_D, CACHE_MODE_0, MI_ARB_STATE)
...
Failing to preserve the MI_ARB_STATE register was causing FIFO underruns on
the VGA output on my HP 2510p after resume.
2008-02-16 20:14:49 -08:00
cd87e6352b
nouveau: no GART on ia64 either.
2008-02-16 03:50:29 +01:00
2b1c9cd696
i915: initial (and untested) TV out support
...
Ported from xf86-video-intel. Still need to tie in TV modes somehow, though
preferably w/o using the properties mechanism.
2008-02-15 16:13:21 -08:00
15cbde683f
nv40: actually init all tile regs.
2008-02-16 04:47:02 +11:00
088b383829
fb: fixup the offset by getting it from the right place
2008-02-15 16:42:44 +10:00
222092a1a8
various fixes from trying to get userspace started
2008-02-15 16:15:04 +10:00
75b01cf996
switch naming to new proposed scheme
2008-02-15 10:04:28 +10:00
f2f8ace3e1
remove drm_minors_limit
2008-02-15 09:57:30 +10:00
8bf8cd63bb
missing bits
2008-02-14 07:37:34 +10:00
373dbcf8b2
i915: Add a dri2 init path that gets the lock from the dri2 sarea.
2008-02-13 13:34:02 -05:00
db3f03ae35
i915: Only look up dev_priv->mmio_map if it's not already set up
2008-02-13 13:34:02 -05:00
ee15459483
i915: Add I915_PARAM_CHIPSET_ID param to get chipset ID.
2008-02-13 13:34:02 -05:00
4feb0638f1
i915: Make sarea_priv setup optional.
2008-02-13 13:34:02 -05:00
a4fc1d7ac6
start moving over to proper hierarchy wrt master accesses
2008-02-13 16:30:15 +10:00
0fbee62ec1
major port of multi-master ideas into modesetting
2008-02-13 15:19:42 +10:00
db85ed25af
Revert "After the previous revert fix libdrm to start at minor 1"
...
This reverts commit f51dc37d75
2008-02-13 12:20:02 +10:00
Alan Hourihane
Thomas Hellstrom
Dave Airlie
Roland Scheidegger
Jesse Barnes
Maarten Maathuis
Kristian Høgsberg
Michel Dänzer
Keith Packard
Stephane Marchesin
Ben Skeggs