aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm
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:47:05 +0900
commite1c701cbf37103defd627e569a3c02fecefdbd7a (patch)
tree243097e45cea0df4b1e55aaf9f771723990db3a3 /drivers/gpu/drm
parent67bc901299695962dff99263008ca25d1d24eb7e (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/gpu/drm')
-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 6eb507a5d13..7d3f0f0cb0e 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;
}