--- a/drivers/gpu/vga/vgaarb.c
+++ b/drivers/gpu/vga/vgaarb.c
@@ -649,9 +649,17 @@ static inline void vga_update_device_decodes(struct vga_dev
        old_decodes = vgadev->decodes;
        decodes_removed = ~new_decodes & old_decodes;
        decodes_unlocked = vgadev->locks & decodes_removed;
-       vgadev->owns &= ~decodes_removed;
        vgadev->decodes = new_decodes;

+       if (vgadev->owns & (VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM) &&
+           !((vgadev->owns & ~decodes_removed) &
+             (VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM)) &&
+           vgadev->bridge_has_one_vga)
+               pci_set_vga_state(vgadev->pdev, false, 0,
+                                 PCI_VGA_STATE_CHANGE_BRIDGE);
+
+       vgadev->owns &= ~decodes_removed;
+
        pr_info("vgaarb: device changed decodes: PCI:%s,olddecodes=%s,decodes=%s
                pci_name(vgadev->pdev),
                vga_iostate_to_str(old_decodes),