From mboxrd@z Thu Jan 1 00:00:00 1970 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 55C27C61DA4 for ; Sat, 11 Feb 2023 06:35:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0760310E0E6; Sat, 11 Feb 2023 06:35:07 +0000 (UTC) Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2D6E910EC5D for ; Fri, 10 Feb 2023 23:55:02 +0000 (UTC) Received: by mail-pg1-x536.google.com with SMTP id r18so4831360pgr.12 for ; Fri, 10 Feb 2023 15:55:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=sac/fX0wt9v0DHBtkfOe72qxgSq2ZxL7sJ1RWk0mQzQ=; b=Oh6mXmII+Z7iHd6314WW1IkZYatL53ousxgQOW7+m/EyoqbBUNzdiADjeTgbLBh4MM r6WJWYin1EetsFpHoW2v/rrFOwVTFqYi97k7uzhc4gSRvCjsxPbOKxKPpNQkuplwxMYj iJwCrNrYgb7Q4kVc9EykNh6RO4shGUuPYn7oB59kkng+UMxT94IJ2E+7NoB6UI0oVts0 FCPkDXToksMdz/CKXYy7M2Daa6U4j7HT90WhTUHMbghRVOdfyqFpkjfMKOor2poztRAF qszAjfqrMzBPVc4sCRbSolXncQ4LD4B3G2ruzxF0kEglUfAL/afRdWpGGqLPYj16bMnc NvDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sac/fX0wt9v0DHBtkfOe72qxgSq2ZxL7sJ1RWk0mQzQ=; b=XPfJD8ex1/iw6EFO1xoCR6IxHvLj7EoT8Eh/AmX/OjwBVhEpYS2OULFwkuTJ9HAJAw SCKCeWqZ6uUTIKIzbkLl0yVq45lncZNwcedlJTyOy/NnQvk12qGj6CCevewL1nYkQCgU Xs+R7cz/Twbmk6CLpUEFIpt9hAfd6QFyZW667l6JVwrBxhVZvsRIQIrNpOr/5AzCO9Zi soomLlyDSpedr6N+tbLxNHQx3YQbEr6Spt//GePwd3lTy+7Al6rOBqtFYvBv5fWUJ3Pr AnxtkV2s2pprZRgMyHrnpQNJKv35FbJWA9F/RYD8gLaM83U054dxFOtXmRfG5xFHfMYY 7F4A== X-Gm-Message-State: AO0yUKX+LzxZf3iv+SyYWtGXVXm15zcfGU642utIlbtc0WarUHNwwM4C gwEOV51Y86rjMgWX6aa6tsQ= X-Google-Smtp-Source: AK7set9nPEtV76VsB+ysNcWvcdA/XjTiAQwDc+XnZPZ2oGeO6JBsSezTX4grz36H63ofrjyYlHusKg== X-Received: by 2002:a62:1b8a:0:b0:592:fc9f:8ae5 with SMTP id b132-20020a621b8a000000b00592fc9f8ae5mr14453938pfb.23.1676073301644; Fri, 10 Feb 2023 15:55:01 -0800 (PST) Received: from redecorated-mbp ([202.53.32.211]) by smtp.gmail.com with ESMTPSA id g8-20020aa78188000000b0056be1581126sm3888031pfi.143.2023.02.10.15.54.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Feb 2023 15:55:01 -0800 (PST) Date: Sat, 11 Feb 2023 10:54:47 +1100 From: Orlando Chamberlain To: Alex Deucher Subject: Re: [RFC PATCH 9/9] drm/amdgpu: register a vga_switcheroo client for all GPUs that are not thunderbolt attached Message-ID: <20230211105447.0d8dda6b@redecorated-mbp> In-Reply-To: References: <20230210044826.9834-1-orlandoch.dev@gmail.com> <20230210044826.9834-10-orlandoch.dev@gmail.com> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.35; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Mailman-Approved-At: Sat, 11 Feb 2023 06:35:05 +0000 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, Somalapuram Amaranath , Rander Wang , Lijo Lazar , Ranjani Sridharan , YiPeng Chai , Mario Limonciello , David Airlie , Evan Quan , Takashi Iwai , Pierre-Louis Bossart , amd-gfx@lists.freedesktop.org, Yong Zhi , Aun-Ali Zaidi , Bokun Zhang , Mark Gross , Hans de Goede , Jaroslav Kysela , Kerem Karabay , platform-driver-x86@vger.kernel.org, Jack Xiao , Kai Vehmanen , "Pan, Xinhui" , linux-kernel@vger.kernel.org, Aditya Garg , Daniel Vetter , Amadeusz =?UTF-8?B?U8WCYXdpxYRza2k=?= , Alex Deucher , Christian =?UTF-8?B?S8O2bmln?= , Hawking Zhang Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" On Fri, 10 Feb 2023 11:37:08 -0500 Alex Deucher wrote: > On Fri, Feb 10, 2023 at 11:07 AM Hans de Goede > wrote: > > > > Hi, > > > > On 2/10/23 16:53, Alex Deucher wrote: > > > On Fri, Feb 10, 2023 at 3:04 AM Orlando Chamberlain > > > wrote: > > >> > > >> From: Kerem Karabay > > >> > > >> Commit 3840c5bcc245 ("drm/amdgpu: disentangle runtime pm and > > >> vga_switcheroo") made amdgpu only register a vga_switcheroo > > >> client for GPU's with PX, however AMD GPUs in dual gpu Apple > > >> Macbooks do need to register, but don't have PX. Instead of > > >> AMD's PX, they use apple-gmux. > > > > > > Is there a way to detect apple-gmux instead? Otherwise, we > > > register vga_switcheroo on any system with multiple GPUs which is > > > not what we want. > > > > Yes since 6.1.y (either stable series or just take 6.2.0) the > > apple-gmux detect code has been factored out into a stand-alone > > apple_gmux_detect() helper inside: > > > > include/linux/apple-gmux.h > > > > For usage outside of the actual apple-gmux driver you can simply > > pass NULL for both arguments. > > > > This was necessary to reliably check if the apple-gmux should be > > used for backlight control. > > > > Note there also is the older apple_gmux_present() helper, which is > > already used in some drm code. That function is not reliable though > > it detects if the ACPI tables contain an ACPI device describing > > the presence of a gmux, but it turns out even Apple has buggy ACPI > > tables and the mere presence of that ACPI device is not a reliable > > indicator the gmux is actually there. > > > > I have not changed over any of the existing apple_gmux_present() > > users for fear of unwanted side effects... > > Looks like we could maybe use the PWRD ACPI check like patch 8 does > as well. I wasn't using apple_gmux_detect as I mistakenly thought pnp_get_resource would fail if apple-gmux had bound to the resource but it looks like I was wrong about that so we can use that to determine if the system has a gmux. I think I'll do that in v2. As far as I know there's only one internal (non thunderbolt) amd gpu inside all Macbooks with gmux so we probably wouldn't need to check for PWRD to ensure it's the right gpu. With PWRD, I don't know if its present on all Dual GPU Macbooks, I've only found the acpi tables for Macbookpro14,x to Macbookpro16,x, so I don't know if it will work on older Macs (I'm also not sure if those macs are using radeon or amdgpu). > Alex > > > > > Regards, > > > > Hans > > > > > > > > > > >> Revert to the old logic of registering for all non-thunderbolt > > >> gpus, like radeon and nouveau. > > >> > > >> Fixes: 3840c5bcc245 ("drm/amdgpu: disentangle runtime pm and > > >> vga_switcheroo") Signed-off-by: Kerem Karabay > > >> [Orlando Chamberlain : add commit > > >> description] Signed-off-by: Orlando Chamberlain > > >> --- > > >> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 18 > > >> +++++++++++------- 1 file changed, 11 insertions(+), 7 > > >> deletions(-) > > >> > > >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > > >> b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index > > >> 2f28a8c02f64..0bb553a61552 100644 --- > > >> a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ > > >> b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3919,12 > > >> +3919,13 @@ int amdgpu_device_init(struct amdgpu_device *adev, > > >> if ((adev->pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA) > > >> vga_client_register(adev->pdev, amdgpu_device_vga_set_decode); > > >> > > >> - if (amdgpu_device_supports_px(ddev)) { > > >> - px = true; > > >> - vga_switcheroo_register_client(adev->pdev, > > >> - > > >> &amdgpu_switcheroo_ops, px); > > >> + px = amdgpu_device_supports_px(ddev); > > >> + > > >> + if (!pci_is_thunderbolt_attached(adev->pdev)) > > >> + vga_switcheroo_register_client(adev->pdev, > > >> &amdgpu_switcheroo_ops, px); + > > >> + if (px) > > >> vga_switcheroo_init_domain_pm_ops(adev->dev, > > >> &adev->vga_pm_domain); > > >> - } > > >> > > >> if (adev->gmc.xgmi.pending_reset) > > >> queue_delayed_work(system_wq, > > >> &mgpu_info.delayed_reset_work, @@ -4048,10 +4049,13 @@ void > > >> amdgpu_device_fini_sw(struct amdgpu_device *adev) > > >> > > >> kfree(adev->bios); > > >> adev->bios = NULL; > > >> - if (amdgpu_device_supports_px(adev_to_drm(adev))) { > > >> + > > >> + if (!pci_is_thunderbolt_attached(adev->pdev)) > > >> vga_switcheroo_unregister_client(adev->pdev); > > >> + > > >> + if (amdgpu_device_supports_px(adev_to_drm(adev))) > > >> vga_switcheroo_fini_domain_pm_ops(adev->dev); > > >> - } > > >> + > > >> if ((adev->pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA) > > >> vga_client_unregister(adev->pdev); > > >> > > >> -- > > >> 2.39.1 > > >> > > > > >