Commit b3a39c79 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2019-04-24' of... 

Merge tag 'drm-intel-fixes-2019-04-24' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

A fix for display lanes calculation for BXT and a protection
to avoid enabling FEC without DSC.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190424215359.GA26100@intel.com
parents a0cecc23 f5c58ba1

drivers/gpu/drm/i915/intel_ddi.c

+4 −2
Original line number Diff line number Diff line
@@ -3862,14 +3862,16 @@ static int intel_ddi_compute_config(struct intel_encoder *encoder, 
		ret = intel_hdmi_compute_config(encoder, pipe_config, conn_state);

	else

		ret = intel_dp_compute_config(encoder, pipe_config, conn_state);

	if (ret)

		return ret;



	if (IS_GEN9_LP(dev_priv) && ret)

	if (IS_GEN9_LP(dev_priv))

		pipe_config->lane_lat_optim_mask =

			bxt_ddi_phy_calc_lane_lat_optim_mask(pipe_config->lane_count);



	intel_ddi_compute_min_voltage_level(dev_priv, pipe_config);



	return ret;

	return 0;



}

drivers/gpu/drm/i915/intel_dp.c

+3 −3
Original line number Diff line number Diff line
@@ -1886,6 +1886,9 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp, 
	int pipe_bpp;

	int ret;



	pipe_config->fec_enable = !intel_dp_is_edp(intel_dp) &&

		intel_dp_supports_fec(intel_dp, pipe_config);



	if (!intel_dp_supports_dsc(intel_dp, pipe_config))

		return -EINVAL;
@@ -2116,9 +2119,6 @@ intel_dp_compute_config(struct intel_encoder *encoder, 
	if (adjusted_mode->flags & DRM_MODE_FLAG_DBLCLK)

		return -EINVAL;



	pipe_config->fec_enable = !intel_dp_is_edp(intel_dp) &&

				  intel_dp_supports_fec(intel_dp, pipe_config);



	ret = intel_dp_compute_link_config(encoder, pipe_config, conn_state);

	if (ret < 0)

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE