]> git.hungrycats.org Git - linux/commitdiff
drm/savage: re-add busmaster enable, regression fix
authorFlorian Zumbiehl <florz@florz.de>
Tue, 2 Oct 2012 12:20:37 +0000 (12:20 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 12 Oct 2012 20:38:46 +0000 (05:38 +0900)
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>
drivers/gpu/drm/savage/savage_bci.c

index cb1ee4e0050ade2a0da63d4b8cdac714f10c1aff..2a258887e419276a540a6f35996c998e863e40b2 100644 (file)
@@ -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;
 }