Module Name:    src
Committed By:   riastradh
Date:           Mon Aug 27 05:35:11 UTC 2018

Modified Files:
        src/sys/external/bsd/drm2/dist/drm/i915: i915_gem_gtt.h

Log Message:
Define px_dma for our bus_dmaish i915_dma_page.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.h:1.2 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.h:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.h:1.2	Mon Aug 27 04:58:23 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.h	Mon Aug 27 05:35:11 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: i915_gem_gtt.h,v 1.2 2018/08/27 04:58:23 riastradh Exp $	*/
+/*	$NetBSD: i915_gem_gtt.h,v 1.3 2018/08/27 05:35:11 riastradh Exp $	*/
 
 /*
  * Copyright © 2014 Intel Corporation
@@ -253,7 +253,11 @@ struct i915_page_dma {
 
 #define px_base(px) (&(px)->base)
 #define px_page(px) (px_base(px)->page)
+#ifdef __NetBSD__
+#define px_dma(x) (px_base(px)->map->dm_seg[0].ds_addr)
+#else
 #define px_dma(px) (px_base(px)->daddr)
+#endif
 
 struct i915_page_scratch {
 	struct i915_page_dma base;

Reply via email to