Skip to content

Commit

Permalink
i915/gtt: fix ordering issues with status setup and DMAR
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dave Airlie committed Jan 12, 2011
1 parent 784fe39 commit a46f310
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/char/agp/intel-gtt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit a46f310

Please sign in to comment.