summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Zumbiehl <florz@florz.de>2012-10-02 12:20:37 +0000
committerDave Airlie <airlied@redhat.com>2012-10-03 10:34:55 +1000
commitdf86b5765a48d5f557489577652bd6df145b0e1b (patch)
tree7742d26b806d340dcc1b078c9bb855563834d4db
parent331c57537589c59ee5e35dd4ddf1d5a0e87972c7 (diff)
downloadlinux-df86b5765a48d5f557489577652bd6df145b0e1b.tar.bz2
drm/savage: re-add busmaster enable, regression fix
466e69b8b03b8c1987367912782bc12988ad8794 dropped busmaster enable from the global drm code and moved it to the individual drivers, but missed the savage driver. So, this re-adds busmaster enable to the savage driver, fixing the regression. Signed-off-by: Florian Zumbiehl <florz@florz.de> Reviewed-by: Alex Deucher <alexdeucher@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/savage/savage_bci.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/savage/savage_bci.c b/drivers/gpu/drm/savage/savage_bci.c
index 1efbb9075837..c89aef420971 100644
--- a/drivers/gpu/drm/savage/savage_bci.c
+++ b/drivers/gpu/drm/savage/savage_bci.c
@@ -547,6 +547,8 @@ int savage_driver_load(struct drm_device *dev, unsigned long chipset)
dev_priv->chipset = (enum savage_family)chipset;
+ pci_set_master(dev->pdev);
+
return 0;
}