[PATCH 0/2] LP#542251 -- agpgart/i915 load ordering

[Andy Whitcroft]

Seems we lost part of the MODULE_IMPORT tie in between intel_agp and i915.
This linkage prevents i915 trying to initialise before the AGP aperture is
ready, which can cause random boot failures on faster boots.  Upstream has
since fixed this in a more direct way, so revert the remaining bits of
our change and pull in the upstream version.

-apw

Andy Whitcroft (1):
  Revert "UBUNTU: SAUCE: Use MODULE_IMPORT macro to tie intel_agp to
    i915"

Zhenyu Wang (1):
  drm/i915: Add dependency on the intel agp module

 drivers/char/agp/intel-agp.c    |   11 ++++++++---
 drivers/gpu/drm/i915/i915_drv.c |    6 ++++++
 2 files changed, 14 insertions(+), 3 deletions(-)