[src/riastradh-drm2]: src/sys/external/bsd/drm2/include/drm Rework Intel GTT ...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c7d7886c93a3
branches:  riastradh-drm2
changeset: 788518:c7d7886c93a3
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Sep 08 15:40:17 2013 +0000

description:
Rework Intel GTT abstraction to use bus_dma.

diffstat:

 sys/external/bsd/drm2/include/drm/intel-gtt.h |  26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diffs (41 lines):

diff -r 6cc37e201754 -r c7d7886c93a3 sys/external/bsd/drm2/include/drm/intel-gtt.h
--- a/sys/external/bsd/drm2/include/drm/intel-gtt.h     Sun Sep 08 15:39:48 2013 +0000
+++ b/sys/external/bsd/drm2/include/drm/intel-gtt.h     Sun Sep 08 15:40:17 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel-gtt.h,v 1.1.2.1 2013/07/24 03:49:20 riastradh Exp $      */
+/*     $NetBSD: intel-gtt.h,v 1.1.2.2 2013/09/08 15:40:17 riastradh Exp $      */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -32,16 +32,22 @@
 #ifndef _DRM_INTEL_GTT_H_
 #define _DRM_INTEL_GTT_H_
 
+#include <sys/bus.h>
+
+#include "drm/bus_dma_hacks.h"
+
+#include <linux/pci.h>
+
+#include <drm/drm_agp_netbsd.h>
+
 struct intel_gtt {
-       unsigned int    stolen_size;
-       unsigned int    gtt_total_entries;
-       unsigned int    gtt_mappable_entries;
-       bool            needs_dmar;
-       bool            do_idle_maps;
-       bus_addr_t      scratch_page_dma;
-       struct vm_page  *scratch_page; /* XXX Sensible?  */
-       bus_size_t      gtt;
-       paddr_t         gma_bus_addr;
+       paddr_t                 gma_bus_addr;
+       unsigned int            stolen_size;
+       unsigned int            gtt_total_entries;
+       unsigned int            gtt_mappable_entries;
+       bus_dma_segment_t       gtt_scratch_seg;
+       bus_dmamap_t            gtt_scratch_map;
+       bus_space_handle_t      gtt_bsh;
 };
 
 struct intel_gtt *