Merge tag 'v3.9-rc3' into v4l_for_linus

[platform/adaptation/renesas_rcar/renesas_kernel.git] / include / drm / intel-gtt.h

diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h
index 6eb76a1..b08bdad 100644 (file)
--- a/include/drm/intel-gtt.h
+++ b/include/drm/intel-gtt.h
@@ -3,26 +3,8 @@
 #ifndef _DRM_INTEL_GTT_H
 #define        _DRM_INTEL_GTT_H
 
-struct intel_gtt {
-       /* Size of memory reserved for graphics by the BIOS */
-       unsigned int stolen_size;
-       /* Total number of gtt entries. */
-       unsigned int gtt_total_entries;
-       /* Part of the gtt that is mappable by the cpu, for those chips where
-        * this is not the full gtt. */
-       unsigned int gtt_mappable_entries;
-       /* Whether i915 needs to use the dmar apis or not. */
-       unsigned int needs_dmar : 1;
-       /* Whether we idle the gpu before mapping/unmapping */
-       unsigned int do_idle_maps : 1;
-       /* Share the scratch page dma with ppgtts. */
-       dma_addr_t scratch_page_dma;
-       struct page *scratch_page;
-       /* for ppgtt PDE access */
-       u32 __iomem *gtt;
-       /* needed for ioremap in drm/i915 */
-       phys_addr_t gma_bus_addr;
-} *intel_gtt_get(void);
+void intel_gtt_get(size_t *gtt_total, size_t *stolen_size,
+                  phys_addr_t *mappable_base, unsigned long *mappable_end);
 
 int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev,
                     struct agp_bridge_data *bridge);