Commit e5490464 authored by SivapiriyanKumarasamy's avatar SivapiriyanKumarasamy Committed by Alex Deucher
Browse files

drm/amd/display: fix dp_hdmi_max_pixel_clk units 



[Why]
We are incorrectly using dp_hdmi_max_pixel_clk because the units are not clear.

[How]
Rename to dp_hdmi_max_pixel_clk_in_khz, and change mode timing validation to use
the value correctly.

Signed-off-by: default avatarSivapiriyanKumarasamy <sivapiriyan.kumarasamy@amd.com>
Reviewed-by: default avatarAric Cyr <Aric.Cyr@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b62f95d1

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

+1 −1
Original line number Diff line number Diff line
@@ -2150,7 +2150,7 @@ static bool dp_active_dongle_validate_timing( 
		return false;

	}



	if (get_timing_pixel_clock_100hz(timing) > (dongle_caps->dp_hdmi_max_pixel_clk * 10))

	if (get_timing_pixel_clock_100hz(timing) > (dongle_caps->dp_hdmi_max_pixel_clk_in_khz * 10))

		return false;



	return true;

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

+3 −3
Original line number Diff line number Diff line
@@ -2304,8 +2304,8 @@ static void get_active_converter_info( 
					hdmi_caps = {.raw = det_caps[3] };

				union dwnstream_port_caps_byte2

					hdmi_color_caps = {.raw = det_caps[2] };

				link->dpcd_caps.dongle_caps.dp_hdmi_max_pixel_clk =

					det_caps[1] * 25000;

				link->dpcd_caps.dongle_caps.dp_hdmi_max_pixel_clk_in_khz =

					det_caps[1] * 2500;



				link->dpcd_caps.dongle_caps.is_dp_hdmi_s3d_converter =

					hdmi_caps.bits.FRAME_SEQ_TO_FRAME_PACK;
@@ -2322,7 +2322,7 @@ static void get_active_converter_info( 
					translate_dpcd_max_bpc(

						hdmi_color_caps.bits.MAX_BITS_PER_COLOR_COMPONENT);



				if (link->dpcd_caps.dongle_caps.dp_hdmi_max_pixel_clk != 0)

				if (link->dpcd_caps.dongle_caps.dp_hdmi_max_pixel_clk_in_khz != 0)

					link->dpcd_caps.dongle_caps.extendedCapValid = true;

			}

drivers/gpu/drm/amd/display/dc/dc_types.h

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ struct dc_dongle_caps { 
	bool is_dp_hdmi_ycbcr422_converter;

	bool is_dp_hdmi_ycbcr420_converter;

	uint32_t dp_hdmi_max_bpc;

	uint32_t dp_hdmi_max_pixel_clk;

	uint32_t dp_hdmi_max_pixel_clk_in_khz;

};

/* Scaling format */

enum scaling_transformation {

CRA Git | Maintained and supported by SUSTech CRA and CCSE