Commit 3998e684 authored Jun 25, 2019 by Julian Parkin Committed by Greg Kroah-Hartman Aug 16, 2019

drm/amd/display: Fix dc_create failure handling and 666 color depths



[ Upstream commit 0905f32977268149f06e3ce6ea4bd6d374dd891f ]

[Why]
It is possible (but very unlikely) that constructing dc fails
before current_state is created.

We support 666 color depth in some scenarios, but this
isn't handled in get_norm_pix_clk. It uses exactly the
same pixel clock as the 888 case.

[How]
Check for non null current_state before destructing.

Add case for 666 color depth to get_norm_pix_clk to
avoid assertion.

Signed-off-by: Julian Parkin <julian.parkin@amd.com>
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent e7a8a794

drivers/gpu/drm/amd/display/dc/core/dc.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -462,8 +462,10 @@ void dc_link_set_test_pattern(struct dc_link *link,

		static void destruct(struct dc *dc)
		{
		if (dc->current_state) {
		dc_release_state(dc->current_state);
		dc->current_state = NULL;
		}

		destroy_links(dc);

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1872,6 +1872,7 @@ static int get_norm_pix_clk(const struct dc_crtc_timing *timing)
		pix_clk /= 2;
		if (timing->pixel_encoding != PIXEL_ENCODING_YCBCR422) {
		switch (timing->display_color_depth) {
		case COLOR_DEPTH_666:
		case COLOR_DEPTH_888:
		normalized_pix_clk = pix_clk;
		break;