Merge tag 'v3.4-rc6' into drm-intel-next

[mirror_ubuntu-artful-kernel.git] / drivers / gpu / drm / radeon / si.c

diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index 27bda986fc2bd8a6ad948d19e819bb1e8ec415df..9727a16c0409b410ebe251512992ea496c5ba310 100644 (file)
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -3216,6 +3216,8 @@ static int si_irq_init(struct radeon_device *rdev)
        /* force the active interrupt state to all disabled */
        si_disable_interrupt_state(rdev);
 
+       pci_set_master(rdev->pdev);
+
        /* enable irqs */
        si_enable_interrupts(rdev);