drm/ast: Do not enable PCI resources multiple times
authorThomas Zimmermann <tzimmermann@suse.de>
Wed, 12 Jul 2023 13:08:10 +0000 (15:08 +0200)
committerThomas Zimmermann <tzimmermann@suse.de>
Tue, 25 Jul 2023 18:51:41 +0000 (20:51 +0200)
Remove ast_init_pci_config() as the ast driver already enables the PCI
resources by calling pcim_enable_device().

Suggested-by: Sui Jingfeng <suijingfeng@loongson.cn>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Tested-by: Sui Jingfeng <suijingfeng@loongson.cn>
Link: https://patchwork.freedesktop.org/patch/msgid/20230712130826.3318-1-tzimmermann@suse.de
drivers/gpu/drm/ast/ast_main.c

index 8bfbdfd..dae365e 100644 (file)
 
 #include "ast_drv.h"
 
-static int ast_init_pci_config(struct pci_dev *pdev)
-{
-       int err;
-       u16 pcis04;
-
-       err = pci_read_config_word(pdev, PCI_COMMAND, &pcis04);
-       if (err)
-               goto out;
-
-       pcis04 |= PCI_COMMAND_MEMORY | PCI_COMMAND_IO;
-
-       err = pci_write_config_word(pdev, PCI_COMMAND, pcis04);
-
-out:
-       return pcibios_err_to_errno(err);
-}
-
 static bool ast_is_vga_enabled(struct drm_device *dev)
 {
        struct ast_device *ast = to_ast_device(dev);
@@ -483,10 +466,6 @@ struct ast_device *ast_device_create(const struct drm_driver *drv,
                        return ERR_PTR(-EIO);
        }
 
-       ret = ast_init_pci_config(pdev);
-       if (ret)
-               return ERR_PTR(ret);
-
        if (!ast_is_vga_enabled(dev)) {
                drm_info(dev, "VGA not enabled on entry, requesting chip POST\n");
                need_post = true;