Sun Dec 19 00:49:36 2021 UTC ()
drm_clflush_* decls moved to drm_cache.h.


(riastradh)
diff -r1.14 -r1.15 src/sys/external/bsd/drm2/drm/drm_cache.c
cvs diff -r1.14 -r1.15 src/sys/external/bsd/drm2/drm/drm_cache.c (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/drm/drm_cache.c 2020/09/05 07:45:44 1.14
+++ src/sys/external/bsd/drm2/drm/drm_cache.c 2021/12/19 00:49:36 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: drm_cache.c,v 1.14 2020/09/05 07:45:44 maxv Exp $ */ 1/* $NetBSD: drm_cache.c,v 1.15 2021/12/19 00:49:36 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,37 +20,38 @@ @@ -20,37 +20,38 @@
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_cache.c,v 1.14 2020/09/05 07:45:44 maxv Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: drm_cache.c,v 1.15 2021/12/19 00:49:36 riastradh Exp $");
34 34
35#include <sys/param.h> 35#include <sys/param.h>
36#include <sys/types.h> 36#include <sys/types.h>
37#include <sys/xcall.h> 37#include <sys/xcall.h>
38 38
39#include <uvm/uvm_extern.h> 39#include <uvm/uvm_extern.h>
40 40
41#include <linux/mm_types.h> 41#include <linux/mm_types.h>
42 42
43#include <drm/drmP.h> 43#include <drm/drmP.h>
 44#include <drm/drm_cache.h>
44 45
45#if !defined(__arm__) && !defined(__aarch64__) 46#if !defined(__arm__) && !defined(__aarch64__)
46#define DRM_CLFLUSH 1 47#define DRM_CLFLUSH 1
47#endif 48#endif
48 49
49#if defined(DRM_CLFLUSH) 50#if defined(DRM_CLFLUSH)
50static bool drm_md_clflush_finegrained_p(void); 51static bool drm_md_clflush_finegrained_p(void);
51static void drm_md_clflush_all(void); 52static void drm_md_clflush_all(void);
52static void drm_md_clflush_begin(void); 53static void drm_md_clflush_begin(void);
53static void drm_md_clflush_commit(void); 54static void drm_md_clflush_commit(void);
54static void drm_md_clflush_page(struct page *); 55static void drm_md_clflush_page(struct page *);
55static void drm_md_clflush_virt_range(const void *, size_t); 56static void drm_md_clflush_virt_range(const void *, size_t);
56#endif 57#endif