linux.git/drivers/char/drm, branch v2.6.15

Revert radeon AGP aperture offset changes

2005-12-29T21:01:54+00:00

This reverts the series of commits

	67dbb4ea33731415fe09c62149a34f472719ac1d
	281ab031a8c9e5b593142eb4ec59a87faae8676a
	47807ce381acc34a7ffee2b42e35e96c0f322e52

that changed the GART VM start offset.  It fixed some machines, but
seems to continually interact badly with some X versions.

Quoth Ben Herrenschmidt:

  "So I think at this point, the best is that we keep the old bogus code
   that at least is consistent with the bug in the server. I'm working on a
   big patch to X that reworks the memory map stuff completely and fixes
   those issues on the server side, I'll do a DRM patch matching this X fix
   as well so that the memory map is only ever set in one place and with
   what I hope is a correct algorithm..."

Signed-off-by: Linus Torvalds

[PATCH] Fix more radeon GART start calculation cases

2005-12-28T03:57:52+00:00

As reported by Jules Villard  and some others, the
recent GART aperture start reconfiguration causes problems on some
setups.

What I _think_ might be happening is that the X server is also trying to
muck around with the card memory map and is forcing it back into a wrong
setting that also happens to no longer match what the DRM wants to do
and blows up.  There are bugs all over the place in that code (and still
some bugs in the DRM as well anyway).

This patch attempts to avoid that by using the largest of the 2 values,
which I think will cause it to behave as it used to for you and will
still fix the problem with machines that have an aperture size smaller
than the video memory.

Acked-by: Jules Villard 
Signed-off-by: Linus Torvalds

[PATCH] radeon drm: fix compilation breakage with gcc 2.95.3

2005-12-19T00:19:35+00:00

Fix a typo which breaks radeon drm compilation with gcc 2.95.3.

The offending line was added back in 2.6.11-rc3, but was harmless
back then. A recent addition nearby changed it into a compilation
breaker: commit 281ab031a8c9e5b593142eb4ec59a87faae8676a.

The doubled semi-colon ends up being an empty instruction, and the
variable declaration thus ends up being in the middle of "code".

Signed-off-by: Jean Delvare 
Cc: Benjamin Herrenschmidt 
Cc: Mark M. Hoffman 
Cc: Paul Mackerras 
Signed-off-by: Linus Torvalds

[PATCH] radeon drm: fix agp aperture map offset

2005-12-16T06:22:57+00:00

This finally fixes the radeon memory mapping bug that was incorrectly
fixed by the previous patch.  This time, we use the actual vram size as
the size to calculate how far to move the AGP aperture from the
framebuffer in card's memory space.

If there are still issues with this patch, they are due to bugs in the X
driver that I'm working on fixing too.

Signed-off-by: Benjamin Herrenschmidt 
Cc: Mark M. Hoffman 
Cc: Paul Mackerras 
Signed-off-by: Linus Torvalds

[drm] fix radeon aperture issue

2005-12-13T05:02:22+00:00

Ben noticed that on certain cards we've landed the AGP space on top of
the second aperture instead of after it..  Which messes things up a lot
on those machines.

This just moves the gart further out, a more correct fix is in the works
from Ben for after 2.6.15.

Signed-off-by: Dave Airlie 
CC: Ben Herrenschmidt 
Signed-off-by: Linus Torvalds

[PATCH] SiS DRM: Fix possible NULL dereference

2005-11-30T16:45:40+00:00

This fixes a NULL pointer reference in DRM.  The SiS driver tries to
allocate a big chunk of memory, but the return value is never checked.

Reported in Novell bugzilla #132271:
  https://bugzilla.novell.com/show_bug.cgi?id=132271

Signed-off-by: Takashi Iwai 
Signed-off-by: Linus Torvalds

drm: fix quiescent locking

2005-11-24T10:41:14+00:00

A fix for a locking bug which is triggered when a client tries to lock with
flag DMA_QUIESCENT (typically the X server), but gets interrupted by a signal.
The locking IOCTL should then return an error, but if DMA_QUIESCENT succeeds
it returns 0, and the client falsely thinks it has the lock. In addition
The client waits for DMA_QUISCENT and possibly DMA_READY without having the lock.

From: Thomas Hellstrom
Signed-off-by: Dave Airlie

drm: move is_pci to the end of the structure

2005-11-23T11:12:59+00:00

We memset the structure across opens except for the flags. The correct
fix is more intrusive but this should fix a problem with bad iounmaps
seen on AGP radeons acting like PCI ones.

Signed-off-by: Dave Airlie

drm: add __GFP_COMP to the drm_alloc_pages

2005-11-23T11:09:13+00:00

The DRM only uses drm_alloc_pages for non-SG PCI cards using DRM.

Signed-off-by: Hugh Dickins 
Signed-off-by: Dave Airlie

I think that if a PCI bus is a root bus, attached to a host bridge not a

2005-11-23T10:45:43+00:00

PCI->PCI bridge, then bus->self is allowed to be NULL. Certainly that's
the case on my Pegasos, and it makes the MGA DRM driver oops...

Signed-off-by: David Woodhouse 
Signed-off-by: Dave Airlie