diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-06-08 09:55:40 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-06-12 16:19:49 -0400 |
commit | 14be93ddff61eb196382aeaa3ac86f4db844aeb0 (patch) | |
tree | 0cfde7c3f444899508e2d07adb4245d4eb33216b /include/drm | |
parent | 7e8f6306fe155d6fc3fe99d666be95b4ed24427d (diff) |
drm/i915 + agp/intel-gtt: prep work for direct setup
To be able to directly set up the intel-gtt code from drm/i915 and
avoid setting up the fake-agp driver we need to prepare a few things:
- pass both the bridge and gpu pci_dev to the probe function and add
code to handle the gpu pdev both being present (for drm/i915) and
not present (fake agp).
- add refcounting to the remove function so that unloading drm/i915
doesn't kill the fake agp driver
v2: Fix up the cleanup and refcount, noticed by Jani Nikula.
Reviewed-by: Jani Nikula <jani.nikula@linux.intel.com>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/intel-gtt.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h index 8048c005c6f..84ebd7188fc 100644 --- a/include/drm/intel-gtt.h +++ b/include/drm/intel-gtt.h | |||
@@ -23,6 +23,10 @@ const struct intel_gtt { | |||
23 | phys_addr_t gma_bus_addr; | 23 | phys_addr_t gma_bus_addr; |
24 | } *intel_gtt_get(void); | 24 | } *intel_gtt_get(void); |
25 | 25 | ||
26 | int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev, | ||
27 | struct agp_bridge_data *bridge); | ||
28 | void intel_gmch_remove(void); | ||
29 | |||
26 | void intel_gtt_chipset_flush(void); | 30 | void intel_gtt_chipset_flush(void); |
27 | void intel_gtt_unmap_memory(struct scatterlist *sg_list, int num_sg); | 31 | void intel_gtt_unmap_memory(struct scatterlist *sg_list, int num_sg); |
28 | void intel_gtt_clear_range(unsigned int first_entry, unsigned int num_entries); | 32 | void intel_gtt_clear_range(unsigned int first_entry, unsigned int num_entries); |