fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2025-12-23 20:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
4158 commits 99 branches 412 tags 16 MiB
Commit graph

243 commits

Author SHA1 Message Date
Jesse Barnes
e4f29968f4 Merge branch 'modesetting-101' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101 2008-05-13 14:47:17 -07:00
Jesse Barnes
ee631e1b86 i915: register definition & header file cleanup 
It would be nice if one day the DRM driver was the canonical source for
register definitions and core macros.  To that end, this patch cleans
things up quite a bit, removing redundant definitions (some with
different names referring to the same register) and generally tidying up
the header file.
 2008-05-13 14:44:17 -07:00
Jakob Bornecrantz
5be53a0881 i915: execbuf now works without i915_dma_init being called 2008-05-13 09:26:26 +02:00
Keith Packard
7e7ea313c4 [intel] When polling for ring space, sleep for a lot longer (10ms) 
If the ring is full, the engine will surely be running for more than 10ms.
 2008-05-12 13:03:16 -07:00
Hong Liu
af60d87869 fix G33 hardware status page in modeset 
We need to alloc a hw status page bo for G33 if modeset is enabled since the 2D
driver can't alloc gfx memory when working in drm modeset.
 2008-05-12 12:04:02 -07:00
Dave Airlie
3f66a0005c drm: remove root only from a lot of drm ioctls to get stuff running as non-root 2008-05-12 16:29:22 +10:00
Eric Anholt
c5c59eab80 GEM: Separate the LRU into execution list and LRU list. 
Now, the LRU list has objects that are completely done rendering and ready
to kick out, while the execution list has things with active rendering,
which have associated cookies and reference counts on them.
 2008-05-09 17:38:32 -07:00
Eric Anholt
d2373b2a34 GEM: Use irq-based fencing rather than syncing and evicting every exec. 2008-05-06 13:28:26 -07:00
Keith Packard
ed6657fa8e Monitor ACTHD register while polling for idle ring. 
When batch buffers are executing, the ring may be stuck for a long time.
Monitor the ACTHD pointer which will show if the execution engine is
actually hung.
 2008-05-05 22:09:34 -07:00
Keith Packard
d59a9300ec Remove some debug messages. 2008-05-05 14:32:01 -07:00
Keith Packard
4511e6cd80 Correct execbuffer offset. Add memory barrier and chipset flush. 2008-05-05 11:27:06 -07:00
Keith Packard
b6f173c430 Add i915_dispatch_gem_execbuffer (broken). 
This function submits a gem-based execbuffer to the ring.
It doesn't work yet.
 2008-05-05 10:51:49 -07:00
Eric Anholt
793549116e Add pin/unpin object ioctls for gem. 2008-05-01 15:40:02 -07:00
Eric Anholt
2140e102f9 checkpoint: rename to GEM and a few more i915 bits. 2008-05-01 11:39:20 -07:00
Eric Anholt
1a84067950 Hacking towards hooking up execbuffer. 2008-04-30 16:03:15 -07:00
Thomas Hellstrom
7f269bec7e Merge branch 'master' into modesetting-101 
Conflicts:

	linux-core/Makefile.kernel
	linux-core/drm_compat.c
	linux-core/drm_fops.c
	linux-core/drm_lock.c
	shared-core/drm.h
	shared-core/i915_dma.c
	shared-core/i915_drv.h
	shared-core/i915_irq.c
 2008-04-28 12:10:44 +02:00
Dave Airlie
ce8c842518 i915: gfx hw and i945gme fixes from upstream 
From Jesse and Zhenyu originally.
 2008-04-22 16:08:17 +10:00
Dave Airlie
b0817a42e7 i915: fix oops on agp=off 
Kernel bug 10289.
 2008-03-24 18:52:26 +10:00
Thomas Hellstrom
88bd1e4a35 Merge branch 'intel-post-reloc' 
Conflicts:

	linux-core/drm_compat.c
	linux-core/drm_compat.h
	linux-core/drm_ttm.c
	shared-core/i915_dma.c

Bump driver minor to 13 due to introduction of new
relocation type.
 2008-03-12 11:34:29 +01:00
Alan Hourihane
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
Thomas Hellstrom
8a18d123f5 Avoid large kmallocs. 2008-03-12 09:49:27 +01:00
Dave Airlie
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
Dave Airlie
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
Xiang, Haihao
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
Dave Airlie
43891ff2d0 Merge remote branch 'origin/master' into modesetting-101 
Conflicts:

	linux-core/drm_compat.c
 2008-03-05 10:37:02 +10:00
Alan Hourihane
9c5ba9f5d1 Add FENCE registers to MMIO list 2008-03-02 21:48:40 +00:00
Thomas Hellstrom
2305100c0f More post-ioctl work. 2008-02-29 13:25:55 +01:00
Dave Airlie
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
Thomas Hellstrom
fd595fa4dc Reinstate buffer idle before applying relocations. 2008-02-27 21:44:40 +01:00
Thomas Hellstrom
72983ff301 Don't wait for buffer idle before applying relocations. 2008-02-27 19:46:28 +01:00
Alan Hourihane
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
Thomas Hellstrom
e87cec1968 [i915] Relocation fixes. 2008-02-26 10:47:05 +01:00
Dave Airlie
b92e343dc4 i915: fix typos 2008-02-26 16:20:27 +10:00
Dave Airlie
35d1b13b4a i915_mmio: add overlay regs 2008-02-26 16:13:06 +10:00
Thomas Hellstrom
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
Kristian Høgsberg
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
Alan Hourihane
8caf6e9571 Fix up conflicts for DRI2 (untested) 2008-02-19 15:17:24 +00:00
Alan Hourihane
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
Dave Airlie
8bf8cd63bb missing bits 2008-02-14 07:37:34 +10:00
Kristian Høgsberg
373dbcf8b2 i915: Add a dri2 init path that gets the lock from the dri2 sarea. 2008-02-13 13:34:02 -05:00
Kristian Høgsberg
db3f03ae35 i915: Only look up dev_priv->mmio_map if it's not already set up 2008-02-13 13:34:02 -05:00
Kristian Høgsberg
ee15459483 i915: Add I915_PARAM_CHIPSET_ID param to get chipset ID. 2008-02-13 13:34:02 -05:00
Kristian Høgsberg
4feb0638f1 i915: Make sarea_priv setup optional. 2008-02-13 13:34:02 -05:00
Thomas Hellstrom
76748efae2 i915: Re-report breadcrumbs on poll to the fence manager, 
since a breadcrumb may actually turn up before a corresponding fence object
has been placed on the fence ring.
 2008-02-05 10:36:49 +01:00
Thomas Hellstrom
47ee6237fe i915: Avoid calling drm_fence_flush_old excessively. 2008-01-30 22:14:02 +01:00
Thomas Hellstrom
f1edb7ad91 Simplify the fencing code and differentiate between flushes and 
waiting types.
Add a "command_stream_barrier" method to the bo driver.
 2008-01-30 22:06:02 +01:00
Dave Airlie
fa7b779c91 don't reinit ring if already initialised 2008-01-25 16:32:09 +10:00
Dave Airlie
e7a41d7f5b Merge remote branch 'origin/master' into modesetting-101 
Conflicts:

	linux-core/drm_bo.c
	linux-core/drm_drv.c
	shared-core/drm.h
	shared-core/i915_dma.c
	shared-core/i915_drv.h
	shared-core/i915_irq.c
	shared-core/radeon_irq.c
 2008-01-25 15:27:53 +10:00
Dave Airlie
5b99306452 i915: fix missing header when copying data from userspace 2008-01-24 15:18:09 +10:00
Dave Airlie
34b71eb451 i915 make relocs use copy from user 
Switch relocs to using copy from user and remove index and pass buffer
handles in instead.
 2008-01-24 14:37:40 +10:00