Skip to contentSkip to conversation

Patch "drm/amdgpu: fix crash in acp_hw_fini" has been added to the 4.8-stable tree

PATCH [email protected] 1 participant 1 message Nov 15, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drm/amdgpu: fix crash in acp_hw_fini

to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-amdgpu-fix-crash-in-acp_hw_fini.patch
and it can be found in the queue-4.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 757124d95c42bb579d67df51e51789849929ee31 Mon Sep 17 00:00:00 2001

From: Alex Deucher <[email protected]>
Date: Thu, 3 Nov 2016 17:47:51 -0400
Subject: drm/amdgpu: fix crash in acp_hw_fini

From: Alex Deucher <[email protected]>

commit 757124d95c42bb579d67df51e51789849929ee31 upstream.

On CZ/ST systems with AZ rather than ACP audio, we need to bail early in hw_fini since there is nothing to do.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c +4 -1
@@ -395,9 +395,12 @@ static int acp_hw_fini(void *handle)
 {
 	int i, ret;
 	struct device *dev;
-
 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
+	/* return early if no ACP */
+	if (!adev->acp.acp_genpd)
+		return 0;
+
 	for (i = 0; i < ACP_DEVS ; i++) {
 		dev = get_mfd_cell_dev(adev->acp.acp_cell[i].name, i);
 		ret = pm_genpd_remove_device(&adev->acp.acp_genpd->gpd, dev);

Patches currently in stable-queue which might be from [email protected] are

queue-4.8/drm-radeon-disable-runtime-pm-in-certain-cases.patch queue-4.8/drm-amdgpu-fix-crash-in-acp_hw_fini.patch queue-4.8/drm-amdgpu-disable-runtime-pm-in-certain-cases.patch