From: David Miller <davem@davemloft.net>
Date: Thu, 12 Feb 2009 10:15:37 +0000 (-0800)
Subject: drm: radeon: Fix ring_rptr accesses.
X-Git-Tag: v2.6.30-rc1~613^2~46
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b07fa022ecf1e04fd0623877affe9e10bf45ac86;p=pandora-kernel.git

drm: radeon: Fix ring_rptr accesses.

The memory behind ring_rptr can either be in ioremapped memory
or a vmalloc() normal kernel memory buffer.

However, the code unconditionally uses DRM_{READ,WRITE}32() (and thus
readl() and writel()) to access it.

Basically, if RADEON_IS_AGP then it's ioremap()'d memory else it's
vmalloc'd memory.

Adjust all of the ring_rptr access code as needed.

While we're here, kill the 'scratch' pointer in drm_radeon_private.
It's only used in the one place where it is initialized.

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Dave Airlie <airlied@linux.ie>
---

Reading git-diff-tree failed