summaryrefslogtreecommitdiff
path: root/include/drm
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2013-01-18 12:30:34 -0800
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-01-20 13:11:12 +0100
commite5c653777986b40e2986d2c918847fddbcba3a34 (patch)
tree3d1ec01de02c7770bbee08e2daf0b0edf67f35e6 /include/drm
parent8d2e630899165d413ae8a2adc36846ac0b71bada (diff)
downloadlinux-3.10-e5c653777986b40e2986d2c918847fddbcba3a34.tar.gz
linux-3.10-e5c653777986b40e2986d2c918847fddbcba3a34.tar.bz2
linux-3.10-e5c653777986b40e2986d2c918847fddbcba3a34.zip
agp/intel: Add gma_bus_addr
It is no longer used in the i915 code, so isolate it from the shared struct. This was originally part of: commit 0e275518f325418d559c05327775bff894b237f7 Author: Ben Widawsky <ben@bwidawsk.net> Date: Mon Jan 14 13:35:33 2013 -0800 agp/intel: decouple more of the agp-i915 sharing Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> Signed-off-by: Ben Widawsky <ben@bwidawsk.net> That commit had some other hunks which can't be used due to issues Daniel found in previous commits. Signed-off-by: Ben Widawsky <ben@bwidawsk.net> [danvet: drop squash notice from the commit since it's imo ok to keep this one separate.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/intel-gtt.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h
index 984105cddc5..769b6c79097 100644
--- a/include/drm/intel-gtt.h
+++ b/include/drm/intel-gtt.h
@@ -11,8 +11,6 @@ struct intel_gtt {
/* 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;
- /* needed for ioremap in drm/i915 */
- phys_addr_t gma_bus_addr;
} *intel_gtt_get(void);
int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev,