diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4661-drm-amdgpu-enable-disable-doorbell-interrupt-in-baco.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4661-drm-amdgpu-enable-disable-doorbell-interrupt-in-baco.patch | 85 |
1 files changed, 85 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4661-drm-amdgpu-enable-disable-doorbell-interrupt-in-baco.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4661-drm-amdgpu-enable-disable-doorbell-interrupt-in-baco.patch new file mode 100644 index 00000000..a71c7c69 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4661-drm-amdgpu-enable-disable-doorbell-interrupt-in-baco.patch @@ -0,0 +1,85 @@ +From 2813c4e0bbdd1666e3d0f13248861d08d61c548f Mon Sep 17 00:00:00 2001 +From: Le Ma <le.ma@amd.com> +Date: Tue, 26 Nov 2019 17:24:56 +0800 +Subject: [PATCH 4661/4736] drm/amdgpu: enable/disable doorbell interrupt in + baco entry/exit helper + +This operation is needed when baco entry/exit for ras recovery + +Change-Id: I535c7231693f3138a8e3d5acd55672e2ac68232f +Signed-off-by: Le Ma <le.ma@amd.com> +Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index db80dd97f0ef..863590e169ac 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -4338,10 +4338,14 @@ bool amdgpu_device_is_peer_accessible(struct amdgpu_device *adev, + int amdgpu_device_baco_enter(struct drm_device *dev) + { + struct amdgpu_device *adev = dev->dev_private; ++ struct amdgpu_ras *ras = amdgpu_ras_get_context(adev); + + if (!amdgpu_device_supports_baco(adev->ddev)) + return -ENOTSUPP; + ++ if (ras && ras->supported) ++ adev->nbio.funcs->enable_doorbell_interrupt(adev, false); ++ + if (is_support_sw_smu(adev)) { + struct smu_context *smu = &adev->smu; + int ret; +@@ -4349,8 +4353,6 @@ int amdgpu_device_baco_enter(struct drm_device *dev) + ret = smu_baco_enter(smu); + if (ret) + return ret; +- +- return 0; + } else { + void *pp_handle = adev->powerplay.pp_handle; + const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +@@ -4361,14 +4363,15 @@ int amdgpu_device_baco_enter(struct drm_device *dev) + /* enter BACO state */ + if (pp_funcs->set_asic_baco_state(pp_handle, 1)) + return -EIO; +- +- return 0; + } ++ ++ return 0; + } + + int amdgpu_device_baco_exit(struct drm_device *dev) + { + struct amdgpu_device *adev = dev->dev_private; ++ struct amdgpu_ras *ras = amdgpu_ras_get_context(adev); + + if (!amdgpu_device_supports_baco(adev->ddev)) + return -ENOTSUPP; +@@ -4381,7 +4384,6 @@ int amdgpu_device_baco_exit(struct drm_device *dev) + if (ret) + return ret; + +- return 0; + } else { + void *pp_handle = adev->powerplay.pp_handle; + const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +@@ -4392,7 +4394,10 @@ int amdgpu_device_baco_exit(struct drm_device *dev) + /* exit BACO state */ + if (pp_funcs->set_asic_baco_state(pp_handle, 0)) + return -EIO; +- +- return 0; + } ++ ++ if (ras && ras->supported) ++ adev->nbio.funcs->enable_doorbell_interrupt(adev, true); ++ ++ return 0; + } +-- +2.17.1 + |