summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@gmail.com>2011-01-12 11:38:37 +1000
committerDave Airlie <airlied@gmail.com>2011-01-12 11:38:37 +1000
commita46f3108b1cd8bf11d46ac8a5f30df6f6dbdf738 (patch)
tree49d7731e7c1250f28a44aa8d3e62c43292e4bef3
parent784fe39fa80d557847baeca2695915d17b09827f (diff)
downloadop-kernel-dev-a46f3108b1cd8bf11d46ac8a5f30df6f6dbdf738.zip
op-kernel-dev-a46f3108b1cd8bf11d46ac8a5f30df6f6dbdf738.tar.gz
i915/gtt: fix ordering issues with status setup and DMAR
This code was setting up the status page before setting the DMAR-is-on-bit, so we were getting DMAR errors on the status page. Reverse the two bits of init code to the correct result. Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/char/agp/intel-gtt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index da81618..b7c0c7e 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -688,14 +688,14 @@ static int intel_gtt_init(void)
intel_private.base.stolen_size = intel_gtt_stolen_size();
+ intel_private.base.needs_dmar = USE_PCI_DMA_API && INTEL_GTT_GEN > 2;
+
ret = intel_gtt_setup_scratch_page();
if (ret != 0) {
intel_gtt_cleanup();
return ret;
}
- intel_private.base.needs_dmar = USE_PCI_DMA_API && INTEL_GTT_GEN > 2;
-
return 0;
}
OpenPOWER on IntegriCloud