Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp37135183rwd; Tue, 11 Jul 2023 09:53:13 -0700 (PDT) X-Google-Smtp-Source: APBJJlF8/nkLv3CXk6DT5GMOt5lZ5kyQ74rP8dErWeqJhaMr0rqLJioIIHIEkVY/lueOxlqr8ktv X-Received: by 2002:aa7:88c1:0:b0:682:f529:6d69 with SMTP id k1-20020aa788c1000000b00682f5296d69mr8432266pff.7.1689094393383; Tue, 11 Jul 2023 09:53:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689094393; cv=none; d=google.com; s=arc-20160816; b=XY7BlMpivAzcESjaFg6ZQIVN2Ro6vCUAZegLz2cu1wevaRj7o0RuuBjvhbgjkiq4bh slONYmaSBP8nmp+P7MWDLOQrYPsJwjJV1B02jUORbTlGayz78BI4pUEGrNEFGPgxeCfY hojiJvvKUzlcc3aMneCZlK+pK4aBcjTlQ+mfSIWMxgp4Yaj+WAlsQyrb2z8JmS0AIZtR 68Du8tFHuGZuhwHGntzfz7Bddy3s+5Bwj49RyaaGJ2vntsNV56dIDJIHHpewUIlEFpnL 5J48c3/1wZTCbjH/7uHHiXOm+f4YcHMq/cOwlo2P5tQ47jgRl+Rp5wLwa2M+2xnEkn3b 6r3A== 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=NIlpd2OuXAqZBmAKqEiHOVF8G3KI4fwGrKLh4KCVTtk=; fh=5yEdu4nw6Evxvz9oNMr+p3DQRTCkCxlKcpV877HXq9c=; b=Cf63jUaxTpX2IfIhyp7Y5IV9DI2YvygVwus/X9r+uuUFU0hvOeIpJLlOhsi19QMi1B ACgsGHTfUrtH8HzdF+PcsM4vab8t6Tn2Y1+ALpMGT+W+kJ6+Si3lcpnhhxhxjqV5ipsd IvCsQ5M92sV0rjpUjZEBzAq8LijZYkVbWRGf13bNc9ustqMyibxYedBt5YmBE4rFKw2x cZtLL1/BHNGfLF18VaYsOOyXP6hfHN0FmB/GCfJNQnzxTo4ZOhmd2wfR8opiz6aN2LWI ke0nowspkDeIHYC/9PRMmahuYoyoBPvXcrXdegOsBK8lrYW2iL+72jjrFaeNPbLu5GtH jVBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=ecINMnuv; 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 85-20020a621958000000b006826c5b86dasi1703033pfz.364.2023.07.11.09.52.52; Tue, 11 Jul 2023 09:53:13 -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=ecINMnuv; 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 S233223AbjGKQoI (ORCPT + 99 others); Tue, 11 Jul 2023 12:44:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233041AbjGKQny (ORCPT ); Tue, 11 Jul 2023 12:43:54 -0400 Received: from out-33.mta1.migadu.com (out-33.mta1.migadu.com [IPv6:2001:41d0:203:375::21]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B82B31981 for ; Tue, 11 Jul 2023 09:43:46 -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=1689093824; 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=NIlpd2OuXAqZBmAKqEiHOVF8G3KI4fwGrKLh4KCVTtk=; b=ecINMnuvOGXb9BbruD5LvN4Yp3H0QtakNbtBqZGtbF+uuD1Ia0wIToBo3dNnNdqp2wca3L /dYsRshA52X9SZ13jGxCqAkY/HzcvDJ4zQmkUC31Et0p3dmpUkcI+j+ErMq5ZjHq/6QDJz 5m4MiOwv+urTFm8EUQit+44ndOvrrvU= 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 , Mario Limonciello Subject: [PATCH v3 5/9] drm/amdgpu: Implement the is_primary_gpu callback of vga_client_register() Date: Wed, 12 Jul 2023 00:43:06 +0800 Message-Id: <20230711164310.791756-6-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 a dummy on non-x86 architectures. This made VGAARB lost an important condition for the arbitration on non-x86 platform. The rules about which GPU is (or should be) the primary display device get used by userspace are obscure on non-x86 platform, let's made the things clear. [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 subsystem will call back to amdgpu_is_primary_gpu() when drm/amdgpu is bound to an AMDGPU device successfully. Cc: Alex Deucher Cc: Christian Konig Cc: Mario Limonciello 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 d98f0801ac77..b638eff58636 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3690,6 +3690,15 @@ static void amdgpu_device_set_mcbp(struct amdgpu_device *adev) DRM_INFO("MCBP is enabled\n"); } +static bool amdgpu_is_primary_gpu(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 * @@ -4103,7 +4112,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_primary_gpu); px = amdgpu_device_supports_px(ddev); -- 2.25.1