kernel/linux.git/drivers/gpu/drm, branch linux-2.6.28.y

drm/i915: Don't allow objects to get bound while VT switched.

2009-03-23T21:55:32+00:00

commit 9bb2d6f94aeb9a185d69aedbd19421b6da4e3309 upstream. This avoids a BUG_ON in the enter_vt path due to objects being in the GTT when we shouldn't have ever let them be (as we're not supposed to touch the device during that time). This was triggered by a change in the 2D driver to use the GTT mapping of objects after pinning them to improve software fallback performance. Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman

drm/i915: Don't print to dmesg when taking signal during object_pin.

2009-03-23T21:55:30+00:00

commit f1acec933848219c402c165686677b1c307407f8 upstream. This showed up in logs where people had a hung chip, so pinning was blocked on the chip unpinning other buffers, and the X Server took its scheduler signal during that time. Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman

drm/i915: Don't double-unpin buffers if we take a signal in evict_everything().

2009-03-23T21:55:30+00:00

commit b117763627ef4d24086801dd5f74c9eb2f487790 upstream. We haven't seen this in practice, but it was visible when looking at a bug report from when i915_gem_evict_everything() was broken and would always return error. Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman

drm/i915: don't enable vblanks on disabled pipes

2009-03-23T21:55:30+00:00

commit 71e0ffa599f54058d9b8724b4b14d0486751681d upstream. In some cases userland may be confused and try to wait on vblank events from pipes that aren't actually enabled. We shouldn't allow this, so return -EINVAL if the pipe isn't on. Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman

drm/i915: set vblank enabled flag correctly across IRQ install/uninstall

2009-03-23T21:55:30+00:00

commit dc1336ff4fe08ae7cfe8301bfd7f0b2cfd31d20a upstream. In the absence of kernel mode setting, many drivers disable IRQs across VT switch. The core DRM vblank code is missing a check for this case however; even after IRQ disable, the vblank code will still have the vblank_enabled flag set, so unless we track the fact that they're disabled at IRQ uninstall time, when we VT switch back in we won't actually re-enable them, which means any apps waiting on vblank before the switch will hang. This patch does that and also adds a sanity check to the wait condition to look for the irq_enabled flag in general, as well as adding a wakeup to the IRQ uninstall path. Fixes fdo bug #18879 with compiz hangs at VT switch. Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman

drm: stash AGP include under the do-we-have-AGP ifdef

2009-02-02T17:53:23+00:00

commit 1bb88edb7a3769992026f34fd648bb459b0469aa upstream. This fixes the MIPS with DRM build. Signed-off-by: Eric Anholt Tested-by: Martin Michlmayr Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman

drm/radeon: fix correctness of irq_enabled check for radeon.

2008-12-23T00:50:12+00:00

This check was introduced with the logic the wrong way around. Fixes regression: http://bugzilla.kernel.org/show_bug.cgi?id=12216 Tested-by: François Valenduc Signed-off-by: Dave Airlie

drm/i915: GEM on PAE has problems - disable it for now.

2008-12-19T05:38:34+00:00

On PAE systems, GEM allocates pages using shmem, and passes these pages to be bound into AGP, however the AGP interfaces + the x86 set_memory interfaces all take unsigned long not dma_addr_t. The initial fix for this was a mess, so we need to do this correctly for 2.6.29. Signed-off-by: Dave Airlie

drm/i915: Don't return busy for buffers left on the flushing list.

2008-12-19T05:34:32+00:00

These buffers don't have active rendering still occurring to them, they just need either a flush to be emitted or a retire_requests to occur so that we notice they're done. Return unbusy so that one of the two occurs. The two expected consumers of this interface (OpenGL and libdrm_intel BO cache) both want this behavior. Signed-off-by: Eric Anholt Acked-by: Keith Packard Signed-off-by: Dave Airlie

drm/i915: Disable the GM965 MSI errata workaround.

2008-12-09T05:37:24+00:00

Since applying the fix suggested by the errata (disabling MSI), we've had issues with interrupts being stuck on despite IIR being 0 on GM965 hardware. Most reporters of the issue have confirmed that turning MSI back on fixes things, and given the difficulties experienced in getting reliable MSI working on Linux, it's believable that the errata was about software issues and not actual hardware issues. Signed-off-by: Dave Airlie