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

Commit 07f4cf95 authored by Nicholas Kazlauskas's avatar Nicholas Kazlauskas Committed by Greg Kroah-Hartman
Browse files

drm/amd/display: Guard against null stream_state in set_crc_source 



[ Upstream commit f41a895026b8cb6f765190de7d2e7bc3ccbbd183 ]

[Why]

The igt@kms_plane@pixel-format-pipe tests can create a sequence where
stream_state is NULL during amdgpu_dm_crtc_set_crc_source which results
in a null pointer dereference.

[How]

Guard against stream_state being NULL before accessing its fields. This
doesn't fix the root cause of the issue so a DRM_ERROR is generated
to still fail the tests.

Signed-off-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Reviewed-by: default avatarDavid Francis <David.Francis@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 414dbd6c

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

+5 −0
Original line number Diff line number Diff line
@@ -60,6 +60,11 @@ int amdgpu_dm_crtc_set_crc_source(struct drm_crtc *crtc, const char *src_name, 
		return -EINVAL;

	}



	if (!stream_state) {

		DRM_ERROR("No stream state for CRTC%d\n", crtc->index);

		return -EINVAL;

	}



	/* When enabling CRC, we should also disable dithering. */

	if (source == AMDGPU_DM_PIPE_CRC_SOURCE_AUTO) {

		if (dc_stream_configure_crc(stream_state->ctx->dc,