linux-toradex.git/drivers/gpu, branch v2.6.28-rc1

Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

2008-10-23T17:18:40+00:00

* 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: Avoid oops in DRM_IOCTL_RM_DRAW if a bad handle is supplied.
  drm: Add 32-bit compatibility for DRM_IOCTL_UPDATE_DRAW.
  drm/i915: use pipes, not planes to label vblank data
  drm/i915: hold dev->struct_mutex and DRM lock during vblank ring operations
  i915: Fix format string warnings on x86-64.
  i915: Don't dereference HWS in /proc debug files when it isn't initialized.
  i915: Enable IMR passthrough of vblank events before enabling it in pipestat.
  drm: Remove two leaks of vblank reference count in error paths.
  drm: fix leak of cliprects in drm_rmdraw()
  i915: Disable MSI on GM965 (errata says it doesn't work)
  drm: Set cliprects to NULL when changing drawable to having 0 cliprects.
  i915: Protect vblank IRQ reg access with spinlock

drm: Avoid oops in DRM_IOCTL_RM_DRAW if a bad handle is supplied.

2008-10-23T03:46:54+00:00

Signed-off-by: Eric Anholt 
Acked-by: Michel Dänzer 
Signed-off-by: Dave Airlie

drm: Add 32-bit compatibility for DRM_IOCTL_UPDATE_DRAW.

2008-10-23T03:46:33+00:00

This fixes vblank support for a 32-bit X Server on a 64-bit kernel.

Signed-off-by: Eric Anholt 
Signed-off-by: Dave Airlie

drm/i915: use pipes, not planes to label vblank data

2008-10-23T03:46:17+00:00

vblank in the kernel is far simpler if it deals with pipes instead of
planes, so we're changing both user and kernel side.

Signed-off-by: Keith Packard 
Signed-off-by: Eric Anholt 
Signed-off-by: Dave Airlie

drm/i915: hold dev->struct_mutex and DRM lock during vblank ring operations

2008-10-23T03:45:56+00:00

To synchronize clip lists with the X server, the DRM lock must be held while
looking at drawable clip lists. To synchronize with other ring access, the
ring mutex must be held while inserting commands into the ring.  Failure to
do the first resulted in easy visual corruption when moving windows, and the
second could have corrupted the ring with DRI2.

Grabbing the DRM lock involves using the DRM tasklet mechanism, grabbing the
ring mutex means potentially sleeping. Deal with both of these by always
running the tasklet from a work handler.

Also, protect from clip list changes since the vblank request was queued by
making sure the window has at least one rectangle while looking inside,
preventing oopses .

Signed-off-by: Keith Packard 
Signed-off-by: Eric Anholt 
Signed-off-by: Dave Airlie

i915: Fix format string warnings on x86-64.

2008-10-23T03:42:27+00:00

Signed-off-by: Eric Anholt 
Signed-off-by: Dave Airlie

i915: Don't dereference HWS in /proc debug files when it isn't initialized.

2008-10-23T03:42:27+00:00

Signed-off-by: Eric Anholt 
Acked-by: Keith Packard 
Signed-off-by: Dave Airlie

i915: Enable IMR passthrough of vblank events before enabling it in pipestat.

2008-10-23T03:42:27+00:00

Otherwise, if we lost the race, the pipestat bit would be set without being
reflected in IIR, and we would never clear the pipestat bit so the pipe
event would never be generated again, and all vblank waits would time out.

Signed-off-by: Eric Anholt 
Acked-by: Keith Packard 
Signed-off-by: Dave Airlie

drm: Remove two leaks of vblank reference count in error paths.

2008-10-23T03:42:27+00:00

If the failing paths were hit, the vblank IRQ would never get turned off
again.

Signed-off-by: Eric Anholt 
Acked-by: Keith Packard 
Signed-off-by: Dave Airlie

drm: fix leak of cliprects in drm_rmdraw()

2008-10-23T03:42:26+00:00

Signed-off-by: Zhenyu Wang 
Signed-off-by: Eric Anholt 
Signed-off-by: Dave Airlie