diff options
| -rw-r--r-- | linux-core/drmP.h | 2 | ||||
| -rw-r--r-- | linux-core/r128_drv.c | 2 | ||||
| -rw-r--r-- | linux-core/tdfx_drv.c | 2 | ||||
| -rw-r--r-- | linux/agpsupport.c | 8 | ||||
| -rw-r--r-- | linux/bufs.c | 2 | ||||
| -rw-r--r-- | linux/drm.h | 2 | ||||
| -rw-r--r-- | linux/drmP.h | 2 | ||||
| -rw-r--r-- | linux/fops.c | 2 | ||||
| -rw-r--r-- | linux/proc.c | 2 | ||||
| -rw-r--r-- | linux/r128_drv.c | 2 | ||||
| -rw-r--r-- | linux/tdfx_drv.c | 2 | ||||
| -rw-r--r-- | shared-core/drm.h | 2 | ||||
| -rw-r--r-- | shared/drm.h | 2 |
13 files changed, 17 insertions, 15 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index d67e6e43..525823c9 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -1,7 +1,7 @@ /* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*- * Created: Mon Jan 4 10:05:05 1999 by faith@dict.org * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a diff --git a/linux-core/r128_drv.c b/linux-core/r128_drv.c index 7f9aced8..9ddd6e4c 100644 --- a/linux-core/r128_drv.c +++ b/linux-core/r128_drv.c @@ -1,7 +1,7 @@ /* r128_drv.c -- ATI Rage 128 driver -*- linux-c -*- * Created: Mon Dec 13 09:47:27 1999 by faith@precisioninsight.com * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a diff --git a/linux-core/tdfx_drv.c b/linux-core/tdfx_drv.c index 269adbb3..4b0e6b0d 100644 --- a/linux-core/tdfx_drv.c +++ b/linux-core/tdfx_drv.c @@ -1,7 +1,7 @@ /* tdfx_drv.c -- tdfx driver -*- linux-c -*- * Created: Thu Oct 7 10:38:32 1999 by faith@precisioninsight.com * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a diff --git a/linux/agpsupport.c b/linux/agpsupport.c index b765ba02..bf8bb8c3 100644 --- a/linux/agpsupport.c +++ b/linux/agpsupport.c @@ -1,7 +1,7 @@ /* agpsupport.c -- DRM support for AGP/GART backend -*- linux-c -*- * Created: Mon Dec 13 09:56:45 1999 by faith@precisioninsight.com * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -203,6 +203,7 @@ int drm_agp_unbind(struct inode *inode, struct file *filp, unsigned int cmd, if (!(entry = drm_agp_lookup_entry(dev, request.handle))) return -EINVAL; if (!entry->bound) return -EINVAL; + entry->bound = 0; return drm_unbind_agp(entry->memory); } @@ -242,8 +243,9 @@ int drm_agp_free(struct inode *inode, struct file *filp, unsigned int cmd, if (!(entry = drm_agp_lookup_entry(dev, request.handle))) return -EINVAL; if (entry->bound) drm_unbind_agp(entry->memory); - entry->prev->next = entry->next; - entry->next->prev = entry->prev; + if (entry->prev) entry->prev->next = entry->next; + else dev->agp->memory = entry->next; + if (entry->next) entry->next->prev = entry->prev; drm_free_agp(entry->memory, entry->pages); drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS); return 0; diff --git a/linux/bufs.c b/linux/bufs.c index 975c8890..63049f39 100644 --- a/linux/bufs.c +++ b/linux/bufs.c @@ -1,7 +1,7 @@ /* bufs.c -- IOCTLs to manage buffers -*- linux-c -*- * Created: Tue Feb 2 08:37:54 1999 by faith@precisioninsight.com * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a diff --git a/linux/drm.h b/linux/drm.h index 37562c4e..4bc7d999 100644 --- a/linux/drm.h +++ b/linux/drm.h @@ -1,7 +1,7 @@ /* drm.h -- Header for Direct Rendering Manager -*- linux-c -*- * Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a diff --git a/linux/drmP.h b/linux/drmP.h index d67e6e43..525823c9 100644 --- a/linux/drmP.h +++ b/linux/drmP.h @@ -1,7 +1,7 @@ /* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*- * Created: Mon Jan 4 10:05:05 1999 by faith@dict.org * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a diff --git a/linux/fops.c b/linux/fops.c index c33806f6..ae349b64 100644 --- a/linux/fops.c +++ b/linux/fops.c @@ -1,7 +1,7 @@ /* fops.c -- File operations for DRM -*- linux-c -*- * Created: Mon Jan 4 08:58:31 1999 by faith@precisioninsight.com * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a diff --git a/linux/proc.c b/linux/proc.c index 8c8e3736..eab2cb51 100644 --- a/linux/proc.c +++ b/linux/proc.c @@ -1,7 +1,7 @@ /* proc.c -- /proc support for DRM -*- linux-c -*- * Created: Mon Jan 11 09:48:47 1999 by faith@precisioninsight.com * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a diff --git a/linux/r128_drv.c b/linux/r128_drv.c index 7f9aced8..9ddd6e4c 100644 --- a/linux/r128_drv.c +++ b/linux/r128_drv.c @@ -1,7 +1,7 @@ /* r128_drv.c -- ATI Rage 128 driver -*- linux-c -*- * Created: Mon Dec 13 09:47:27 1999 by faith@precisioninsight.com * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a diff --git a/linux/tdfx_drv.c b/linux/tdfx_drv.c index 269adbb3..4b0e6b0d 100644 --- a/linux/tdfx_drv.c +++ b/linux/tdfx_drv.c @@ -1,7 +1,7 @@ /* tdfx_drv.c -- tdfx driver -*- linux-c -*- * Created: Thu Oct 7 10:38:32 1999 by faith@precisioninsight.com * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a diff --git a/shared-core/drm.h b/shared-core/drm.h index 37562c4e..4bc7d999 100644 --- a/shared-core/drm.h +++ b/shared-core/drm.h @@ -1,7 +1,7 @@ /* drm.h -- Header for Direct Rendering Manager -*- linux-c -*- * Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a diff --git a/shared/drm.h b/shared/drm.h index 37562c4e..4bc7d999 100644 --- a/shared/drm.h +++ b/shared/drm.h @@ -1,7 +1,7 @@ /* drm.h -- Header for Direct Rendering Manager -*- linux-c -*- * Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a |