aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/agp/intel-gtt.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-06-07 09:56:03 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-06-12 16:21:07 -0400
commit8ecd1a6615f0d9de6759aafe229bc1cc4ee99c7b (patch)
tree21ed616513e68e37b7fc2d95d19fad1e1a883add /drivers/char/agp/intel-gtt.c
parent32e3cd6ecd7ae9b79605b5f2eb993186a509c239 (diff)
drm/i915: call intel_enable_gtt
When drm/i915 is in control of the gtt, we need to call the enable function at all the relevant places ourselves. Reviewed-by: Jani Nikula <jani.nikula@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/char/agp/intel-gtt.c')
-rw-r--r--drivers/char/agp/intel-gtt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 4387e69f8b11..419a25eeefd8 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -777,7 +777,7 @@ static void i830_write_entry(dma_addr_t addr, unsigned int entry,
777 writel(addr | pte_flags, intel_private.gtt + entry); 777 writel(addr | pte_flags, intel_private.gtt + entry);
778} 778}
779 779
780static bool intel_enable_gtt(void) 780bool intel_enable_gtt(void)
781{ 781{
782 u8 __iomem *reg; 782 u8 __iomem *reg;
783 783
@@ -823,6 +823,7 @@ static bool intel_enable_gtt(void)
823 823
824 return true; 824 return true;
825} 825}
826EXPORT_SYMBOL(intel_enable_gtt);
826 827
827static int i830_setup(void) 828static int i830_setup(void)
828{ 829{