Commit 00d0e93a authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Greg Kroah-Hartman

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

commit 56a91c49 upstream.

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

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.comReviewed-by: default avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 410ef183
...@@ -2540,8 +2540,8 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state, ...@@ -2540,8 +2540,8 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,
int req_slots; int req_slots;
topology_state = drm_atomic_get_mst_topology_state(state, mgr); topology_state = drm_atomic_get_mst_topology_state(state, mgr);
if (topology_state == NULL) if (IS_ERR(topology_state))
return -ENOMEM; return PTR_ERR(topology_state);
port = drm_dp_get_validated_port_ref(mgr, port); port = drm_dp_get_validated_port_ref(mgr, port);
if (port == NULL) if (port == NULL)
...@@ -2580,8 +2580,8 @@ int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, ...@@ -2580,8 +2580,8 @@ int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state,
struct drm_dp_mst_topology_state *topology_state; struct drm_dp_mst_topology_state *topology_state;
topology_state = drm_atomic_get_mst_topology_state(state, mgr); topology_state = drm_atomic_get_mst_topology_state(state, mgr);
if (topology_state == NULL) if (IS_ERR(topology_state))
return -ENOMEM; return PTR_ERR(topology_state);
/* We cannot rely on port->vcpi.num_slots to update /* We cannot rely on port->vcpi.num_slots to update
* topology_state->avail_slots as the port may not exist if the parent * topology_state->avail_slots as the port may not exist if the parent
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment