From: Hans de Goede <hdegoede@redhat.com>
To: "Luke D. Jones" <luke@ljones.dev>
Cc: corentin.chary@gmail.com, markgross@kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] platform/x86: asus-wmi: corrections to egpu safety check
Date: Mon, 28 Aug 2023 11:58:51 +0200 [thread overview]
Message-ID: <32942803-b0b9-ddcd-90f7-1fc37062a18f@redhat.com> (raw)
In-Reply-To: <20230827231525.78693-1-luke@ljones.dev>
Hi Luke,
On 8/28/23 01:15, Luke D. Jones wrote:
> An incorrect if statement was preventing the enablement of the egpu.
>
> Fixes: 1bddf53ccac0 ("platform/x86: asus-wmi: don't allow eGPU switching if eGPU not connected")
> Signed-off-by: Luke D. Jones <luke@ljones.dev>
Not sure which tree/branch this is based on but the commit-id for your Fixes:
is not correct.
in my tree this is commit d49f4d1a30ac (platform/x86: asus-wmi: don't allow
eGPU switching if eGPU not connected") .
> ---
> drivers/platform/x86/asus-wmi.c | 15 +++++++--------
> 1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
> index 6db2d18a61e0..b51586986450 100644
> --- a/drivers/platform/x86/asus-wmi.c
> +++ b/drivers/platform/x86/asus-wmi.c
> @@ -731,19 +731,18 @@ static ssize_t egpu_enable_store(struct device *dev,
> return -EINVAL;
>
> result = asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_EGPU_CONNECTED);
And this does not apply, because the:
result = asus_wmi_get_devstate_simple()
you have here has been fixed in my tree to be
err = asus_wmi_get_devstate_simple()
to match the error checks below which actually check "err" not "result"
I guess that a fix for this being squashed into my tree is also what
has resulted in the different commit ids.
Please rebase on top of:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=for-next
and submit a new version.
And please also Cc: platform-driver-x86@vger.kernel.org for the next version.
Regards,
Hans
> - if (err < 0)
> - return err;
> - if (err < 1) {
> - err = -ENODEV;
> - pr_warn("Failed to set egpu disable: %d\n", err);
> + if (err < 0) {
> + pr_warn("Failed to get egpu connection status: %d\n", err);
> return err;
> }
>
> if (asus->gpu_mux_mode_available) {
> result = asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_GPU_MUX);
> - if (result < 0)
> + if (result < 0) {
> /* An error here may signal greater failure of GPU handling */
> + pr_warn("Failed to get gpu mux status: %d\n", err);
> return result;
> + }
> if (!result && enable) {
> err = -ENODEV;
> pr_warn("Can not enable eGPU when the MUX is in dGPU mode: %d\n", err);
> @@ -753,12 +752,12 @@ static ssize_t egpu_enable_store(struct device *dev,
>
> err = asus_wmi_set_devstate(ASUS_WMI_DEVID_EGPU, enable, &result);
> if (err) {
> - pr_warn("Failed to set egpu disable: %d\n", err);
> + pr_warn("Failed to set egpu state: %d\n", err);
> return err;
> }
>
> if (result > 1) {
> - pr_warn("Failed to set egpu disable (retval): 0x%x\n", result);
> + pr_warn("Failed to set egpu state (retval): 0x%x\n", result);
> return -EIO;
> }
>
next prev parent reply other threads:[~2023-08-28 10:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-27 23:15 [PATCH] platform/x86: asus-wmi: corrections to egpu safety check Luke D. Jones
2023-08-28 9:58 ` Hans de Goede [this message]
2023-08-30 2:28 ` Luke Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=32942803-b0b9-ddcd-90f7-1fc37062a18f@redhat.com \
--to=hdegoede@redhat.com \
--cc=corentin.chary@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luke@ljones.dev \
--cc=markgross@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).