Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24f91036 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-fixes-4.9' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 

3 more amdgpu fixes.

* 'drm-fixes-4.9' of git://people.freedesktop.org/~agd5f/linux:
  drm/amd/powerplay: return false instead of -EINVAL
  drm/amdgpu/powerplay/smu7: fix unintialized data usage
  drm/amdgpu: fix crash in acp_hw_fini
parents cf532232 f20024d8

drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c

+4 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ bool phm_check_smc_update_required_for_display_configuration(struct pp_hwmgr *hw 
	PHM_FUNC_CHECK(hwmgr);



	if (hwmgr->hwmgr_func->check_smc_update_required_for_display_configuration == NULL)

		return -EINVAL;

		return false;



	return hwmgr->hwmgr_func->check_smc_update_required_for_display_configuration(hwmgr);

}

drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c

+2 −0
Original line number Diff line number Diff line
@@ -2133,9 +2133,11 @@ static int smu7_patch_limits_vddc(struct pp_hwmgr *hwmgr, 
	struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);



	if (tab) {

		vddc = tab->vddc;

		smu7_patch_ppt_v0_with_vdd_leakage(hwmgr, &vddc,

						   &data->vddc_leakage);

		tab->vddc = vddc;

		vddci = tab->vddci;

		smu7_patch_ppt_v0_with_vdd_leakage(hwmgr, &vddci,

						   &data->vddci_leakage);

		tab->vddci = vddci;