Replace the disabled pipe-reset stub with the shared PER_PIPE capability check, so GFX MMIO pipe reset follows gfx_supported_reset.
Signed-off-by: Jesse Zhang <[email protected]> --- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c index a019b1926305..c98e2fcf8b70 100644 --- a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c @@ -404,13 +404,6 @@ static int mes_v11_0_remove_hw_queue(struct amdgpu_mes *mes, offsetof(union MESAPI__REMOVE_QUEUE, api_status)); } -static bool mes_v11_0_pipe_reset_support(struct amdgpu_device *adev) -{ - /* Disable the pipe reset until the CPFW fully support it.*/ - dev_warn_once(adev->dev, "The CPFW hasn't support pipe reset yet.\n"); - return false; -} - /* Use MES callbacks directly while holding the MES lock. */ static int mes_v11_0_restore_gfx_kernel_queue(struct amdgpu_device *adev, u32 me, u32 pipe, u32 guilty_queue, @@ -480,7 +473,7 @@ static int mes_v11_0_reset_gfx_pipe_mmio(struct amdgpu_device *adev, uint32_t reset_pipe, clean_pipe; int i; - if (!mes_v11_0_pipe_reset_support(adev)) + if (!amdgpu_gfx_me_pipe_reset_supported(adev)) return -EOPNOTSUPP; amdgpu_gfx_rlc_enter_safe_mode(adev, 0); mutex_lock(&adev->srbm_mutex); -- 2.49.0
