Module Name: src
Committed By: riastradh
Date: Sun Sep 8 15:40:17 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/include/drm [riastradh-drm2]: intel-gtt.h
Log Message:
Rework Intel GTT abstraction to use bus_dma.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 \
src/sys/external/bsd/drm2/include/drm/intel-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/include/drm/intel-gtt.h
diff -u src/sys/external/bsd/drm2/include/drm/intel-gtt.h:1.1.2.1 src/sys/external/bsd/drm2/include/drm/intel-gtt.h:1.1.2.2
--- src/sys/external/bsd/drm2/include/drm/intel-gtt.h:1.1.2.1 Wed Jul 24 03:49:20 2013
+++ src/sys/external/bsd/drm2/include/drm/intel-gtt.h Sun Sep 8 15:40:17 2013
@@ -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 *
