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

Commit 56a91c49 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/dp/mst: Handle errors from drm_atomic_get_private_obj_state() correctly 



On failure drm_atomic_get_private_obj_state() returns and error
pointer instead of NULL. Adjust the checks in the callers to match.

Cc: stable@vger.kernel.org
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Fixes: edb1ed1a ("drm/dp: Add DP MST helpers to atomically find and release vcpi slots")
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170712155102.26276-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
parent e2798685

drivers/gpu/drm/drm_dp_mst_topology.c

+4 −4
Original line number Diff line number Diff line
@@ -2515,8 +2515,8 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state, 
	int req_slots;



	topology_state = drm_atomic_get_mst_topology_state(state, mgr);

	if (topology_state == NULL)

		return -ENOMEM;

	if (IS_ERR(topology_state))

		return PTR_ERR(topology_state);



	port = drm_dp_get_validated_port_ref(mgr, port);

	if (port == NULL)
@@ -2555,8 +2555,8 @@ int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, 
	struct drm_dp_mst_topology_state *topology_state;



	topology_state = drm_atomic_get_mst_topology_state(state, mgr);

	if (topology_state == NULL)

		return -ENOMEM;

	if (IS_ERR(topology_state))

		return PTR_ERR(topology_state);



	/* We cannot rely on port->vcpi.num_slots to update

	 * topology_state->avail_slots as the port may not exist if the parent