Patch "drm/dp/mst: Handle errors from drm_atomic_get_private_obj_state() correctly" has been added to the 4.13-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
drm/dp/mst: Handle errors from drm_atomic_get_private_obj_state() correctly
to the 4.13-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-dp-mst-handle-errors-from-drm_atomic_get_private_obj_state-correctly.patch
and it can be found in the queue-4.13 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
56a91c4932bd038f3d1f6555ddc349ca4e6933b0Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <[email protected]>
Date: Wed, 12 Jul 2017 18:51:00 +0300
Subject: drm/dp/mst: Handle errors from drm_atomic_get_private_obj_state() correctly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Ville Syrjälä <[email protected]>
commit 56a91c4932bd038f3d1f6555ddc349ca4e6933b0 upstream.
On failure drm_atomic_get_private_obj_state() returns and error pointer instead of NULL. Adjust the checks in the callers to match.
--- drivers/gpu/drm/drm_dp_mst_topology.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_dp_mst_topology.c +4 -4
@@ -2540,8 +2540,8 @@ int drm_dp_atomic_find_vcpi_slots(structint 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 )
@@ -2580,8 +2580,8 @@ int drm_dp_atomic_release_vcpi_slots(strstruct 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
Patches currently in stable-queue which might be from [email protected] are
queue-4.13/drm-dp-mst-handle-errors-from-drm_atomic_get_private_obj_state-correctly.patch