[PATCH] drm/dp/mst: Always clear proposed vcpi table for port.

Lyude Paul cpaul at redhat.com
Tue May 24 15:00:53 UTC 2016


Looks good to me.

Reviewed-by: Lyude <cpaul at redhat.com>

On Thu, 2016-05-19 at 23:18 -0400, Andrey Grodzovsky wrote:
> Not clearing mst manager's proposed vcpis table for destroyed
> connectors when the manager is stopped leaves it pointing to
> unrefernced memory, this causes pagefault when the manager is
> restarted when plugging back a branch.
> 
> Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky at amd.com>
> ---
>  drivers/gpu/drm/drm_dp_mst_topology.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c
> b/drivers/gpu/drm/drm_dp_mst_topology.c
> index 9971c46..cd6014b 100644
> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> @@ -2881,11 +2881,9 @@ static void drm_dp_destroy_connector_work(struct
> work_struct *work)
>  		drm_dp_port_teardown_pdt(port, port->pdt);
>  
>  		if (!port->input && port->vcpi.vcpi > 0) {
> -			if (mgr->mst_state) {
> -				drm_dp_mst_reset_vcpi_slots(mgr, port);
> -				drm_dp_update_payload_part1(mgr);
> -				drm_dp_mst_put_payload_id(mgr, port-
> >vcpi.vcpi);
> -			}
> +			drm_dp_mst_reset_vcpi_slots(mgr, port);
> +			drm_dp_update_payload_part1(mgr);
> +			drm_dp_mst_put_payload_id(mgr, port->vcpi.vcpi);
>  		}
>  
>  		kref_put(&port->kref, drm_dp_free_mst_port);


More information about the dri-devel mailing list