Commit dbf5d3d0 authored by Alex Hung's avatar Alex Hung Committed by Alex Deucher
Browse files

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: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Fixes: 60e034f2 ("drm/amd/display: Revert "drm/amd/display: Use drm_connector in create_validate_stream_for_sink"")
Signed-off-by: default avatarAlex Hung <alex.hung@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3e094a28

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+4 −1
Original line number Diff line number Diff line
@@ -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 */