Commit graph

1722 commits

Author SHA1 Message Date
Patrice Mandin
c2f80ecf4b suspend() and resume() need kernel 2.6.22 or later 2007-11-09 18:08:08 +01:00
Jerome Glisse
e1bc147ac9 drm: check edid data, so we deal well with broken driver. 2007-11-09 17:28:56 +01:00
Jerome Glisse
ffb89d4c3b drm: split edid handling in get_edid & add_edid_mode
This way driver can get_edid in output status detection
(using all workaround which are in get_edid) and then provide
this edid data in get_mode callback of output.
2007-11-09 15:47:24 +01:00
Thomas Hellstrom
e9805de5c7 Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:

	shared-core/i915_dma.c
2007-11-07 18:10:46 +01:00
Thomas Hellstrom
c20370e096 Don't overwrite TTM page flags. 2007-11-07 18:07:56 +01:00
Thomas Hellstrom
c07dd80269 Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:

	linux-core/Makefile.kernel
	shared-core/i915_dma.c
	shared-core/i915_drv.h
	shared-core/i915_irq.c
2007-11-06 10:01:52 +01:00
Thomas Hellstrom
40fb079aeb Avoid buffers not ending up on a list in some cases. 2007-11-06 09:47:57 +01:00
Thomas Hellstrom
20eecf2b88 Add missing drm_regman.c file. 2007-11-06 09:36:29 +01:00
Dave Airlie
349eebd567 i915: compat code doesn't work in i8xx hw. 2007-11-06 18:00:10 +11:00
Dave Airlie
b437c8ca0f drm/agp: kernel style fixes 2007-11-06 12:16:07 +10:00
Dave Airlie
9493ce6ca3 i915: cleanup most of the whitespace 2007-11-06 12:16:07 +10:00
Thomas Hellstrom
5ce43a346c Merge branch 'master' into modesetting-101
Conflicts:

	linux-core/drm_bufs.c
	shared-core/i915_dma.c
	shared-core/i915_drv.h
	shared-core/i915_irq.c
2007-11-05 13:46:06 +01:00
Thomas Hellstrom
427cc561b3 Export a symbol. 2007-11-05 13:22:00 +01:00
Thomas Hellstrom
44ad6f409d Fix a user-buffer check. 2007-11-05 13:20:16 +01:00
Alan Hourihane
1b91113957 remove unused define 2007-11-05 10:06:37 +00:00
Alan Hourihane
306bb12603 remove duplicate and obsolete ioctl statements 2007-11-05 10:05:01 +00:00
Alan Hourihane
71385d6f75 add missing lock 2007-11-05 10:03:26 +00:00
Alan Hourihane
d0956339e3 Use _size 2007-11-05 10:02:46 +00:00
Dave Airlie
82ffcbbd62 drm: more kernel coding style cleanups 2007-11-05 19:14:23 +10:00
Dave Airlie
6ee5412da0 drm/ttm: apply linux kernel coding style to bo_lock/move/object/ttm.c 2007-11-05 19:09:18 +10:00
Dave Airlie
7ad3890707 drm/ttm: kernel coding style for bo.c and objects.h 2007-11-05 19:05:32 +10:00
Dave Airlie
3b43ed51cc drm: fix the the typo 2007-11-05 18:56:46 +10:00
Li Zefan
78fe88baee drm: fix memset size error
The size passing to memset is wrong.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
2007-11-05 18:48:27 +10:00
Dave Airlie
7f6bf84c23 drm: remove lots of spurious whitespace.
Kernel "cleanfile" script run.
2007-11-05 12:42:22 +10:00
Dave Airlie
3664de7395 drm: move some of the OS stuff into the OS header 2007-11-05 12:11:39 +10:00
Ben Skeggs
5092865601 nouveau: Use a sw method instead of notify interrupt to signal fence completion. 2007-11-05 05:46:26 +11:00
Ben Skeggs
9096d50df7 nouveau: disable m2mf buffer move for the moment 2007-11-05 05:15:32 +11:00
Ben Skeggs
0a2ab1a900 nouveau: cleanups 2007-11-05 03:53:46 +11:00
Ben Skeggs
dfa449cf9a nouveau: vram is bar1 2007-11-05 02:32:46 +11:00
Ben Skeggs
173a5be28f nouveau: hook up an inital fence irq handler 2007-11-05 02:20:35 +11:00
Dave Airlie
a2e8e294d8 drm: fix oops since user objects.. 2007-11-04 11:01:27 +11:00
Jeremy Kolb
998d120a47 nouveau: add darktama's email address to authors section. 2007-11-02 19:47:48 -04:00
Jeremy Kolb
2dc2ee7a5a nouveau: put it all together. 2007-11-02 19:47:48 -04:00
Jeremy Kolb
c1aa08106e nouveau: Add darktama's fencing code. Restructure some stuff. 2007-11-02 19:47:48 -04:00
Jeremy Kolb
2c6cbea7de nouveau: incorporate darktama's buffer object work. 2007-11-02 19:47:47 -04:00
Jeremy Kolb
239e81093f nouveau: more filling in for ttm. Change copyright since it's based off of radeon code. 2007-11-02 19:47:47 -04:00
Thomas Hellstrom
9906c7e54b Merge branch 'master' into modesetting-101 2007-11-02 16:07:36 +01:00
Thomas Hellstrom
94c22c3349 User buffer support. 2007-11-02 16:05:25 +01:00
Jesse Barnes
629c8b0dbf Merge branch 'master' into modesetting-101
Conflicts:

	linux-core/Makefile.kernel
	linux-core/drm_stub.c
	linux-core/i915_drv.c
	shared-core/i915_dma.c
	shared-core/i915_drv.h

Fixup suspend/resume conflicts (basically use what's in DRM master for now).
Also fix up a few other conflicts that snuck in (i915_dma changes etc.).
2007-11-01 15:27:55 -07:00
Jesse Barnes
00d6026557 Cleanup vblank_init and fix drm_irq_install
The vblank_init function wanted a couple of cleanups.

Also, drm_irq_install wasn't checking the new return value of irq_postinstall.
If it returns a failure, assume IRQs didn't get set up and take appropriate
action.
2007-11-01 12:50:03 -07:00
Jeremy Kolb
1b176e7613 nouveau: add missing file. 2007-10-31 21:27:00 -04:00
Jeremy Kolb
9416541fb2 Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm 2007-10-31 20:14:48 -04:00
Jeremy Kolb
31847b4b62 nouveau: ttm stubs 2007-10-31 20:13:01 -04:00
Dave Airlie
61cbcb5dbe drm/ttm: add support for cached un-snooped mappings.
This mapping allows cached objects to be mapped in/out of the TT space
with the appropriate flushing calls.

It should put back the old CACHED functionality for snooped mappings
2007-11-01 10:34:53 +11:00
Dave Airlie
6b0b2546c2 i915: fix compat code on 965/g33 2007-11-01 02:00:36 +10:00
Dave Airlie
17f0882d50 drm: add chipset flushing via agp support 2007-10-31 11:33:34 +11:00
Dave Airlie
2489062a33 i915: add backwards compat chipset flushing code 2007-10-31 11:27:44 +11:00
Dave Airlie
c106a7d8b9 drm: call driver load after initing agp subsystem 2007-10-31 11:21:05 +11:00
Jesse Barnes
91aae7e683 Merge branch 'master' into vblank-rework, fixup remaining drivers
Conflicts:

	linux-core/drmP.h
	linux-core/drm_drv.c
	linux-core/drm_irq.c
	shared-core/i915_drv.h
	shared-core/i915_irq.c
	shared-core/mga_drv.h
	shared-core/mga_irq.c
	shared-core/radeon_drv.h
	shared-core/radeon_irq.c

Merge in the latest master bits and update the remaining drivers (except
mach64 which math_b is working on).  Also remove the 9xx hack from the i915
driver; it seems to be correct.
2007-10-30 12:52:46 -07:00
Dave Airlie
50dec29c80 drm/i915: add driver cache flush entry point
Use clflush on Intel hardware to flush cached objects.
2007-10-30 17:52:13 +10:00