Received-SPF: pass (google.com: domain of linux-kernel+bounces-108296-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Feedback-ID: i5ec1447f:Fastmail
User-Agent: Cyrus-JMAP/3.11.0-alpha0-332-gdeb4194079-fm-20240319.002-gdeb41940
Precedence: bulk
MIME-Version: 1.0
Message-Id: <fbd2dc65-33d9-447e-9edb-78df370778be@app.fastmail.com>
In-Reply-To: <0f35beb8-5453-63cb-0570-752b2693f6ec@linux.intel.com>
References: <20240310055312.11293-1-luke@ljones.dev>
 <20240310055312.11293-2-luke@ljones.dev>
 <0f35beb8-5453-63cb-0570-752b2693f6ec@linux.intel.com>
Date: Wed, 20 Mar 2024 14:04:35 +1300
From: "Luke Jones" <luke@ljones.dev>
To: =?UTF-8?Q?Ilpo_J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com>
Cc: platform-driver-x86@vger.kernel.org,
 "Hans de Goede" <hdegoede@redhat.com>, LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 1/1] platform/x86: asus-wmi: add support for Vivobook GPU MUX
Content-Type: text/plain;charset=utf-8
Content-Transfer-Encoding: quoted-printable

On Wed, 20 Mar 2024, at 1:26 AM, Ilpo J=C3=A4rvinen wrote:
> On Sun, 10 Mar 2024, Luke D. Jones wrote:
>=20
> > Adjust existing MUX support to select whichever MUX support is avail=
able
> > so that ASUS Vivobook MUX can also be used if detected.
>=20
> This description is a bit on the short side. It wouldn't have hurt to=20
> first state that Vivobooks come with a GPU MUX WMI that has a differen=
t=20
> WMI device ID. I can infer that after reading the diff but the descrip=
tion=20
> should not require reading the patch.

Would you prefer I changed the commit message?

>=20
> The code change itself looks fine,
>=20
> Reviewed-by: Ilpo J=C3=A4rvinen <ilpo.jarvinen@linux.intel.com>
>=20
> --=20
> i.
>=20
> >=20
> > Signed-off-by: Luke D. Jones <luke@ljones.dev>
> > ---
> >  drivers/platform/x86/asus-wmi.c            | 18 +++++++++++++-----
> >  include/linux/platform_data/x86/asus-wmi.h |  1 +
> >  2 files changed, 14 insertions(+), 5 deletions(-)
> >=20
> > diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/=
asus-wmi.c
> > index 94cc589607b3..2cf695289655 100644
> > --- a/drivers/platform/x86/asus-wmi.c
> > +++ b/drivers/platform/x86/asus-wmi.c
> > @@ -268,6 +268,7 @@ struct asus_wmi {
> >  bool egpu_connect_available;
> >  bool dgpu_disable_available;
> >  bool gpu_mux_mode_available;
> > + u32 gpu_mux_dev;
> > =20
> >  /* Tunables provided by ASUS for gaming laptops */
> >  bool ppt_pl2_sppt_available;
> > @@ -682,7 +683,7 @@ static ssize_t dgpu_disable_store(struct device =
*dev,
> >  return -EINVAL;
> > =20
> >  if (asus->gpu_mux_mode_available) {
> > - result =3D asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_GPU_M=
UX);
> > + result =3D asus_wmi_get_devstate_simple(asus, asus->gpu_mux_dev);
> >  if (result < 0)
> >  /* An error here may signal greater failure of GPU handling */
> >  return result;
> > @@ -748,7 +749,7 @@ static ssize_t egpu_enable_store(struct device *=
dev,
> >  }
> > =20
> >  if (asus->gpu_mux_mode_available) {
> > - result =3D asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_GPU_M=
UX);
> > + result =3D asus_wmi_get_devstate_simple(asus, asus->gpu_mux_dev);
> >  if (result < 0) {
> >  /* An error here may signal greater failure of GPU handling */
> >  pr_warn("Failed to get gpu mux status: %d\n", result);
> > @@ -801,7 +802,7 @@ static ssize_t gpu_mux_mode_show(struct device *=
dev,
> >  struct asus_wmi *asus =3D dev_get_drvdata(dev);
> >  int result;
> > =20
> > - result =3D asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_GPU_M=
UX);
> > + result =3D asus_wmi_get_devstate_simple(asus, asus->gpu_mux_dev);
> >  if (result < 0)
> >  return result;
> > =20
> > @@ -847,7 +848,7 @@ static ssize_t gpu_mux_mode_store(struct device =
*dev,
> >  }
> >  }
> > =20
> > - err =3D asus_wmi_set_devstate(ASUS_WMI_DEVID_GPU_MUX, optimus, &re=
sult);
> > + err =3D asus_wmi_set_devstate(asus->gpu_mux_dev, optimus, &result);
> >  if (err) {
> >  dev_err(dev, "Failed to set GPU MUX mode: %d\n", err);
> >  return err;
> > @@ -4507,7 +4508,6 @@ static int asus_wmi_add(struct platform_device=
 *pdev)
> >  asus->egpu_enable_available =3D asus_wmi_dev_is_present(asus, ASUS_=
WMI_DEVID_EGPU);
> >  asus->egpu_connect_available =3D asus_wmi_dev_is_present(asus, ASUS=
_WMI_DEVID_EGPU_CONNECTED);
> >  asus->dgpu_disable_available =3D asus_wmi_dev_is_present(asus, ASUS=
_WMI_DEVID_DGPU);
> > - asus->gpu_mux_mode_available =3D asus_wmi_dev_is_present(asus, ASU=
S_WMI_DEVID_GPU_MUX);
> >  asus->kbd_rgb_mode_available =3D asus_wmi_dev_is_present(asus, ASUS=
_WMI_DEVID_TUF_RGB_MODE);
> >  asus->kbd_rgb_state_available =3D asus_wmi_dev_is_present(asus, ASU=
S_WMI_DEVID_TUF_RGB_STATE);
> >  asus->ppt_pl2_sppt_available =3D asus_wmi_dev_is_present(asus, ASUS=
_WMI_DEVID_PPT_PL2_SPPT);
> > @@ -4529,6 +4529,14 @@ static int asus_wmi_add(struct platform_devic=
e *pdev)
> >  asus->mini_led_dev_id =3D ASUS_WMI_DEVID_MINI_LED_MODE2;
> >  }
> > =20
> > + if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_GPU_MUX)) {
> > + asus->gpu_mux_mode_available =3D true;
> > + asus->gpu_mux_dev =3D ASUS_WMI_DEVID_GPU_MUX;
> > + } else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_GPU_MUX_VI=
VO)) {
> > + asus->gpu_mux_mode_available =3D true;
> > + asus->gpu_mux_dev =3D ASUS_WMI_DEVID_GPU_MUX_VIVO;
> > + }
> > +
> >  err =3D fan_boost_mode_check_present(asus);
> >  if (err)
> >  goto fail_fan_boost_mode;
> > diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/li=
nux/platform_data/x86/asus-wmi.h
> > index 9cadce10ad9a..b48b024dd844 100644
> > --- a/include/linux/platform_data/x86/asus-wmi.h
> > +++ b/include/linux/platform_data/x86/asus-wmi.h
> > @@ -128,6 +128,7 @@
> > =20
> >  /* gpu mux switch, 0 =3D dGPU, 1 =3D Optimus */
> >  #define ASUS_WMI_DEVID_GPU_MUX 0x00090016
> > +#define ASUS_WMI_DEVID_GPU_MUX_VIVO 0x00090026
> > =20
> >  /* TUF laptop RGB modes/colours */
> >  #define ASUS_WMI_DEVID_TUF_RGB_MODE 0x00100056
> >=20