From 9af8cd1a1c046ec09cc7118ee5a3bfc6e74d99de Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Wed, 12 Jul 2023 15:08:10 +0200 Subject: [PATCH] drm/ast: Do not enable PCI resources multiple times Remove ast_init_pci_config() as the ast driver already enables the PCI resources by calling pcim_enable_device(). Suggested-by: Sui Jingfeng Signed-off-by: Thomas Zimmermann Reviewed-by: Jocelyn Falempe Tested-by: Sui Jingfeng Link: https://patchwork.freedesktop.org/patch/msgid/20230712130826.3318-1-tzimmermann@suse.de --- drivers/gpu/drm/ast/ast_main.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c index 8bfbdfd86d77d..dae365ed39696 100644 --- a/drivers/gpu/drm/ast/ast_main.c +++ b/drivers/gpu/drm/ast/ast_main.c @@ -35,23 +35,6 @@ #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; -- 2.30.2