Skip to content

Commit

Permalink
agp/intel-gtt: don't require the agp bridge on setup
Browse files Browse the repository at this point in the history
We only need it to fake the agp interface and don't actually
use it in the driver anywhere. Hence conditionalize that.

This is just a prep patch to eventually disable the fake agp
driver on gen6+.

Reviewed-by: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Daniel Vetter committed Jun 12, 2012
1 parent dd2757f commit 7e8f630
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/char/agp/intel-gtt.c
Original file line number Diff line number Diff line change
Expand Up @@ -1539,9 +1539,11 @@ int intel_gmch_probe(struct pci_dev *pdev,
if (!intel_private.driver)
return 0;

bridge->driver = &intel_fake_agp_driver;
bridge->dev_private_data = &intel_private;
bridge->dev = pdev;
if (bridge) {
bridge->driver = &intel_fake_agp_driver;
bridge->dev_private_data = &intel_private;
bridge->dev = pdev;
}

intel_private.bridge_dev = pci_dev_get(pdev);

Expand Down

0 comments on commit 7e8f630

Please sign in to comment.