diff options
author | Dave Airlie <airlied@gmail.com> | 2011-01-11 20:38:37 -0500 |
---|---|---|
committer | Dave Airlie <airlied@gmail.com> | 2011-01-11 20:38:37 -0500 |
commit | a46f3108b1cd8bf11d46ac8a5f30df6f6dbdf738 (patch) | |
tree | 49d7731e7c1250f28a44aa8d3e62c43292e4bef3 /drivers/char/agp/intel-gtt.c | |
parent | 784fe39fa80d557847baeca2695915d17b09827f (diff) |
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>
Diffstat (limited to 'drivers/char/agp/intel-gtt.c')
-rw-r--r-- | drivers/char/agp/intel-gtt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index da8161806f39..b7c0c7ee67c8 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) | |||
688 | 688 | ||
689 | intel_private.base.stolen_size = intel_gtt_stolen_size(); | 689 | intel_private.base.stolen_size = intel_gtt_stolen_size(); |
690 | 690 | ||
691 | intel_private.base.needs_dmar = USE_PCI_DMA_API && INTEL_GTT_GEN > 2; | ||
692 | |||
691 | ret = intel_gtt_setup_scratch_page(); | 693 | ret = intel_gtt_setup_scratch_page(); |
692 | if (ret != 0) { | 694 | if (ret != 0) { |
693 | intel_gtt_cleanup(); | 695 | intel_gtt_cleanup(); |
694 | return ret; | 696 | return ret; |
695 | } | 697 | } |
696 | 698 | ||
697 | intel_private.base.needs_dmar = USE_PCI_DMA_API && INTEL_GTT_GEN > 2; | ||
698 | |||
699 | return 0; | 699 | return 0; |
700 | } | 700 | } |
701 | 701 | ||