summaryrefslogtreecommitdiffstats
path: root/include/drm/display
diff options
context:
space:
mode:
authorWayne Lin <Wayne.Lin@amd.com>2024-03-07 07:29:57 +0100
committerAlex Deucher <alexander.deucher@amd.com>2024-05-21 19:06:04 +0200
commit8a0a7b98d4b6eeeab337ec25daa4bc0a5e710a15 (patch)
treea5f5b701f1d9f101a659bf9009c5788cbde4aeb9 /include/drm/display
parentdrm/bridge: tc358767: Enable FRMSYNC timing generator (diff)
downloadlinux-8a0a7b98d4b6eeeab337ec25daa4bc0a5e710a15.tar.xz
linux-8a0a7b98d4b6eeeab337ec25daa4bc0a5e710a15.zip
drm/mst: Fix NULL pointer dereference at drm_dp_add_payload_part2
[Why] Commit: - commit 5aa1dfcdf0a4 ("drm/mst: Refactor the flow for payload allocation/removement") accidently overwrite the commit - commit 54d217406afe ("drm: use mgr->dev in drm_dbg_kms in drm_dp_add_payload_part2") which cause regression. [How] Recover the original NULL fix and remove the unnecessary input parameter 'state' for drm_dp_add_payload_part2(). Fixes: 5aa1dfcdf0a4 ("drm/mst: Refactor the flow for payload allocation/removement") Reported-by: Leon Weiß <leon.weiss@ruhr-uni-bochum.de> Link: https://lore.kernel.org/r/38c253ea42072cc825dc969ac4e6b9b600371cc8.camel@ruhr-uni-bochum.de/ Cc: lyude@redhat.com Cc: imre.deak@intel.com Cc: stable@vger.kernel.org Cc: regressions@lists.linux.dev Reviewed-by: Harry Wentland <harry.wentland@amd.com> Acked-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Wayne Lin <Wayne.Lin@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240307062957.2323620-1-Wayne.Lin@amd.com
Diffstat (limited to 'include/drm/display')
-rw-r--r--include/drm/display/drm_dp_mst_helper.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/drm/display/drm_dp_mst_helper.h b/include/drm/display/drm_dp_mst_helper.h
index 3546b58a121b..cfe096389d94 100644
--- a/include/drm/display/drm_dp_mst_helper.h
+++ b/include/drm/display/drm_dp_mst_helper.h
@@ -871,7 +871,6 @@ int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr *mgr,
struct drm_dp_mst_topology_state *mst_state,
struct drm_dp_mst_atomic_payload *payload);
int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
- struct drm_atomic_state *state,
struct drm_dp_mst_atomic_payload *payload);
void drm_dp_remove_payload_part1(struct drm_dp_mst_topology_mgr *mgr,
struct drm_dp_mst_topology_state *mst_state,