Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp22122582rwd; Fri, 30 Jun 2023 04:18:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5gdlwIFP/gCHgm4uueJrFJjvAbHhTSp/GZ/h3yGP1gvtzV3NT9TsWJBGTTJ5ncIJ9Z7Elu X-Received: by 2002:a05:6a20:7487:b0:11f:33da:56ec with SMTP id p7-20020a056a20748700b0011f33da56ecmr2123033pzd.27.1688123894435; Fri, 30 Jun 2023 04:18:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688123894; cv=none; d=google.com; s=arc-20160816; b=XJ7D/Soq1SPaksD69m7jzRMIa/HdDZchNdpErlCaTneFjZUtRlotEyVBbfZW2rjzOk 8WCR2AvnefBDYwYnR5d3T3elBcwLtnF6OSlFuiYZU3XzZUhrveAJmw/ZbvUdys/HwQvm mlw4K3xQj3OVm54ZnU+Yrz6CjmWPsnFAqAbVrMKKkbVRQLs67fwk80CAtqoGpLHY/LNO nxmVW7p3ADTXOPLPuc1uokMv0Tr69LfPzGOZEqP36ezKxvqXQMrXnb/6sNzGvx+ePtiI lkuyXY0GkuunTQp55TIGg1UahnX2orL67JxqVGjXy+i/8jm2+1ncja2lgavazXdb0vIA QCsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9VT31crvj/hSyen+1yeJunQKIe6CJXCWJLM4jAJyVsI=; fh=PGsYUYD7yOmxpAWXTpNWNYFtXDlMo8VUEE5PcyOCq8I=; b=Cqf0MN3BjqJzah1Rfn246O4GNF/RtPcDBPc58lWOyunwIvIsiLaEt4TYlBog1jKee0 B608RiVzmeuUJ0UrLlqEAjD1bDskEVNLMuYeaBoMXOTAeeLyU7WopeVzs1f5CMQX5kg/ svw+WUVKAyM6FevucSBgZK0NwpuUXDwtWrEHqXz9LOyOjLv6rwsrK6+GwyckddSAU15N dmkK+QIa1huP/6a2NJAgUPLwP1tZNMFxaDHX0RjgACsC1+PuGfAaGQ3deyokVgTzyf+E hRWW/TjitpUBon9H6IvmdR8Qp3ib63OmU07y8knPqlPzd4EoeW40EsgKsNAMylXvkWQJ VGlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=baipea9B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g11-20020a056a0023cb00b00681fb4b7019si3502248pfc.220.2023.06.30.04.18.02; Fri, 30 Jun 2023 04:18:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=baipea9B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232761AbjF3LEB (ORCPT + 99 others); Fri, 30 Jun 2023 07:04:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232675AbjF3LDX (ORCPT ); Fri, 30 Jun 2023 07:03:23 -0400 Received: from out-10.mta0.migadu.com (out-10.mta0.migadu.com [IPv6:2001:41d0:1004:224b::a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F6F43C0C for ; Fri, 30 Jun 2023 04:03:08 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1688122987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9VT31crvj/hSyen+1yeJunQKIe6CJXCWJLM4jAJyVsI=; b=baipea9BUYs+P0aSm1rKe8ypQy05pAEnnX7yI+xyO3DhMiuV88ZCgKuCedMWIPlu3wl0ii sidhXI/6FlI7dKPOv9whb+Z5DbTB4LHG7HmNOGxpJ8Gb61ZM+dJPIagjFPFg3w4wuSHtRv FVowlwMUWuFeVO9zZjqa4KX7snhvraM= From: Sui Jingfeng To: Alex Deucher , David Airlie , Daniel Vetter , Thomas Zimmermann , Maxime Ripard , Jani Nikula Cc: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-pci@vger.kernel.org, kvm@vger.kernel.org, linux-fbdev@vger.kernel.org, Sui Jingfeng , Christian Konig , Pan Xinhui , Hawking Zhang , Mario Limonciello , Lijo Lazar , YiPeng Chai , Bokun Zhang , Likun Gao Subject: [PATCH v1 3/4] drm/amdgpu: Implement the is_boot_device callback function Date: Fri, 30 Jun 2023 19:02:42 +0800 Message-Id: <20230630110243.141671-4-sui.jingfeng@linux.dev> In-Reply-To: <20230630110243.141671-1-sui.jingfeng@linux.dev> References: <20230630110243.141671-1-sui.jingfeng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sui Jingfeng [why] The vga_is_firmware_default() defined in drivers/pci/vgaarb.c is arch-dependent, it's a dummy on non-x86 architectures currently. This made VGAARB lost an important condition for the arbitration. It could still be wrong even if we remove the #ifdef and #endif guards. because the PCI bar will move (resource re-allocation). [how] The device that owns the firmware framebuffer should be the default boot device. This patch adds an arch-independent function to enforce this rule. The vgaarb subsystem will call back to amdgpu_is_boot_device() function when drm/amdgpu is successfully bound to an AMDGPU device. Cc: Alex Deucher Cc: Christian Konig Cc: Pan Xinhui Cc: David Airlie Cc: Daniel Vetter Cc: Hawking Zhang Cc: Mario Limonciello Cc: Lijo Lazar Cc: YiPeng Chai Cc: Bokun Zhang CC: Likun Gao Signed-off-by: Sui Jingfeng --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index c5bdf6eff29e..2f54250f9d58 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3673,6 +3673,15 @@ static const struct attribute *amdgpu_dev_attributes[] = { NULL }; +static bool amdgpu_is_boot_device(struct pci_dev *pdev) +{ + struct drm_device *dev = pci_get_drvdata(pdev); + struct amdgpu_device *adev = drm_to_adev(dev); + struct amdgpu_gmc *gmc = &adev->gmc; + + return drm_aperture_contain_firmware_fb(gmc->aper_base, gmc->aper_size); +} + /** * amdgpu_device_init - initialize the driver * @@ -4082,7 +4091,8 @@ int amdgpu_device_init(struct amdgpu_device *adev, /* this will fail for cards that aren't VGA class devices, just * ignore it */ if ((adev->pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA) - vga_client_register(adev->pdev, amdgpu_device_vga_set_decode, NULL); + vga_client_register(adev->pdev, amdgpu_device_vga_set_decode, + amdgpu_is_boot_device); px = amdgpu_device_supports_px(ddev); -- 2.25.1