Wed Jul 24 02:45:38 2013 UTC ()
Add agp bridge data argument to drm_*_agp in local drm_fops.c.


(riastradh)
diff -r1.1.2.3 -r1.1.2.4 src/sys/external/bsd/drm2/drm/drm_fops.c
cvs diff -r1.1.2.3 -r1.1.2.4 src/sys/external/bsd/drm2/drm/Attic/drm_fops.c (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/drm/Attic/drm_fops.c 2013/07/24 02:43:26 1.1.2.3
+++ src/sys/external/bsd/drm2/drm/Attic/drm_fops.c 2013/07/24 02:45:38 1.1.2.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: drm_fops.c,v 1.1.2.3 2013/07/24 02:43:26 riastradh Exp $ */ 1/* $NetBSD: drm_fops.c,v 1.1.2.4 2013/07/24 02:45:38 riastradh Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2013 The NetBSD Foundation, Inc. 4 * Copyright (c) 2013 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Taylor R. Campbell. 8 * by Taylor R. Campbell.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: drm_fops.c,v 1.1.2.3 2013/07/24 02:43:26 riastradh Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: drm_fops.c,v 1.1.2.4 2013/07/24 02:45:38 riastradh Exp $");
34 34
35#include <drm/drmP.h> 35#include <drm/drmP.h>
36 36
37static int drm_open_file_master(struct drm_file *); 37static int drm_open_file_master(struct drm_file *);
38 38
39static void drm_master_release(struct drm_file *); 39static void drm_master_release(struct drm_file *);
40static void drm_events_release(struct drm_file *); 40static void drm_events_release(struct drm_file *);
41static void drm_close_file_contexts(struct drm_file *); 41static void drm_close_file_contexts(struct drm_file *);
42static void drm_close_file_master(struct drm_file *); 42static void drm_close_file_master(struct drm_file *);
43 43
44static void drm_lastclose_agp(struct drm_device *); 44static void drm_lastclose_agp(struct drm_device *);
45static void drm_lastclose_vma(struct drm_device *); 45static void drm_lastclose_vma(struct drm_device *);
46 46
@@ -374,28 +374,28 @@ drm_lastclose(struct drm_device *dev) @@ -374,28 +374,28 @@ drm_lastclose(struct drm_device *dev)
374 drm_dma_takedown(dev); 374 drm_dma_takedown(dev);
375 375
376 /* XXX clear the dev_mapping */ 376 /* XXX clear the dev_mapping */
377 mutex_unlock(&dev->struct_mutex); 377 mutex_unlock(&dev->struct_mutex);
378} 378}
379 379
380static void 380static void
381drm_lastclose_agp(struct drm_device *dev) 381drm_lastclose_agp(struct drm_device *dev)
382{ 382{
383 struct drm_agp_mem *entry, *next; 383 struct drm_agp_mem *entry, *next;
384 384
385 list_for_each_entry_safe(entry, next, &dev->agp->memory, head) { 385 list_for_each_entry_safe(entry, next, &dev->agp->memory, head) {
386 if (entry->bound) 386 if (entry->bound)
387 drm_unbind_agp(entry->memory); 387 drm_unbind_agp(dev->agp->bridge, entry->memory);
388 drm_free_agp(entry->memory, entry->pages); 388 drm_free_agp(dev->agp->bridge, entry->memory, entry->pages);
389 kfree(entry); 389 kfree(entry);
390 } 390 }
391 INIT_LIST_HEAD(&dev->agp->memory); /* XXX seems kludgey */ 391 INIT_LIST_HEAD(&dev->agp->memory); /* XXX seems kludgey */
392 392
393 if (dev->agp->acquired) 393 if (dev->agp->acquired)
394 drm_agp_release(dev); 394 drm_agp_release(dev);
395 395
396 dev->agp->acquired = 0; 396 dev->agp->acquired = 0;
397 dev->agp->enabled = 0; 397 dev->agp->enabled = 0;
398} 398}
399 399
400static void 400static void
401drm_lastclose_vma(struct drm_device *dev) 401drm_lastclose_vma(struct drm_device *dev)