Merge tag 'amd-drm-fixes-5.5-2020-01-08' of... (ac0c9d3f) · Commits · 戴 / test

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -142,7 +142,7 @@ int amdgpu_async_gfx_ring = 1;
		int amdgpu_mcbp = 0;
		int amdgpu_discovery = -1;
		int amdgpu_mes = 0;
		int amdgpu_noretry = 1;
		int amdgpu_noretry;
		int amdgpu_force_asic_type = -1;

		struct amdgpu_mgpu_info mgpu_info = {
		@@ -588,7 +588,7 @@ MODULE_PARM_DESC(mes,
		module_param_named(mes, amdgpu_mes, int, 0444);

		MODULE_PARM_DESC(noretry,
		"Disable retry faults (0 = retry enabled, 1 = retry disabled (default))");
		"Disable retry faults (0 = retry enabled (default), 1 = retry disabled)");
		module_param_named(noretry, amdgpu_noretry, int, 0644);

		/**
		@@ -1359,7 +1359,8 @@ static struct drm_driver kms_driver = {
		.driver_features =
		DRIVER_USE_AGP \| DRIVER_ATOMIC \|
		DRIVER_GEM \|
		DRIVER_RENDER \| DRIVER_MODESET \| DRIVER_SYNCOBJ,
		DRIVER_RENDER \| DRIVER_MODESET \| DRIVER_SYNCOBJ \|
		DRIVER_SYNCOBJ_TIMELINE,
		.load = amdgpu_driver_load_kms,
		.open = amdgpu_driver_open_kms,
		.postclose = amdgpu_driver_postclose_kms,

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

+23 −22

Original line number	Diff line number	Diff line
		@@ -3356,27 +3356,21 @@ get_output_color_space(const struct dc_crtc_timing *dc_crtc_timing)
		return color_space;
		}

		static void reduce_mode_colour_depth(struct dc_crtc_timing *timing_out)
		{
		if (timing_out->display_color_depth <= COLOR_DEPTH_888)
		return;

		timing_out->display_color_depth--;
		}

		static void adjust_colour_depth_from_display_info(struct dc_crtc_timing *timing_out,
		static bool adjust_colour_depth_from_display_info(
		struct dc_crtc_timing *timing_out,
		const struct drm_display_info *info)
		{
		enum dc_color_depth depth = timing_out->display_color_depth;
		int normalized_clk;
		if (timing_out->display_color_depth <= COLOR_DEPTH_888)
		return;
		do {
		normalized_clk = timing_out->pix_clk_100hz / 10;
		/* YCbCr 4:2:0 requires additional adjustment of 1/2 */
		if (timing_out->pixel_encoding == PIXEL_ENCODING_YCBCR420)
		normalized_clk /= 2;
		/* Adjusting pix clock following on HDMI spec based on colour depth */
		switch (timing_out->display_color_depth) {
		switch (depth) {
		case COLOR_DEPTH_888:
		break;
		case COLOR_DEPTH_101010:
		normalized_clk = (normalized_clk * 30) / 24;
		break;
		@@ -3387,14 +3381,15 @@ static void adjust_colour_depth_from_display_info(struct dc_crtc_timing *timing_
		normalized_clk = (normalized_clk * 48) / 24;
		break;
		default:
		return;
		/* The above depths are the only ones valid for HDMI. */
		return false;
		}
		if (normalized_clk <= info->max_tmds_clock)
		return;
		reduce_mode_colour_depth(timing_out);

		} while (timing_out->display_color_depth > COLOR_DEPTH_888);

		if (normalized_clk <= info->max_tmds_clock) {
		timing_out->display_color_depth = depth;
		return true;
		}
		} while (--depth > COLOR_DEPTH_666);
		return false;
		}

		static void fill_stream_properties_from_drm_display_mode(
		@@ -3474,9 +3469,15 @@ static void fill_stream_properties_from_drm_display_mode(

		stream->out_transfer_func->type = TF_TYPE_PREDEFINED;
		stream->out_transfer_func->tf = TRANSFER_FUNCTION_SRGB;
		if (stream->signal == SIGNAL_TYPE_HDMI_TYPE_A)
		if (stream->signal == SIGNAL_TYPE_HDMI_TYPE_A) {
		if (!adjust_colour_depth_from_display_info(timing_out, info) &&
		drm_mode_is_420_also(info, mode_in) &&
		timing_out->pixel_encoding != PIXEL_ENCODING_YCBCR420) {
		timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR420;
		adjust_colour_depth_from_display_info(timing_out, info);
		}
		}
		}

		static void fill_audio_info(struct audio_info *audio_info,
		const struct drm_connector *drm_connector,

Admin message