aboutsummaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/drm_crtc.h1
-rw-r--r--include/drm/intel-gtt.h19
2 files changed, 2 insertions, 18 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 66b2732f175a..e90c8dcc028d 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -1063,6 +1063,7 @@ extern u8 *drm_find_cea_extension(struct edid *edid);
1063extern u8 drm_match_cea_mode(struct drm_display_mode *to_match); 1063extern u8 drm_match_cea_mode(struct drm_display_mode *to_match);
1064extern bool drm_detect_hdmi_monitor(struct edid *edid); 1064extern bool drm_detect_hdmi_monitor(struct edid *edid);
1065extern bool drm_detect_monitor_audio(struct edid *edid); 1065extern bool drm_detect_monitor_audio(struct edid *edid);
1066extern bool drm_rgb_quant_range_selectable(struct edid *edid);
1066extern int drm_mode_page_flip_ioctl(struct drm_device *dev, 1067extern int drm_mode_page_flip_ioctl(struct drm_device *dev,
1067 void *data, struct drm_file *file_priv); 1068 void *data, struct drm_file *file_priv);
1068extern struct drm_display_mode *drm_cvt_mode(struct drm_device *dev, 1069extern struct drm_display_mode *drm_cvt_mode(struct drm_device *dev,
diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h
index 3e3a166a2690..cf105557fea9 100644
--- a/include/drm/intel-gtt.h
+++ b/include/drm/intel-gtt.h
@@ -3,24 +3,7 @@
3#ifndef _DRM_INTEL_GTT_H 3#ifndef _DRM_INTEL_GTT_H
4#define _DRM_INTEL_GTT_H 4#define _DRM_INTEL_GTT_H
5 5
6struct intel_gtt { 6void intel_gtt_get(size_t *gtt_total, size_t *stolen_size);
7 /* Size of memory reserved for graphics by the BIOS */
8 unsigned int stolen_size;
9 /* Total number of gtt entries. */
10 unsigned int gtt_total_entries;
11 /* Part of the gtt that is mappable by the cpu, for those chips where
12 * this is not the full gtt. */
13 unsigned int gtt_mappable_entries;
14 /* Whether i915 needs to use the dmar apis or not. */
15 unsigned int needs_dmar : 1;
16 /* Whether we idle the gpu before mapping/unmapping */
17 unsigned int do_idle_maps : 1;
18 /* Share the scratch page dma with ppgtts. */
19 dma_addr_t scratch_page_dma;
20 struct page *scratch_page;
21 /* needed for ioremap in drm/i915 */
22 phys_addr_t gma_bus_addr;
23} *intel_gtt_get(void);
24 7
25int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev, 8int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev,
26 struct agp_bridge_data *bridge); 9 struct agp_bridge_data *bridge);