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

Merge tag 'drm-intel-fixes-2019-08-22' of... 

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

 into drm-fixes

drm/i915 fixes for v5.3-rc6:
- fix hardware state readout for 10 bpc HDMI

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87sgptd114.fsf@intel.com
parents 1e85e6ca ed19e303

drivers/gpu/drm/i915/display/intel_ddi.c

+2 −2
Original line number Diff line number Diff line
@@ -1465,8 +1465,8 @@ static void ddi_dotclock_get(struct intel_crtc_state *pipe_config) 
	else if (intel_crtc_has_dp_encoder(pipe_config))

		dotclock = intel_dotclock_calculate(pipe_config->port_clock,

						    &pipe_config->dp_m_n);

	else if (pipe_config->has_hdmi_sink && pipe_config->pipe_bpp == 36)

		dotclock = pipe_config->port_clock * 2 / 3;

	else if (pipe_config->has_hdmi_sink && pipe_config->pipe_bpp > 24)

		dotclock = pipe_config->port_clock * 24 / pipe_config->pipe_bpp;

	else

		dotclock = pipe_config->port_clock;

drivers/gpu/drm/i915/intel_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -829,7 +829,7 @@ struct intel_crtc_state { 


	/*

	 * Frequence the dpll for the port should run at. Differs from the

	 * adjusted dotclock e.g. for DP or 12bpc hdmi mode. This is also

	 * adjusted dotclock e.g. for DP or 10/12bpc hdmi mode. This is also

	 * already multiplied by pixel_multiplier.

	 */

	int port_clock;

CRA Git | Maintained and supported by SUSTech CRA and CCSE