drm/amdgpu/pm: Fix the power source flag error
Subsystems (3)
PATCH v2 1/1 drm/amdgpu/pm: Fix the power source flag error
The power source flag should be updated when
[1] System receives an interrupt indicating that the power source has changed.
[2] System resumes from suspend or runtime suspend
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 13 +++---------- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 ++ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 2 ++ 3 files changed, 7 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +3 -10
@@ -24,6 +24,7 @@#include <linux/firmware.h> #include <linux/pci.h> +#include <linux/power_supply.h> #include <linux/reboot.h> #include "amdgpu.h"
@@ -817,16 +818,8 @@ static int smu_late_init(void *handle)* handle the switch automatically. Driver involvement * is unnecessary. */ -if (!smu->dc_controlled_by_gpio) { - ret =smu_set_power_source (smu, - adev->pm.ac_power ?SMU_POWER_SOURCE_AC : -SMU_POWER_SOURCE_DC ); -if (ret) { -dev_err (adev->dev,"Failed to switch to %s mode!\n" , - adev->pm.ac_power ?"AC" :"DC" ); -return ret; - } - } + adev->pm.ac_power =power_supply_is_system_supplied () >0 ; +smu_set_ac_dc (smu);if ((amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (13 ,0 ,1 )) || (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (13 ,0 ,3 )))
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +2 -0
@@ -1442,10 +1442,12 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,case 0x3 :dev_dbg (adev->dev,"Switched to AC mode!\n" );schedule_work (&smu->interrupt_work); + adev->pm.ac_power = true;break ;case 0x4 :dev_dbg (adev->dev,"Switched to DC mode!\n" );schedule_work (&smu->interrupt_work); + adev->pm.ac_power = false;break ;case 0x7 :/*
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +2 -0
@@ -1379,10 +1379,12 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev,case 0x3 :dev_dbg (adev->dev,"Switched to AC mode!\n" );smu_v13_0_ack_ac_dc_interrupt (smu); + adev->pm.ac_power = true;break ;case 0x4 :dev_dbg (adev->dev,"Switched to DC mode!\n" );smu_v13_0_ack_ac_dc_interrupt (smu); + adev->pm.ac_power = false;break ;case 0x7 :/*
Signature · 1 line
2.34.1
Quoted 30 lines · Ma Jun
The power source flag should be updated when
[1] System receives an interrupt indicating that the power source has changed.
[2] System resumes from suspend or runtime suspendSigned-off-by Ma Jun <[email protected]>--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 13 +++---------- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 ++ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 2 ++ 3 files changed, 7 insertions(+), 10 deletions(-)drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +1
-2@@ -24,6 +24,7 @@#include <linux/firmware.h> #include <linux/pci.h> +#include <linux/power_supply.h> #include <linux/reboot.h> #include "amdgpu.h" @@ -817,16 +818,8 @@ static int smu_late_init(void *handle)* handle the switch automatically. Driver involvement * is unnecessary. */ -if (!smu->dc_controlled_by_gpio) { - ret = smu_set_power_source(smu,
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static int smu_late_init(void *handle) · line 822
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +2
-8- adev->pm.ac_power ?SMU_POWER_SOURCE_AC : - SMU_POWER_SOURCE_DC); -if (ret) { -dev_err (adev->dev,"Failed to switch to %s mode!\n" , - adev->pm.ac_power ?"AC" :"DC" ); -return ret; - } - } + adev->pm.ac_power =power_supply_is_system_supplied () >0 ; +smu_set_ac_dc (smu);
In the older logic, driver initialization/resume fails if the message fails. This one doesn't care about the return value. Is there a reason to ignore and continue?
Thanks,
Lijo
Quoted 37 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0if ((amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (13 ,0 ,1 )) || (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (13 ,0 ,3 )))drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +2
-0@@ -1442,10 +1442,12 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,case 0x3 :dev_dbg (adev->dev,"Switched to AC mode!\n" );schedule_work (&smu->interrupt_work); + adev->pm.ac_power = true;break ;case 0x4 :dev_dbg (adev->dev,"Switched to DC mode!\n" );schedule_work (&smu->interrupt_work); + adev->pm.ac_power = false;break ;case 0x7 :/* drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +2
-0@@ -1379,10 +1379,12 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev,case 0x3 :dev_dbg (adev->dev,"Switched to AC mode!\n" );smu_v13_0_ack_ac_dc_interrupt (smu); + adev->pm.ac_power = true;break ;case 0x4 :dev_dbg (adev->dev,"Switched to DC mode!\n" );smu_v13_0_ack_ac_dc_interrupt (smu); + adev->pm.ac_power = false;break ;case 0x7 :/*
Quoted 37 lines · Lijo
Quoted 36 lines · Ma Jun
The power source flag should be updated when
[1] System receives an interrupt indicating that the power source has changed.
[2] System resumes from suspend or runtime suspendSigned-off-by Ma Jun <[email protected]>--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 13 +++---------- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 ++ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 2 ++ 3 files changed, 7 insertions(+), 10 deletions(-)drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +1
-8@@ -24,6 +24,7 @@#include <linux/firmware.h> #include <linux/pci.h> +#include <linux/power_supply.h> #include <linux/reboot.h> #include "amdgpu.h" @@ -817,16 +818,8 @@ static int smu_late_init(void *handle)* handle the switch automatically. Driver involvement * is unnecessary. */ -if (!smu->dc_controlled_by_gpio) { - ret =smu_set_power_source (smu, - adev->pm.ac_power ?SMU_POWER_SOURCE_AC : -SMU_POWER_SOURCE_DC ); -if (ret) { -dev_err (adev->dev,"Failed to switch to %s mode!\n" , - adev->pm.ac_power ?"AC" :"DC" ); -return ret;
Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static int smu_late_init(void *handle) · line 822
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +2
-2- } - } + adev->pm.ac_power =power_supply_is_system_supplied () >0 ; +smu_set_ac_dc (smu);In the older logic, driver initialization/resume fails if the message fails. This one doesn't care about the return value. Is there a reason to ignore and continue?
I think printing an error message in smu_set_ac_dc() is enough, and stopping the driver initialization/resume seems a bit excessive.
Regards,
Ma Jun
Quoted 41 lines
Thanks,
LijoQuoted 37 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0if ((amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (13 ,0 ,1 )) || (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (13 ,0 ,3 )))drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +2
-0@@ -1442,10 +1442,12 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,case 0x3 :dev_dbg (adev->dev,"Switched to AC mode!\n" );schedule_work (&smu->interrupt_work); + adev->pm.ac_power = true;break ;case 0x4 :dev_dbg (adev->dev,"Switched to DC mode!\n" );schedule_work (&smu->interrupt_work); + adev->pm.ac_power = false;break ;case 0x7 :/* drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +2
-0@@ -1379,10 +1379,12 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev,case 0x3 :dev_dbg (adev->dev,"Switched to AC mode!\n" );smu_v13_0_ack_ac_dc_interrupt (smu); + adev->pm.ac_power = true;break ;case 0x4 :dev_dbg (adev->dev,"Switched to DC mode!\n" );smu_v13_0_ack_ac_dc_interrupt (smu); + adev->pm.ac_power = false;break ;case 0x7 :/*
Quoted 49 lines · Jun
Quoted 37 lines · Lijo
Quoted 36 lines · Ma Jun
The power source flag should be updated when
[1] System receives an interrupt indicating that the power source has changed.
[2] System resumes from suspend or runtime suspendSigned-off-by Ma Jun <[email protected]>--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 13 +++---------- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 ++ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 2 ++ 3 files changed, 7 insertions(+), 10 deletions(-)drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +1
-8@@ -24,6 +24,7 @@#include <linux/firmware.h> #include <linux/pci.h> +#include <linux/power_supply.h> #include <linux/reboot.h> #include "amdgpu.h" @@ -817,16 +818,8 @@ static int smu_late_init(void *handle)* handle the switch automatically. Driver involvement * is unnecessary. */ -if (!smu->dc_controlled_by_gpio) { - ret =smu_set_power_source (smu, - adev->pm.ac_power ?SMU_POWER_SOURCE_AC : -SMU_POWER_SOURCE_DC ); -if (ret) { -dev_err (adev->dev,"Failed to switch to %s mode!\n" , - adev->pm.ac_power ?"AC" :"DC" ); -return ret;Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static int smu_late_init(void *handle) · line 822
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +2
-2- } - } + adev->pm.ac_power =power_supply_is_system_supplied () >0 ; +smu_set_ac_dc (smu);In the older logic, driver initialization/resume fails if the message fails. This one doesn't care about the return value. Is there a reason to ignore and continue?
Quoted 3 lines
I think printing an error message in
smu_set_ac_dc()is enough, and stopping the driver initialization/resume seems a bit excessive.
FW not responding to a message usually means FW is not in a good state which could later affect the system anyway. Since there are other FW interactions after this probably ignoring this is fine.
BTW, what is the issue seen after resume when power source is not set correctly? If that issue creates real problems, then it's worth considering keeping the FW informed about the real power source, and fail if it doesn't succeed.
Thanks,
Lijo
Quoted 43 lines
Regards,
Ma JunQuoted 41 lines
Thanks,
LijoQuoted 37 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0if ((amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (13 ,0 ,1 )) || (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (13 ,0 ,3 )))drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +2
-0@@ -1442,10 +1442,12 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,case 0x3 :dev_dbg (adev->dev,"Switched to AC mode!\n" );schedule_work (&smu->interrupt_work); + adev->pm.ac_power = true;break ;case 0x4 :dev_dbg (adev->dev,"Switched to DC mode!\n" );schedule_work (&smu->interrupt_work); + adev->pm.ac_power = false;break ;case 0x7 :/* drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +2
-0@@ -1379,10 +1379,12 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev,case 0x3 :dev_dbg (adev->dev,"Switched to AC mode!\n" );smu_v13_0_ack_ac_dc_interrupt (smu); + adev->pm.ac_power = true;break ;case 0x4 :dev_dbg (adev->dev,"Switched to DC mode!\n" );smu_v13_0_ack_ac_dc_interrupt (smu); + adev->pm.ac_power = false;break ;case 0x7 :/*
Hi Lijo,
Quoted 54 lines · Lijo
Quoted 49 lines · Jun
Quoted 37 lines · Lijo
Quoted 36 lines · Ma Jun
The power source flag should be updated when
[1] System receives an interrupt indicating that the power source has changed.
[2] System resumes from suspend or runtime suspendSigned-off-by Ma Jun <[email protected]>--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 13 +++---------- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 ++ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 2 ++ 3 files changed, 7 insertions(+), 10 deletions(-)drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +1
-8@@ -24,6 +24,7 @@#include <linux/firmware.h> #include <linux/pci.h> +#include <linux/power_supply.h> #include <linux/reboot.h> #include "amdgpu.h" @@ -817,16 +818,8 @@ static int smu_late_init(void *handle)* handle the switch automatically. Driver involvement * is unnecessary. */ -if (!smu->dc_controlled_by_gpio) { - ret =smu_set_power_source (smu, - adev->pm.ac_power ?SMU_POWER_SOURCE_AC : -SMU_POWER_SOURCE_DC ); -if (ret) { -dev_err (adev->dev,"Failed to switch to %s mode!\n" , - adev->pm.ac_power ?"AC" :"DC" ); -return ret;Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static int smu_late_init(void *handle) · line 822
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +2
-2- } - } + adev->pm.ac_power =power_supply_is_system_supplied () >0 ; +smu_set_ac_dc (smu);In the older logic, driver initialization/resume fails if the message fails. This one doesn't care about the return value. Is there a reason to ignore and continue?
Quoted 3 lines
I think printing an error message in
smu_set_ac_dc()is enough, and stopping the driver initialization/resume seems a bit excessive.
Quoted 9 lines
FW not responding to a message usually means FW is not in a good state which could later affect the system anyway. Since there are other FW interactions after this probably ignoring this is fine.
BTW, what is the issue seen after resume when power source is not set correctly? If that issue creates real problems, then it's worth considering keeping the FW informed about the real power source, and fail if it doesn't succeed.
I didn't see any serious problems, the only problem is we may read incorrect power related data values because of wrong ac_power value.
Regards,
Ma Jun
Quoted 47 lines
Thanks,
LijoQuoted 43 lines
Regards,
Ma JunQuoted 41 lines
Thanks,
LijoQuoted 37 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0if ((amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (13 ,0 ,1 )) || (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (13 ,0 ,3 )))drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +2
-0@@ -1442,10 +1442,12 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,case 0x3 :dev_dbg (adev->dev,"Switched to AC mode!\n" );schedule_work (&smu->interrupt_work); + adev->pm.ac_power = true;break ;case 0x4 :dev_dbg (adev->dev,"Switched to DC mode!\n" );schedule_work (&smu->interrupt_work); + adev->pm.ac_power = false;break ;case 0x7 :/* drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +2
-0@@ -1379,10 +1379,12 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev,case 0x3 :dev_dbg (adev->dev,"Switched to AC mode!\n" );smu_v13_0_ack_ac_dc_interrupt (smu); + adev->pm.ac_power = true;break ;case 0x4 :dev_dbg (adev->dev,"Switched to DC mode!\n" );smu_v13_0_ack_ac_dc_interrupt (smu); + adev->pm.ac_power = false;break ;case 0x7 :/*
Lazar, Lijo
Reviewed-byQuoted 61 lines · Jun
Hi Lijo,
Quoted 58 lines · Lijo
Quoted 49 lines · Jun
Quoted 37 lines · Lijo
Quoted 36 lines · Ma Jun
The power source flag should be updated when
[1] System receives an interrupt indicating that the power source has changed.
[2] System resumes from suspend or runtime suspendSigned-off-by Ma Jun <[email protected]>--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 13 +++---------- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 ++ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 2 ++ 3 files changed, 7 insertions(+), 10 deletions(-)drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +1
-8@@ -24,6 +24,7 @@#include <linux/firmware.h> #include <linux/pci.h> +#include <linux/power_supply.h> #include <linux/reboot.h> #include "amdgpu.h" @@ -817,16 +818,8 @@ static int smu_late_init(void *handle)* handle the switch automatically. Driver involvement * is unnecessary. */ -if (!smu->dc_controlled_by_gpio) { - ret =smu_set_power_source (smu, - adev->pm.ac_power ?SMU_POWER_SOURCE_AC : -SMU_POWER_SOURCE_DC ); -if (ret) { -dev_err (adev->dev,"Failed to switch to %s mode!\n" , - adev->pm.ac_power ?"AC" :"DC" ); -return ret;Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static int smu_late_init(void *handle) · line 822
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +2
-2- } - } + adev->pm.ac_power =power_supply_is_system_supplied () >0 ; +smu_set_ac_dc (smu);In the older logic, driver initialization/resume fails if the message fails. This one doesn't care about the return value. Is there a reason to ignore and continue?
Quoted 3 lines
I think printing an error message in
smu_set_ac_dc()is enough, and stopping the driver initialization/resume seems a bit excessive.FW not responding to a message usually means FW is not in a good state which could later affect the system anyway. Since there are other FW interactions after this probably ignoring this is fine.
Quoted 8 lines
Quoted 5 lines
BTW, what is the issue seen after resume when power source is not set correctly? If that issue creates real problems, then it's worth considering keeping the FW informed about the real power source, and fail if it doesn't succeed.
I didn't see any serious problems, the only problem is we may read incorrect power related data values because of wrong
ac_powervalue.
Thanks for the clarification. Patch is
Thanks,
Lijo
Quoted 49 lines
Regards,
Ma JunQuoted 47 lines
Thanks,
LijoQuoted 43 lines
Regards,
Ma JunQuoted 41 lines
Thanks,
LijoQuoted 37 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0if ((amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (13 ,0 ,1 )) || (amdgpu_ip_version (adev,MP1_HWIP ,0 ) ==IP_VERSION (13 ,0 ,3 )))drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +2
-0@@ -1442,10 +1442,12 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,case 0x3 :dev_dbg (adev->dev,"Switched to AC mode!\n" );schedule_work (&smu->interrupt_work); + adev->pm.ac_power = true;break ;case 0x4 :dev_dbg (adev->dev,"Switched to DC mode!\n" );schedule_work (&smu->interrupt_work); + adev->pm.ac_power = false;break ;case 0x7 :/* drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +2
-0@@ -1379,10 +1379,12 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev,case 0x3 :dev_dbg (adev->dev,"Switched to AC mode!\n" );smu_v13_0_ack_ac_dc_interrupt (smu); + adev->pm.ac_power = true;break ;case 0x4 :dev_dbg (adev->dev,"Switched to DC mode!\n" );smu_v13_0_ack_ac_dc_interrupt (smu); + adev->pm.ac_power = false;break ;case 0x7 :/*