summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Hung <alex.hung@amd.com>2023-12-01 06:25:28 -0700
committerAlex Deucher <alexander.deucher@amd.com>2023-12-06 15:22:35 -0500
commitdbf5d3d02987faa0eec3710dd687cd912362d7b5 (patch)
treee7ff39e4f4815babcda1b075f4a1e0e422d53ec9
parent3e094a2875260543ca74838decc0c995d3765096 (diff)
downloadlinux-stable-dbf5d3d02987faa0eec3710dd687cd912362d7b5.tar.gz
linux-stable-dbf5d3d02987faa0eec3710dd687cd912362d7b5.tar.bz2
linux-stable-dbf5d3d02987faa0eec3710dd687cd912362d7b5.zip
drm/amd/display: Check writeback connectors in create_validate_stream_for_sink
[WHY & HOW] This is to check connector type to avoid unhandled null pointer for writeback connectors. Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Fixes: 60e034f28600 ("drm/amd/display: Revert "drm/amd/display: Use drm_connector in create_validate_stream_for_sink"") Signed-off-by: Alex Hung <alex.hung@amd.com> Reviewed-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 46477192265e..315a747f9750 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -6678,6 +6678,9 @@ create_validate_stream_for_sink(struct amdgpu_dm_connector *aconnector,
break;
}
+ if (aconnector->base.connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
+ return stream;
+
dc_result = dc_validate_stream(adev->dm.dc, stream);
if (dc_result == DC_OK && stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST)
dc_result = dm_dp_mst_is_port_support_mode(aconnector, stream);
@@ -9426,7 +9429,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,
dm_new_crtc_state = to_dm_crtc_state(new_crtc_state);
acrtc = to_amdgpu_crtc(crtc);
connector = amdgpu_dm_find_first_crtc_matching_connector(state, crtc);
- if (connector && connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK)
+ if (connector)
aconnector = to_amdgpu_dm_connector(connector);
/* TODO This hack should go away */