drm: radeon: Fix ring_rptr accesses.

Browse source

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>

...

This commit is contained in:

David Miller 2009-02-12 02:15:37 -08:00 • committed by Dave Airlie

parent 296c6ae0e9

commit b07fa022ec

3 changed files with 70 additions and 23 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

70

drivers/gpu/drm/radeon/radeon_cp.c

View file

17

drivers/gpu/drm/radeon/radeon_drv.h

View file

6

drivers/gpu/drm/radeon/radeon_state.c

View file