Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 788D9EB64D9 for ; Wed, 12 Jul 2023 13:08:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CD76810E528; Wed, 12 Jul 2023 13:08:31 +0000 (UTC) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by gabe.freedesktop.org (Postfix) with ESMTPS id 185F610E528 for ; Wed, 12 Jul 2023 13:08:30 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 043DF1FE06; Wed, 12 Jul 2023 13:08:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1689167308; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=kd/yX6A/JhsIqAGgoOQEqinl2Z4v5T4RKSf9MTqPStw=; b=p8vn7w/FAJXEaO5W4XYLTDUOqtBlASjcd+LF0VJ08XVF8DJEKP6QLxB5MJ1OQoHFomuHsp gBXlg0nHM1B5iwSXbt0J9AbOaVwOejkQ88AtGFKNzDgFlGLKQj+g0RenczFAl/tqmoJmUH FjHKC50sFsdVCHF52E/ShfSVuUJL8pM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1689167308; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=kd/yX6A/JhsIqAGgoOQEqinl2Z4v5T4RKSf9MTqPStw=; b=wrlZGr2a4yMtifL+SoB+Kgo6nh8QR0aHMyNPipAIdbO6cXcHhr73TmSTsH5jZxtrZuOCH2 410bBwYL9Ac4f0DQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id D2A6513336; Wed, 12 Jul 2023 13:08:27 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id FJ2UMsulrmRhYwAAMHmgww (envelope-from ); Wed, 12 Jul 2023 13:08:27 +0000 From: Thomas Zimmermann To: jfalempe@redhat.com, suijingfeng@loongson.cn, airlied@gmail.com, airlied@redhat.com, daniel@ffwll.ch Subject: [PATCH] drm/ast: Do not enable PCI resources multiple times Date: Wed, 12 Jul 2023 15:08:10 +0200 Message-ID: <20230712130826.3318-1-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Zimmermann , dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 --- 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 8bfbdfd86d77..dae365ed3969 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.41.0