summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorFlorian Zumbiehl <florz@florz.de>2012-10-02 12:20:37 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-13 05:50:22 +0900
commitd70fd1a97eddef329ae3c63e72d38529862bded2 (patch)
treeb9ad4a768ef2a0013c034d38435210924f4fb0c9 /drivers
parent13d536a0bb25c10e183bc022a1b88dc097aad15d (diff)
drm/savage: re-add busmaster enable, regression fix
commit df86b5765a48d5f557489577652bd6df145b0e1b upstream. 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> Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-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;
}