Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 NetBSD-ify clflush size



details:   https://anonhg.NetBSD.org/src/rev/724882e0d0f6
branches:  trunk
changeset: 1028538:724882e0d0f6
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:16:39 2021 +0000

description:
NetBSD-ify clflush size


Author: Maya Rashish <maya%NetBSD.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 99febe08b79d -r 724882e0d0f6 sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c     Sun Dec 19 11:16:32 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c     Sun Dec 19 11:16:39 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_cmd_parser.c,v 1.24 2021/12/19 01:24:25 riastradh Exp $   */
+/*     $NetBSD: i915_cmd_parser.c,v 1.25 2021/12/19 11:16:39 riastradh Exp $   */
 
 /*
  * Copyright © 2013 Intel Corporation
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_cmd_parser.c,v 1.24 2021/12/19 01:24:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_cmd_parser.c,v 1.25 2021/12/19 11:16:39 riastradh Exp $");
 
 #include "gt/intel_engine.h"
 
@@ -1173,9 +1173,15 @@
                 * We don't care about copying too much here as we only
                 * validate up to the end of the batch.
                 */
-               if (!(dst_obj->cache_coherent & I915_BO_CACHE_COHERENT_FOR_READ))
+               if (!(dst_obj->cache_coherent & I915_BO_CACHE_COHERENT_FOR_READ)) {
+#ifdef __NetBSD__
+                       length = round_up(length,
+                                         cpu_info_primary.ci_cflush_lsize);
+#else
                        length = round_up(length,
                                          boot_cpu_data.x86_clflush_size);
+#endif
+               }
 
                ptr = dst;
                x = offset_in_page(offset);



Home | Main Index | Thread Index | Old Index