[PATCH v2 24/27] drm/amdgpu/dm: Resume short HPD IRQs before resuming MST topology

Sean Paul sean at poorly.run
Wed Sep 25 20:08:38 UTC 2019


On Tue, Sep 03, 2019 at 04:46:02PM -0400, Lyude Paul wrote:
> Since we're going to be reprobing the entire topology state on resume
> now using sideband transactions, we need to ensure that we actually have
> short HPD irqs enabled before calling drm_dp_mst_topology_mgr_resume().
> So, do that.
> 
> Cc: Juston Li <juston.li at intel.com>
> Cc: Imre Deak <imre.deak at intel.com>
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Cc: Harry Wentland <hwentlan at amd.com>
> Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
> Signed-off-by: Lyude Paul <lyude at redhat.com>
> ---
>  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 73630e2940d4..4d3c8bff77da 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -1185,15 +1185,15 @@ static int dm_resume(void *handle)
>  	/* program HPD filter */
>  	dc_resume(dm->dc);
>  
> -	/* On resume we need to  rewrite the MSTM control bits to enamble MST*/
> -	s3_handle_mst(ddev, false);
> -
>  	/*
>  	 * early enable HPD Rx IRQ, should be done before set mode as short
>  	 * pulse interrupts are used for MST
>  	 */
>  	amdgpu_dm_irq_resume_early(adev);
>  
> +	/* On resume we need to  rewrite the MSTM control bits to enamble MST*/

While we're here,

s/  / / && s/enamble/enable/ && s_*/_ */_

> +	s3_handle_mst(ddev, false);
> +
>  	/* Do detection*/
>  	drm_connector_list_iter_begin(ddev, &iter);
>  	drm_for_each_connector_iter(connector, &iter) {
> -- 
> 2.21.0
> 

-- 
Sean Paul, Software Engineer, Google / Chromium OS


More information about the amd-gfx mailing list