diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:43:59 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:43:59 +0000 |
| commit | 6ecf374d500afe6da494dfdd6566396ec65b6d6a (patch) | |
| tree | c53d543a00984defdb71042dedc755baadea6f3e /src/radeon_accelfuncs.c | |
| parent | bea8085e04136b0ef513c17bb65c54069ec531e1 (diff) | |
Merge DRI-trunk-20040613 changes in programs/Xserver/hw/xfree86/drivers,
with the following notes:
- Savage and Mach64 (= ati/ati*.[ch] changes) DRI not merged due to
insecurity.
- VIA driver converted to new drmContext and drmHandle names.
- Radeon driver merge conflicted in many places, and MergedFB at least
could probably use some checking at this point.
Diffstat (limited to 'src/radeon_accelfuncs.c')
| -rw-r--r-- | src/radeon_accelfuncs.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/radeon_accelfuncs.c b/src/radeon_accelfuncs.c index 2dbd6b2..442c0fd 100644 --- a/src/radeon_accelfuncs.c +++ b/src/radeon_accelfuncs.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_accelfuncs.c,v 1.7 2003/04/06 20:07:33 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_accelfuncs.c,v 1.7tsi Exp $ */ /* * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and * VA Linux Systems Inc., Fremont, California. @@ -1306,12 +1306,6 @@ FUNC_NAME(RADEONAccelInit)(ScreenPtr pScreen, XAAInfoRecPtr a) | HARDWARE_CLIP_SCREEN_TO_SCREEN_COPY); if (xf86IsEntityShared(info->pEnt->index)) { - DevUnion *pPriv; - RADEONEntPtr pRADEONEnt; - - pPriv = xf86GetEntityPrivate(info->pEnt->index, gRADEONEntityIndex); - pRADEONEnt = pPriv->ptr; - /* If there are more than one devices sharing this entity, we * have to assign this call back, otherwise the XAA will be * disabled |