Deleted Added
full compact
agp_i810.c (106860) agp_i810.c (109623)
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 106860 2002-11-13 17:40:15Z mux $
27 * $FreeBSD: head/sys/dev/agp/agp_i810.c 109623 2003-01-21 08:56:16Z alfred $
28 */
29
30/*
31 * Fixes for 830/845G support: David Dawes <dawes@xfree86.org>
32 */
33
34#include "opt_bus.h"
35

--- 459 unchanged lines hidden (view full) ---

495 } else if (type == 2) {
496 /*
497 * Bogus mapping of a single page for the hardware cursor.
498 */
499 if (size != AGP_PAGE_SIZE)
500 return 0;
501 }
502
28 */
29
30/*
31 * Fixes for 830/845G support: David Dawes <dawes@xfree86.org>
32 */
33
34#include "opt_bus.h"
35

--- 459 unchanged lines hidden (view full) ---

495 } else if (type == 2) {
496 /*
497 * Bogus mapping of a single page for the hardware cursor.
498 */
499 if (size != AGP_PAGE_SIZE)
500 return 0;
501 }
502
503 mem = malloc(sizeof *mem, M_AGP, M_WAITOK);
503 mem = malloc(sizeof *mem, M_AGP, 0);
504 mem->am_id = sc->agp.as_nextid++;
505 mem->am_size = size;
506 mem->am_type = type;
507 if (type != 1)
508 mem->am_obj = vm_object_allocate(OBJT_DEFAULT,
509 atop(round_page(size)));
510 else
511 mem->am_obj = 0;

--- 125 unchanged lines hidden ---
504 mem->am_id = sc->agp.as_nextid++;
505 mem->am_size = size;
506 mem->am_type = type;
507 if (type != 1)
508 mem->am_obj = vm_object_allocate(OBJT_DEFAULT,
509 atop(round_page(size)));
510 else
511 mem->am_obj = 0;

--- 125 unchanged lines hidden ---