OSDN Git Service
Alan Hourihane [Mon, 18 Feb 2008 22:35:46 +0000 (22:35 +0000)]
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
Keith Packard [Sun, 17 Feb 2008 03:19:29 +0000 (19:19 -0800)]
[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.
Stephane Marchesin [Sat, 16 Feb 2008 02:50:10 +0000 (03:50 +0100)]
nouveau: no GART on ia64 either.
Jesse Barnes [Sat, 16 Feb 2008 00:13:21 +0000 (16:13 -0800)]
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.
Ben Skeggs [Fri, 15 Feb 2008 17:33:27 +0000 (04:33 +1100)]
nv40: actually init all tile regs.
Dave Airlie [Fri, 15 Feb 2008 06:42:44 +0000 (16:42 +1000)]
fb: fixup the offset by getting it from the right place
Dave Airlie [Fri, 15 Feb 2008 06:15:04 +0000 (16:15 +1000)]
various fixes from trying to get userspace started
Dave Airlie [Fri, 15 Feb 2008 00:04:28 +0000 (10:04 +1000)]
switch naming to new proposed scheme
Dave Airlie [Thu, 14 Feb 2008 23:57:30 +0000 (09:57 +1000)]
remove drm_minors_limit
Dave Airlie [Wed, 13 Feb 2008 21:37:34 +0000 (07:37 +1000)]
missing bits
Kristian Høgsberg [Tue, 5 Feb 2008 18:27:16 +0000 (13:27 -0500)]
i915: Add a dri2 init path that gets the lock from the dri2 sarea.
Kristian Høgsberg [Tue, 12 Feb 2008 21:08:18 +0000 (16:08 -0500)]
i915: Only look up dev_priv->mmio_map if it's not already set up
Kristian Høgsberg [Tue, 5 Feb 2008 17:27:48 +0000 (12:27 -0500)]
i915: Add I915_PARAM_CHIPSET_ID param to get chipset ID.
Kristian Høgsberg [Tue, 5 Feb 2008 17:25:22 +0000 (12:25 -0500)]
i915: Make sarea_priv setup optional.
Dave Airlie [Wed, 13 Feb 2008 06:30:15 +0000 (16:30 +1000)]
start moving over to proper hierarchy wrt master accesses
Dave Airlie [Wed, 13 Feb 2008 05:19:42 +0000 (15:19 +1000)]
major port of multi-master ideas into modesetting
Dave Airlie [Wed, 13 Feb 2008 02:20:02 +0000 (12:20 +1000)]
Revert "After the previous revert fix libdrm to start at minor 1"
This reverts commit
f51dc37d75b0b1b8e5636f8f2c201e29986517ea.
Conflicts:
tests/modedemo/demo.c
Dave Airlie [Wed, 13 Feb 2008 02:12:52 +0000 (12:12 +1000)]
drm: re-write minor number allocation to use an idr.
Fixup the minor number allocation scheme to use an idr and move the control
nodes up higher.
Jerome Glisse [Sat, 9 Feb 2008 17:23:35 +0000 (18:23 +0100)]
radeon_ms: bring radeon_ms up to date with lastest changes
Jesse Barnes [Fri, 8 Feb 2008 01:33:28 +0000 (17:33 -0800)]
Restore pipeconf regs unconditionally
On many chipsets, the checks for DPLL enable or VGA mode will prevent the
pipeconf regs from being restored, which could result in a blank display or X
failing to come back after resume. So restore them unconditionally along with
actually restoring pipe B's palette correctly.
Jakob Bornecrantz [Thu, 7 Feb 2008 22:32:59 +0000 (23:32 +0100)]
Added you can now clone displays in modedemo
Alan Hourihane [Thu, 7 Feb 2008 22:21:50 +0000 (22:21 +0000)]
After the previous revert fix libdrm to start at minor 1
and fixup the demos
Alan Hourihane [Thu, 7 Feb 2008 21:13:36 +0000 (21:13 +0000)]
Revert "DRM_CONTROL_ALLOW logic was reversed"
This reverts commit
7af1bb874d9b8b1b8760ad200cee587c41c23434.
Jesse Barnes [Thu, 7 Feb 2008 19:21:09 +0000 (11:21 -0800)]
Fix saveGR array size
Make sure we have enough room for all the GR registers or we'll end up
clobbering the AR index register (which should actually be harmless
unless the BIOS is making an assumption about it).
Jesse Barnes [Thu, 7 Feb 2008 18:48:08 +0000 (10:48 -0800)]
i915: save/restore interrupt state
On resume, if the interrupt state isn't restored correctly, we may end
up with a flood of unexpected or ill-timed interrupts, which could cause
the kernel to disable the interrupt or vblank events to happen at the
wrong time. So save/restore them properly.
Jesse Barnes [Thu, 7 Feb 2008 18:40:06 +0000 (10:40 -0800)]
Fix vblank enable/disable callbacks
There were two problems with the existing callback code: the vblank
enable callback happened multiple times per disable, making drivers more
complex than they had to be, and there was a race between the final
decrement of the vblank usage counter and the next enable call, which
could have resulted in a put->schedule disable->get->enable->disable
sequence, which would be bad.
So add a new vblank_enabled array to track vblank enable on per-pipe
basis, and add a lock to protect it along with the refcount +
enable/disable calls to fix the race.
Jakob Bornecrantz [Thu, 7 Feb 2008 18:32:20 +0000 (19:32 +0100)]
Wrong open call
Jakob Bornecrantz [Thu, 7 Feb 2008 18:25:52 +0000 (19:25 +0100)]
Added userspace part of hotplug ioctl and demo
Jakob Bornecrantz [Thu, 7 Feb 2008 18:24:58 +0000 (19:24 +0100)]
Added kernel part of hotplug ioctl
Jakob Bornecrantz [Thu, 7 Feb 2008 18:23:27 +0000 (19:23 +0100)]
Added hotplug ioctl
Jakob Bornecrantz [Thu, 7 Feb 2008 18:22:38 +0000 (19:22 +0100)]
Small update to modedemo
Alan Hourihane [Tue, 5 Feb 2008 15:30:28 +0000 (15:30 +0000)]
update app to cycle through 4 fbdev's
Alan Hourihane [Tue, 5 Feb 2008 15:24:29 +0000 (15:24 +0000)]
tweak it
Alan Hourihane [Tue, 5 Feb 2008 15:18:05 +0000 (15:18 +0000)]
make modefb/modedemo match each others test output.
Alan Hourihane [Tue, 5 Feb 2008 15:15:13 +0000 (15:15 +0000)]
consistency
Alan Hourihane [Tue, 5 Feb 2008 15:12:46 +0000 (15:12 +0000)]
DRM_CONTROL_ALLOW logic was reversed
Alan Hourihane [Tue, 5 Feb 2008 10:12:21 +0000 (10:12 +0000)]
build fix for older kernels
Alan Hourihane [Tue, 5 Feb 2008 10:11:46 +0000 (10:11 +0000)]
fix some warnings
Alan Hourihane [Tue, 5 Feb 2008 10:11:24 +0000 (10:11 +0000)]
build fix for older kernels
Alan Hourihane [Tue, 5 Feb 2008 10:11:01 +0000 (10:11 +0000)]
Fix function declaration
Alan Hourihane [Tue, 5 Feb 2008 10:10:36 +0000 (10:10 +0000)]
Add missing round_jiffies_relative() for older kernels
Thomas Hellstrom [Tue, 5 Feb 2008 09:35:56 +0000 (10:35 +0100)]
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.
Alan Hourihane [Tue, 5 Feb 2008 09:28:51 +0000 (09:28 +0000)]
consistency
Alan Hourihane [Tue, 5 Feb 2008 09:28:32 +0000 (09:28 +0000)]
Remove duplicate
Jakob Bornecrantz [Mon, 4 Feb 2008 19:51:59 +0000 (20:51 +0100)]
Modedemo now uses two crtc and output pairs
Stuart Bennett [Mon, 28 Jan 2008 22:59:26 +0000 (22:59 +0000)]
nouveau: make nv34 work every time, not just every 2nd time
And make nv30_graph_init a bit more like mmio-traces
Maarten Maathuis [Sat, 2 Feb 2008 11:46:31 +0000 (12:46 +0100)]
nouveau: NV40 can/should now be able to run after the blob.
- Moved the fix from the ddx to drm, because it seemed more appropriate.
- Don't be shy, report if it works for you or not.
Thomas Hellstrom [Thu, 31 Jan 2008 13:11:12 +0000 (14:11 +0100)]
Add an fence_class_manager::last_queued_sequence member, since a
sequence number may actually turn up before the corresponding fence
object has been queued on the ring.
Fence drivers can use this member to determine whether a
sequence number must be re-reported.
Thomas Hellstrom [Wed, 30 Jan 2008 21:14:02 +0000 (22:14 +0100)]
i915: Avoid calling drm_fence_flush_old excessively.
Thomas Hellstrom [Wed, 30 Jan 2008 21:06:02 +0000 (22:06 +0100)]
Simplify the fencing code and differentiate between flushes and
waiting types.
Add a "command_stream_barrier" method to the bo driver.
Jakob Bornecrantz [Wed, 30 Jan 2008 15:16:10 +0000 (16:16 +0100)]
Fix for cursor off
Jakob Bornecrantz [Wed, 30 Jan 2008 14:47:26 +0000 (15:47 +0100)]
ModeFB demo now display cursor
Ben Skeggs [Wed, 30 Jan 2008 00:40:13 +0000 (11:40 +1100)]
nv40: some more nv67 changes
With some luck the drm-side will be OK now for this chipset.
Mirko [Tue, 29 Jan 2008 15:11:27 +0000 (10:11 -0500)]
Add new RV380 pci id
bug 14289
Jesse Barnes [Tue, 29 Jan 2008 05:05:22 +0000 (21:05 -0800)]
Fix hibernate save/restore of VGA attribute regs
In hibernate, we may end up calling the VGA save regs function twice, so we
need to make sure it's idempotent. That means leaving ARX in index mode after
the first save operation. Fixes hibernate on 965.
Jakob Bornecrantz [Mon, 28 Jan 2008 21:06:09 +0000 (22:06 +0100)]
Misc panning fixes for intel_fb
Jakob Bornecrantz [Mon, 28 Jan 2008 02:12:29 +0000 (03:12 +0100)]
Added cursor support
Maciej Cencora [Sun, 27 Jan 2008 02:50:31 +0000 (12:50 +1000)]
drm: add initial rs690 support for drm.
This adds support for configuring the RS690 GART.
George Sapountzis [Fri, 25 Jan 2008 14:54:29 +0000 (16:54 +0200)]
mach64: fix after vblank-rework
don't disable vblank interrupts (similar to r128)
Dave Airlie [Fri, 25 Jan 2008 06:34:05 +0000 (16:34 +1000)]
if irq already enabled well just keep trucking
Dave Airlie [Fri, 25 Jan 2008 06:32:09 +0000 (16:32 +1000)]
don't reinit ring if already initialised
Dave Airlie [Fri, 25 Jan 2008 05:27:53 +0000 (15:27 +1000)]
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
Jesse Barnes [Fri, 25 Jan 2008 04:59:51 +0000 (20:59 -0800)]
Fixup modeset ioctl number & typedef usage
Should be 0x08 rather than 0xa0, and shouldn't use typedefs.
Eric Anholt [Thu, 24 Jan 2008 20:32:08 +0000 (12:32 -0800)]
Merge commit 'airlied/i915-ttm-cfu'
This requires updated Mesa to handle the new relocation format.
Jesse Barnes [Thu, 24 Jan 2008 16:57:04 +0000 (08:57 -0800)]
Remove broken 'in vblank' accounting
We need to return an accurate vblank count to the callers of
->get_vblank_counter, and in the Intel case the actual frame count
register isn't udpated until the next active line is displayed, so we
need to return one more than the frame count register if we're currently
in a vblank period.
However, none of the various ways of doing this is working yet, so
disable the logic for now. This may result in a few missed events, but
should fix the hangs some people have seen due to the current code
tripping the wraparound logic in drm_update_vblank_count.
Dave Airlie [Thu, 24 Jan 2008 05:18:09 +0000 (15:18 +1000)]
i915: fix missing header when copying data from userspace
Dave Airlie [Thu, 24 Jan 2008 04:37:40 +0000 (14:37 +1000)]
i915 make relocs use copy from user
Switch relocs to using copy from user and remove index and pass buffer
handles in instead.
Jesse Barnes [Wed, 23 Jan 2008 16:39:57 +0000 (08:39 -0800)]
Fix thinko in get_vblank_counter
Should use vtotal not htotal to figure out if we're in a vblank period.
Jesse Barnes [Wed, 23 Jan 2008 16:38:01 +0000 (08:38 -0800)]
Fix IS_I915G macro
One to many parantheses...
Maarten Maathuis [Wed, 23 Jan 2008 15:40:19 +0000 (16:40 +0100)]
nouveau: Fix warning in nouveau_mem.c
Dave Airlie [Wed, 23 Jan 2008 06:45:09 +0000 (16:45 +1000)]
i915/flush: get the ret the right way around
Dave Airlie [Wed, 23 Jan 2008 06:44:51 +0000 (16:44 +1000)]
drm/i915: add support for E7221
Jesse Barnes [Tue, 22 Jan 2008 23:16:01 +0000 (15:16 -0800)]
Correct vblank count value
The frame count registers don't increment until the start of the next
frame, so make sure we return an incremented count if called during the
actual vblank period.
Jesse Barnes [Tue, 22 Jan 2008 21:11:29 +0000 (13:11 -0800)]
i915 irq fixes
Ack the IRQs correctly (PIPExSTAT first followed by IIR). Don't read
vblank counter registers on disabled pipes (might hang otherwise). And
deal with flipped pipe/plane mappings if present.
Jesse Barnes [Tue, 22 Jan 2008 17:42:37 +0000 (09:42 -0800)]
Merge branch 'master' into vblank-rework, including mach64 support
Conflicts:
linux-core/drmP.h
linux-core/drm_drv.c
shared-core/i915_drv.h
shared-core/i915_irq.c
shared-core/mga_irq.c
shared-core/radeon_irq.c
shared-core/via_irq.c
Mostly trivial conflicts.
mach64 support from Mathieu Bérard.
Dave Airlie [Tue, 22 Jan 2008 03:39:28 +0000 (14:39 +1100)]
Revert "Fix pipe<->plane mapping vs. vblank handling (again)"
This reverts commit
bfc29606e4a818897eebca46a5e23bbe7bc3ce25.
This regresses i915 here for me I can't get greater than 0.333 fps with gears
Stephane Marchesin [Mon, 21 Jan 2008 20:11:47 +0000 (21:11 +0100)]
nouveau: don't forget NV80.
Stephane Marchesin [Mon, 21 Jan 2008 20:01:28 +0000 (21:01 +0100)]
nouveau: new card family for old card designs.
Jakob Bornecrantz [Fri, 18 Jan 2008 14:00:31 +0000 (15:00 +0100)]
Made radeon_ms not always compile
Kyle McMartin [Thu, 17 Jan 2008 23:51:56 +0000 (18:51 -0500)]
i915: fix invalid opcode exception on cpus without clflush
i915_flush_ttm was unconditionally executing a clflush instruction
to (obviously) flush the cache. Instead, check if the cpu supports
clflush, and if not, fall back to calling wbinvd to flush the entire
cache.
Signed-off-by: Kyle McMartin <kmcmartin@redhat.com>
Eric Anholt [Mon, 7 Jan 2008 21:10:50 +0000 (13:10 -0800)]
Add additional explanation of DRM_BO_FLAG_CACHED_MAPPED before I forget again.
Zhenyu Wang [Wed, 9 Jan 2008 03:30:35 +0000 (11:30 +0800)]
i915: Add chipset id for Intel Integrated Graphics Device
This adds new chipset id in drm.
Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>
Jerome Glisse [Tue, 15 Jan 2008 15:01:39 +0000 (16:01 +0100)]
radeon_ms: use radeon connector type insted of drm
Jerome Glisse [Tue, 15 Jan 2008 13:30:40 +0000 (14:30 +0100)]
radeon_ms: cope with lastest drm modesetting change
Jerome Glisse [Tue, 15 Jan 2008 13:05:25 +0000 (14:05 +0100)]
radeon_ms: add rom parsing & adapt code
Add rom (only combios for now) parsing and use informations
retrieve instead of hardcoded table. Shuffle code around a
bit.
Thomas Hellstrom [Tue, 15 Jan 2008 09:03:41 +0000 (10:03 +0100)]
Properly propagate the user-space fence flags.
This avoids a sync flush when user-space has already programmed
and MI_FLUSH in the batchbuffer.
Thomas Hellstrom [Tue, 15 Jan 2008 08:46:59 +0000 (09:46 +0100)]
Define i915_compat.c upper_32_bits for kernels < 2.6.21
Zou Nan hai [Tue, 15 Jan 2008 01:19:02 +0000 (09:19 +0800)]
this is to fix a deadloop in drm hang system issue.
(1 << bits) is an undefined value when bits == 32.
gcc may generate 1 with this expression
which will lead to an infinite retry loop in
drm_ht_just_insert_please.
Because of the different implement of hash_long,
this issue is more frequenly see on 64 bit system
Dave Airlie [Mon, 14 Jan 2008 09:36:10 +0000 (19:36 +1000)]
fixup i915 compat resource allocation
Stephane Marchesin [Mon, 14 Jan 2008 02:16:40 +0000 (03:16 +0100)]
nouveau: make mem alloc debug a little more verbose.
Jakob Bornecrantz [Fri, 11 Jan 2008 16:33:00 +0000 (17:33 +0100)]
Fix for X axis panning problem
Jakob Bornecrantz [Fri, 11 Jan 2008 16:13:48 +0000 (17:13 +0100)]
Panning now works without modeset
Jakob Bornecrantz [Fri, 11 Jan 2008 03:23:32 +0000 (04:23 +0100)]
Updated the modedemo test
Jakob Bornecrantz [Fri, 11 Jan 2008 01:55:00 +0000 (02:55 +0100)]
Added fixed misc framebuffer problems
Ben Skeggs [Fri, 11 Jan 2008 01:51:08 +0000 (12:51 +1100)]
nv05: enable ctx/op methods, and ignore patch valid failures.
Yes, I'm quite aware "real" nv04 doesn't support this, hopefully the GPU
will just ignore those PGRAPH_DEBUG_3 bits on that hw.
Jakob Bornecrantz [Thu, 10 Jan 2008 04:03:13 +0000 (05:03 +0100)]
Updated test mode and added modedemo
Dave Airlie [Wed, 9 Jan 2008 07:11:17 +0000 (18:11 +1100)]
fixup crtcinfo on modes from userspace
Dave Airlie [Wed, 9 Jan 2008 07:11:04 +0000 (18:11 +1100)]
add control node open
Dave Airlie [Wed, 9 Jan 2008 05:44:31 +0000 (16:44 +1100)]
add internals for opening a control node
Dave Airlie [Wed, 9 Jan 2008 05:43:51 +0000 (16:43 +1100)]
allow control getversion