From b2523e7aa103d7d0451ae460d4ab5c7556eebf8e Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Sat, 18 Feb 2006 04:18:45 +0000
Subject: always enable and set master on pci device

---
 linux-core/drm_stub.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/linux-core/drm_stub.c b/linux-core/drm_stub.c
index cabef261..6ba6f6e1 100644
--- a/linux-core/drm_stub.c
+++ b/linux-core/drm_stub.c
@@ -214,8 +214,11 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
 	if (!drm_fb_loaded) {
 		pci_set_drvdata(pdev, dev);
 		pci_request_regions(pdev, driver->pci_driver.name);
-		pci_enable_device(pdev);
 	}
+
+	pci_enable_device(pdev);
+	pci_set_master(pdev);
+
 	if ((ret = drm_fill_in_dev(dev, pdev, ent, driver))) {
 		printk(KERN_ERR "DRM: fill_in_dev failed\n");
 		goto err_g1;
-- 
cgit v1.2.3