Skip to content

Commit acce85a

Browse files
flukejonesjwrdegoede
authored andcommitted
platform/x86: asus-wmi: corrections to egpu safety check
An incorrect if statement was preventing the enablement of the egpu. Fixes: d49f4d1 ("platform/x86: asus-wmi: don't allow eGPU switching if eGPU not connected") Signed-off-by: Luke D. Jones <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Hans de Goede <[email protected]> Signed-off-by: Hans de Goede <[email protected]>
1 parent 06469a8 commit acce85a

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

drivers/platform/x86/asus-wmi.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -726,19 +726,18 @@ static ssize_t egpu_enable_store(struct device *dev,
726726
return -EINVAL;
727727

728728
err = asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_EGPU_CONNECTED);
729-
if (err < 0)
730-
return err;
731-
if (err < 1) {
732-
err = -ENODEV;
733-
pr_warn("Failed to set egpu disable: %d\n", err);
729+
if (err < 0) {
730+
pr_warn("Failed to get egpu connection status: %d\n", err);
734731
return err;
735732
}
736733

737734
if (asus->gpu_mux_mode_available) {
738735
result = asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_GPU_MUX);
739-
if (result < 0)
736+
if (result < 0) {
740737
/* An error here may signal greater failure of GPU handling */
738+
pr_warn("Failed to get gpu mux status: %d\n", result);
741739
return result;
740+
}
742741
if (!result && enable) {
743742
err = -ENODEV;
744743
pr_warn("Can not enable eGPU when the MUX is in dGPU mode: %d\n", err);
@@ -748,12 +747,12 @@ static ssize_t egpu_enable_store(struct device *dev,
748747

749748
err = asus_wmi_set_devstate(ASUS_WMI_DEVID_EGPU, enable, &result);
750749
if (err) {
751-
pr_warn("Failed to set egpu disable: %d\n", err);
750+
pr_warn("Failed to set egpu state: %d\n", err);
752751
return err;
753752
}
754753

755754
if (result > 1) {
756-
pr_warn("Failed to set egpu disable (retval): 0x%x\n", result);
755+
pr_warn("Failed to set egpu state (retval): 0x%x\n", result);
757756
return -EIO;
758757
}
759758

0 commit comments

Comments
 (0)