Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp37135741rwd; Tue, 11 Jul 2023 09:53:39 -0700 (PDT) X-Google-Smtp-Source: APBJJlHU00Kgi8Ujy/TT80MvAzppb0UsjpdNibSCkBJc2tlEbrvlDa4FOsLhSTFTKvAprwblLp0f X-Received: by 2002:a05:6a00:98d:b0:675:b734:d302 with SMTP id u13-20020a056a00098d00b00675b734d302mr16018673pfg.1.1689094419409; Tue, 11 Jul 2023 09:53:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689094419; cv=none; d=google.com; s=arc-20160816; b=dluSFJTcTRuCvzz1aYKVC5xhpJQRIEk/AY0jcbmHe+YX3XNl9KbC+f2xb7r+sUOiiM n26b+0puFiKCykMcoXLPcPGOHxVdLvDuz8r4Ce5I+cFNW+a25kibt6CewpZryRanDZO5 WNYLyDkqWSIgZcymmyrXiFD2BkFGxL+trfcmOrUYQDVo9kduW2KN+AFl7aHErYlCCsWo FyYfnyTsaT094W8QRrQf3JRmroxE9MpKWU6kAg/l5cUhtJ3vCgxY3SuDTzFuy9yFKIMd vsVSIjxWETsXpuWYvrKWWOsK8ZCUX1PaFJBUYoWab9fWLfA03jvRl7W4vPamGop34aLl 6ntA== 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=phlB5jeyUkvMxIpxSGgMhgloOsV1JgjnEjP6Y7xHuM8=; fh=CmOGQRazqQDJFYKgAlJroBQqvufcrWXsIbLz1mAIajE=; b=frmIRiYpR7rOEN9LQ18kWDY8Yo3GWhRV6CEVTUJ9Ke8OCnUoL7ylLCRM4BxU/Lw9Vp AlDjav04fRXng9J3qqfdaJqy+swVhlR10EE0l5zDg4dHIlPAXHb9S9G7xpWKv3v4KlUI V9+GyPglBTpcWEBgWu0YX25ZftDg1dItvALpZXJVTv+EAyuIT4UQwnezi3wqpyctIK+Z wiQo7cxo1nQSnTHo18CquXYsLzMAb6dXEZHH3JdiIUfLqcQmY/I4s3SxUfAMqvo4hPDz xss0vxp0jDtO5/9smz54G9EFw8JwvHbSY/t8m9g5fFUkzU+YuB8ZeNeGiIazTs5TkVFh GBPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=tpCdteZ5; 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 k14-20020a056a00134e00b0065ef9f22da9si1812075pfu.19.2023.07.11.09.53.27; Tue, 11 Jul 2023 09:53:39 -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=tpCdteZ5; 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 S233120AbjGKQoU (ORCPT + 99 others); Tue, 11 Jul 2023 12:44:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233298AbjGKQoC (ORCPT ); Tue, 11 Jul 2023 12:44:02 -0400 Received: from out-12.mta1.migadu.com (out-12.mta1.migadu.com [IPv6:2001:41d0:203:375::c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F4CF19BA for ; Tue, 11 Jul 2023 09:43:49 -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=1689093827; 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=phlB5jeyUkvMxIpxSGgMhgloOsV1JgjnEjP6Y7xHuM8=; b=tpCdteZ5Ib+wxbxFaAWwfiWUSKgfPXeqdoI+n2yWg+cepHeniy4juvONgWOcLejop+jeC0 PkigMOBJnABT1FN7Nc1r4q7XtVhHB/bxalYDRi/gFikN7sxsMDRAOv8gq9d4pRUrTFeRwf v6ZBO4PyK6QCCUJsme2hCie3x604P88= From: Sui Jingfeng To: David Airlie Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, kvm@vger.kernel.org, linux-fbdev@vger.kernel.org, Sui Jingfeng , Alex Deucher , Christian Konig , Pan Xinhui , Daniel Vetter Subject: [PATCH v3 6/9] drm/radeon: Add an implement for the is_primary_gpu function callback Date: Wed, 12 Jul 2023 00:43:07 +0800 Message-Id: <20230711164310.791756-7-sui.jingfeng@linux.dev> In-Reply-To: <20230711164310.791756-1-sui.jingfeng@linux.dev> References: <20230711164310.791756-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,RCVD_IN_DNSWL_BLOCKED, 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() function defined in drivers/pci/vgaarb.c is arch-dependent, it's no-op on non-x86 architectures. The arbitration is not usabe on non-x86 platform. [how] The device that owns the firmware framebuffer should be the default boot device. This patch adds an arch-independent function to implement this rule. The vgaarb will call back to radeon_is_primary_gpu() when drm/radeon is bound to a ATI gpu device successfully. Cc: Alex Deucher Cc: Christian Konig Cc: Pan Xinhui Cc: David Airlie Cc: Daniel Vetter Signed-off-by: Sui Jingfeng --- drivers/gpu/drm/radeon/radeon_device.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 71f2ff39d6a1..7db8dc5f79a9 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -1263,6 +1264,15 @@ static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = { .can_switch = radeon_switcheroo_can_switch, }; +static bool radeon_vga_is_primary_gpu(struct pci_dev *pdev) +{ + struct drm_device *dev = pci_get_drvdata(pdev); + struct radeon_device *rdev = dev->dev_private; + struct radeon_mc *gmc = &rdev->mc; + + return drm_aperture_contain_firmware_fb(gmc->aper_base, gmc->aper_size); +} + /** * radeon_device_init - initialize the driver * @@ -1425,7 +1435,7 @@ int radeon_device_init(struct radeon_device *rdev, /* if we have > 1 VGA cards, then disable the radeon VGA resources */ /* this will fail for cards that aren't VGA class devices, just * ignore it */ - vga_client_register(rdev->pdev, radeon_vga_set_decode, NULL); + vga_client_register(rdev->pdev, radeon_vga_set_decode, radeon_vga_is_primary_gpu); if (rdev->flags & RADEON_IS_PX) runtime = true; -- 2.25.1