From patchwork Sun Jul 2 18:27:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sui Jingfeng X-Patchwork-Id: 115123 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp94785vqx; Sun, 2 Jul 2023 11:42:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlFHDUvG0yILMziMYmEa2OPw3f6FoerMOmtj2JyPCufz3bYoiKTAVSMnj4Ru/2O5ZlKKLdr9 X-Received: by 2002:a17:902:ea0a:b0:1b8:35fa:cdcc with SMTP id s10-20020a170902ea0a00b001b835facdccmr9051411plg.5.1688323368278; Sun, 02 Jul 2023 11:42:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688323368; cv=none; d=google.com; s=arc-20160816; b=Z2Idd3MD5+NvhmiW1xrmlLpJgi6CxhGwJA6QkkARX0rPmbuXAvIJqe6cd+Q4y8zXML 10ItxW2ArOhKnyUAvzZAFUL7+qCnsGed5esrwMGNNVjVCmBihRRR2jwBzmiUP4caVBn0 FHyPCky5bz+chhWlYGReyMmfBgZ7s8PVZqXlxNDgwwpmcjAv1jUsHJvMUt519lLXCjAT IhWnkv78rQB3st6xULSF858U2KhkVx/pVI5oKwseI8halG2sS+JQjxZGRD2gL+TqklPD qcYL6mXfpCpvRHrmyoZvh3QVAGNzF4CtkZtHav7KkMZCWWwP4EPx16wiWQZFHxaJWgcK 3Lsw== 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=pwzn53irfYHvCr3BVbesI6QGcQegkiDywyVRF562ETY=; b=GI0QWfDycNAHx/U5LzrTfLNNRqR0Mv68NoMYJU1dI7ml1tmxdsjzb2xoxaDJlAAi8a 2eDADTIC6v8mg4afib3egQZVXNl8lw13PSPH3Wytpis/nUwzgjXOFRpTldD1OMVuI6Ow 3KUP4r0jJUchvVj/KLVJXcVh8GpqBFLL3VQHE0M7yTX4J6yOKW/btqAPEwqaSn0FjPRC iEP5lY/MIr7Nueg9NtA1abdeGzFMw3Bs9d9dOBIw1HPB8NV6Lx+bAllAa0qe9L6yZh/R Svsmh9/WqJnufHAA9OthQ9hzmo8zTucJgIdYOfFlKU5TPsYpUlTJ+OXp0UXktLJerEDS 0IYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=VWF57D2R; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a9-20020a170902b58900b001b6680bc871si16008999pls.445.2023.07.02.11.42.28; Sun, 02 Jul 2023 11:42:48 -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=VWF57D2R; 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 S230002AbjGBS2g (ORCPT + 99 others); Sun, 2 Jul 2023 14:28:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230016AbjGBS2b (ORCPT ); Sun, 2 Jul 2023 14:28:31 -0400 Received: from out-43.mta0.migadu.com (out-43.mta0.migadu.com [IPv6:2001:41d0:1004:224b::2b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F559D7 for ; Sun, 2 Jul 2023 11:28:25 -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=1688322503; 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=VWF57D2RseclrzcKi119DMJUFZtaHElS7q8jbbh1XWQr8bBCK8JJYFDv5kCFqfSUbl8Zxj OfeNWV8lWl7Z/3X4/oZsFJHS6v2PhXoEiYBdlpE02JaUy3Qqzzt1+3bGGp3Lm9+gp8wrVW 1d/YvTbmfmhNSt2c7WBL8ZsgF8ys6Yg= From: Sui Jingfeng To: Alex Deucher , David Airlie , Daniel Vetter , Thomas Zimmermann , Maxime Ripard , Jani Nikula , Lyude Paul , Bjorn Helgaas , Mario Limonciello 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 , Lijo Lazar , YiPeng Chai , Bokun Zhang , Likun Gao Subject: [PATCH v2 3/6] drm/amdgpu: Implement the is_boot_device callback function Date: Mon, 3 Jul 2023 02:27:41 +0800 Message-Id: <20230702182744.755467-4-sui.jingfeng@linux.dev> In-Reply-To: <20230702182744.755467-1-sui.jingfeng@linux.dev> References: <20230702182744.755467-1-sui.jingfeng@linux.dev> MIME-Version: 1.0 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 autolearn=unavailable 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770335364244234466?= X-GMAIL-MSGID: =?utf-8?q?1770335364244234466?= 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);