From: Tim Huang Tim.Huang@amd.com
For SMU v13.0.4/11, driver does not need to stop RLC for S0i3, the firmwares will handle that properly.
Signed-off-by: Tim Huang Tim.Huang@amd.com Reviewed-by: Mario Limonciello mario.limonciello@amd.com Signed-off-by: Alex Deucher alexander.deucher@amd.com (cherry picked from commit 730d44e1fa306a20746ad4a85da550662aed9daa) Cc: stable@vger.kernel.org # 6.1.x --- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c index ea03e8d9a3f6..818379276a58 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c @@ -1573,9 +1573,9 @@ static int smu_disable_dpms(struct smu_context *smu)
/* * For SMU 13.0.4/11, PMFW will handle the features disablement properly - * for gpu reset case. Driver involvement is unnecessary. + * for gpu reset and S0i3 cases. Driver involvement is unnecessary. */ - if (amdgpu_in_reset(adev)) { + if (amdgpu_in_reset(adev) || adev->in_s0ix) { switch (adev->ip_versions[MP1_HWIP][0]) { case IP_VERSION(13, 0, 4): case IP_VERSION(13, 0, 11):
From: Guchun Chen guchun.chen@amd.com
This can clean up all irq warnings because of unbalanced amdgpu_irq_get/put when unplugging/unbinding device, and leave irq count decrease in each ip fini function.
Fixes warnings on module unload.
Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2792 Signed-off-by: Guchun Chen guchun.chen@amd.com Reviewed-by: Christian König christian.koenig@amd.com Signed-off-by: Alex Deucher alexander.deucher@amd.com (cherry picked from commit 8ffd6f0442674f32c048ec8dffdbc5ec67829beb) Cc: stable@vger.kernel.org # 6.4.x --- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c index fafebec5b7b6..9581c020d815 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c @@ -124,7 +124,6 @@ void amdgpu_irq_disable_all(struct amdgpu_device *adev) continue;
for (k = 0; k < src->num_types; ++k) { - atomic_set(&src->enabled_types[k], 0); r = src->funcs->set(adev, src, k, AMDGPU_IRQ_STATE_DISABLE); if (r)
On 8/17/2023 8:40 AM, Alex Deucher wrote:
From: Tim Huang Tim.Huang@amd.com
For SMU v13.0.4/11, driver does not need to stop RLC for S0i3, the firmwares will handle that properly.
Signed-off-by: Tim Huang Tim.Huang@amd.com Reviewed-by: Mario Limonciello mario.limonciello@amd.com Signed-off-by: Alex Deucher alexander.deucher@amd.com (cherry picked from commit 730d44e1fa306a20746ad4a85da550662aed9daa) Cc: stable@vger.kernel.org # 6.1.x
Greg,
Just want to make sure this one didn't get accidentally skipped since you populated the stable queues and didn't see it landed.
Thanks!
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c index ea03e8d9a3f6..818379276a58 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c @@ -1573,9 +1573,9 @@ static int smu_disable_dpms(struct smu_context *smu) /* * For SMU 13.0.4/11, PMFW will handle the features disablement properly
* for gpu reset case. Driver involvement is unnecessary.
* for gpu reset and S0i3 cases. Driver involvement is unnecessary.
- if (amdgpu_in_reset(adev)) {
- if (amdgpu_in_reset(adev) || adev->in_s0ix) { switch (adev->ip_versions[MP1_HWIP][0]) { case IP_VERSION(13, 0, 4): case IP_VERSION(13, 0, 11):
On Mon, Aug 21, 2023 at 07:15:53AM -0500, Limonciello, Mario wrote:
On 8/17/2023 8:40 AM, Alex Deucher wrote:
From: Tim Huang Tim.Huang@amd.com
For SMU v13.0.4/11, driver does not need to stop RLC for S0i3, the firmwares will handle that properly.
Signed-off-by: Tim Huang Tim.Huang@amd.com Reviewed-by: Mario Limonciello mario.limonciello@amd.com Signed-off-by: Alex Deucher alexander.deucher@amd.com (cherry picked from commit 730d44e1fa306a20746ad4a85da550662aed9daa) Cc: stable@vger.kernel.org # 6.1.x
Greg,
Just want to make sure this one didn't get accidentally skipped since you populated the stable queues and didn't see it landed.
I'm still working on catching up on the stable backlog as I was gone last week, this is in my "to get to soon" queue, it's not lost :)
thanks,
greg k-h
On Mon, Aug 21, 2023 at 02:56:41PM +0200, Greg KH wrote:
On Mon, Aug 21, 2023 at 07:15:53AM -0500, Limonciello, Mario wrote:
On 8/17/2023 8:40 AM, Alex Deucher wrote:
From: Tim Huang Tim.Huang@amd.com
For SMU v13.0.4/11, driver does not need to stop RLC for S0i3, the firmwares will handle that properly.
Signed-off-by: Tim Huang Tim.Huang@amd.com Reviewed-by: Mario Limonciello mario.limonciello@amd.com Signed-off-by: Alex Deucher alexander.deucher@amd.com (cherry picked from commit 730d44e1fa306a20746ad4a85da550662aed9daa) Cc: stable@vger.kernel.org # 6.1.x
Greg,
Just want to make sure this one didn't get accidentally skipped since you populated the stable queues and didn't see it landed.
I'm still working on catching up on the stable backlog as I was gone last week, this is in my "to get to soon" queue, it's not lost :)
Wait, I'm confused. You have 2 patches in this series, yet one says "6.1.x" and one "6.4.x"? But both actually to both trees. So where are these supposed to be applied to?
Please always give me a hint, and never mix/match kernel versions in a patch series, what would you do if you recieved that?
thanks,
greg k-h
On 8/21/2023 10:37 AM, Greg KH wrote:
On Mon, Aug 21, 2023 at 02:56:41PM +0200, Greg KH wrote:
On Mon, Aug 21, 2023 at 07:15:53AM -0500, Limonciello, Mario wrote:
On 8/17/2023 8:40 AM, Alex Deucher wrote:
From: Tim Huang Tim.Huang@amd.com
For SMU v13.0.4/11, driver does not need to stop RLC for S0i3, the firmwares will handle that properly.
Signed-off-by: Tim Huang Tim.Huang@amd.com Reviewed-by: Mario Limonciello mario.limonciello@amd.com Signed-off-by: Alex Deucher alexander.deucher@amd.com (cherry picked from commit 730d44e1fa306a20746ad4a85da550662aed9daa) Cc: stable@vger.kernel.org # 6.1.x
Greg,
Just want to make sure this one didn't get accidentally skipped since you populated the stable queues and didn't see it landed.
I'm still working on catching up on the stable backlog as I was gone last week, this is in my "to get to soon" queue, it's not lost :)
Wait, I'm confused. You have 2 patches in this series, yet one says "6.1.x" and one "6.4.x"? But both actually to both trees. So where are these supposed to be applied to?
Please always give me a hint, and never mix/match kernel versions in a patch series, what would you do if you recieved that?
thanks,
greg k-h
Yeah I see the confusion here. Sorry about that. I looked over both and they should both apply to 6.1.y and 6.4.y.
Thanks!
On Mon, Aug 21, 2023 at 11:30:29AM -0500, Limonciello, Mario wrote:
On 8/21/2023 10:37 AM, Greg KH wrote:
On Mon, Aug 21, 2023 at 02:56:41PM +0200, Greg KH wrote:
On Mon, Aug 21, 2023 at 07:15:53AM -0500, Limonciello, Mario wrote:
On 8/17/2023 8:40 AM, Alex Deucher wrote:
From: Tim Huang Tim.Huang@amd.com
For SMU v13.0.4/11, driver does not need to stop RLC for S0i3, the firmwares will handle that properly.
Signed-off-by: Tim Huang Tim.Huang@amd.com Reviewed-by: Mario Limonciello mario.limonciello@amd.com Signed-off-by: Alex Deucher alexander.deucher@amd.com (cherry picked from commit 730d44e1fa306a20746ad4a85da550662aed9daa) Cc: stable@vger.kernel.org # 6.1.x
Greg,
Just want to make sure this one didn't get accidentally skipped since you populated the stable queues and didn't see it landed.
I'm still working on catching up on the stable backlog as I was gone last week, this is in my "to get to soon" queue, it's not lost :)
Wait, I'm confused. You have 2 patches in this series, yet one says "6.1.x" and one "6.4.x"? But both actually to both trees. So where are these supposed to be applied to?
Please always give me a hint, and never mix/match kernel versions in a patch series, what would you do if you recieved that?
thanks,
greg k-h
Yeah I see the confusion here. Sorry about that. I looked over both and they should both apply to 6.1.y and 6.4.y.
Thanks, both now queued up to both trees.
greg k-h
linux-stable-mirror@lists.linaro.org
-
Alex Deucher -
Greg KH -
Limonciello, Mario