Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64245fa7 authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

drm/amd/display: Remove unnecessary fail labels in create_stream_for_sink 



Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent eb6c24a3

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

+5 −9
Original line number Diff line number Diff line
@@ -2384,12 +2384,12 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector, 


	if (aconnector == NULL) {

		DRM_ERROR("aconnector is NULL!\n");

		goto drm_connector_null;

		return stream;

	}



	if (dm_state == NULL) {

		DRM_ERROR("dm_state is NULL!\n");

		goto dm_state_null;

		return stream;

	}



	drm_connector = &aconnector->base;
@@ -2401,18 +2401,18 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector, 
		 */

		if (aconnector->mst_port) {

			dm_dp_mst_dc_sink_create(drm_connector);

			goto mst_dc_sink_create_done;

			return stream;

		}



		if (create_fake_sink(aconnector))

			goto stream_create_fail;

			return stream;

	}



	stream = dc_create_stream_for_sink(aconnector->dc_sink);



	if (stream == NULL) {

		DRM_ERROR("Failed to create stream for sink!\n");

		goto stream_create_fail;

		return stream;

	}



	list_for_each_entry(preferred_mode, &aconnector->base.modes, head) {
@@ -2450,10 +2450,6 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector, 
		drm_connector,

		aconnector->dc_sink);



stream_create_fail:

dm_state_null:

drm_connector_null:

mst_dc_sink_create_done:

	return stream;

}