| agp_i810.c (110843) | agp_i810.c (111119) |
|---|---|
| 1/*- 2 * Copyright (c) 2000 Doug Rabson 3 * Copyright (c) 2000 Ruslan Ermilov 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 10 unchanged lines hidden (view full) --- 19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * SUCH DAMAGE. 26 * | 1/*- 2 * Copyright (c) 2000 Doug Rabson 3 * Copyright (c) 2000 Ruslan Ermilov 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 10 unchanged lines hidden (view full) --- 19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * SUCH DAMAGE. 26 * |
| 27 * $FreeBSD: head/sys/dev/agp/agp_i810.c 110843 2003-02-14 06:31:45Z anholt $ | 27 * $FreeBSD: head/sys/dev/agp/agp_i810.c 111119 2003-02-19 05:47:46Z imp $ |
| 28 */ 29 30/* 31 * Fixes for 830/845G support: David Dawes <dawes@xfree86.org> 32 * 852GM/855GM/865G support added by David Dawes <dawes@xfree86.org> 33 */ 34 35#include "opt_bus.h" --- 526 unchanged lines hidden (view full) --- 562 } else if (type == 2) { 563 /* 564 * Bogus mapping of a single page for the hardware cursor. 565 */ 566 if (size != AGP_PAGE_SIZE) 567 return 0; 568 } 569 | 28 */ 29 30/* 31 * Fixes for 830/845G support: David Dawes <dawes@xfree86.org> 32 * 852GM/855GM/865G support added by David Dawes <dawes@xfree86.org> 33 */ 34 35#include "opt_bus.h" --- 526 unchanged lines hidden (view full) --- 562 } else if (type == 2) { 563 /* 564 * Bogus mapping of a single page for the hardware cursor. 565 */ 566 if (size != AGP_PAGE_SIZE) 567 return 0; 568 } 569 |
| 570 mem = malloc(sizeof *mem, M_AGP, 0); | 570 mem = malloc(sizeof *mem, M_AGP, M_WAITOK); |
| 571 mem->am_id = sc->agp.as_nextid++; 572 mem->am_size = size; 573 mem->am_type = type; 574 if (type != 1) 575 mem->am_obj = vm_object_allocate(OBJT_DEFAULT, 576 atop(round_page(size))); 577 else 578 mem->am_obj = 0; --- 125 unchanged lines hidden --- | 571 mem->am_id = sc->agp.as_nextid++; 572 mem->am_size = size; 573 mem->am_type = type; 574 if (type != 1) 575 mem->am_obj = vm_object_allocate(OBJT_DEFAULT, 576 atop(round_page(size))); 577 else 578 mem->am_obj = 0; --- 125 unchanged lines hidden --- |