Commit e8c963d6 authored by Charlene Liu's avatar Charlene Liu Committed by Alex Deucher
Browse files

drm/amd/display: refclock from bios firmwareInfoTable 



Signed-off-by: default avatarCharlene Liu <charlene.liu@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ece4f358

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

+9 −1
Original line number Diff line number Diff line
@@ -467,6 +467,8 @@ static bool construct(struct core_dc *dc, 
	else {

		/* Create BIOS parser */

		struct bp_init_data bp_init_data;

		struct firmware_info fw_info = { { 0 } };



		bp_init_data.ctx = dc_ctx;

		bp_init_data.bios = init_params->asic_id.atombios_base_address;
@@ -479,6 +481,12 @@ static bool construct(struct core_dc *dc, 
		}



		dc_ctx->created_bios = true;



		if (dc_ctx->dc_bios->funcs->get_firmware_info(

				dc_ctx->dc_bios, &fw_info) == BP_RESULT_OK) {

				dc->ctx->ref_clock_inKhz = fw_info.pll_info.crystal_frequency;

		} else

			ASSERT_CRITICAL(false);

		}



	/* Create I2C AUX */

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

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ bool dc_stream_set_cursor_position( 
			struct input_pixel_processor *ipp = pipe_ctx->ipp;

			struct dc_cursor_mi_param param = {

				.pixel_clk_khz = dc_stream->timing.pix_clk_khz,

				.ref_clk_khz = 48000,/*todo refclk*/

				.ref_clk_khz = core_dc->ctx->ref_clock_inKhz,

				.viewport_x_start = pipe_ctx->scl_data.viewport.x,

				.viewport_width = pipe_ctx->scl_data.viewport.width,

				.h_scale_ratio = pipe_ctx->scl_data.ratios.horz,

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

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ struct dc_context { 
	bool created_bios;

	struct gpio_service *gpio_service;

	struct i2caux *i2caux;

	unsigned int ref_clock_inKhz;

};

drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c

+6 −11
Original line number Diff line number Diff line
@@ -1230,17 +1230,12 @@ bool dce110_clk_src_construct( 
			goto unexpected_failure;

		}



		if (clk_src->ref_freq_khz == 48000) {

			calc_pll_cs_init_data_hdmi.

				min_override_input_pxl_clk_pll_freq_khz = 24000;

			calc_pll_cs_init_data_hdmi.

				max_override_input_pxl_clk_pll_freq_khz = 48000;

		} else if (clk_src->ref_freq_khz == 100000) {



		calc_pll_cs_init_data_hdmi.

				min_override_input_pxl_clk_pll_freq_khz = 25000;

				min_override_input_pxl_clk_pll_freq_khz = clk_src->ref_freq_khz/2;

		calc_pll_cs_init_data_hdmi.

				max_override_input_pxl_clk_pll_freq_khz = 50000;

		}

				max_override_input_pxl_clk_pll_freq_khz = clk_src->ref_freq_khz;





		if (!calc_pll_max_vco_construct(

				&clk_src->calc_pll_hdmi, &calc_pll_cs_init_data_hdmi)) {