Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9dcf8a58 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "A bunch of radeon displayport mode setting fixes, and some misc i915
  fixes.

  There is one revert, the MST audio code in i915 was causing some
  oopses, so we've decided just to drop it until next kernel when we can
  fix it properly"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/amdgpu: fix DP mode validation
  drm/radeon: fix DP mode validation
  drm/i915: Bail out of pipe config compute loop on LPT
  drm/radeon: fix PLL sharing on DCE6.1 (v2)
  drm/radeon: fix DP link training issue with second 4K monitor
  Revert "drm/i915: start adding dp mst audio"
  drm/i915/bdw: Add missing delay during L3 SQC credit programming
  drm/i915/lvds: separate border enable readout from panel fitter
  drm/i915: Update CDCLK_FREQ register on BDW after changing cdclk frequency
parents dc0f2f87 e02aacb6

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

+2 −2
Original line number Diff line number Diff line
@@ -276,8 +276,8 @@ static int amdgpu_atombios_dp_get_dp_link_config(struct drm_connector *connector 
			}

		}

	} else {

		for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {

		for (i = 0; i < ARRAY_SIZE(link_rates) && link_rates[i] <= max_link_rate; i++) {

			for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {

				max_pix_clock = (lane_num * link_rates[i] * 8) / bpp;

				if (max_pix_clock >= pix_clock) {

					*dp_lanes = lane_num;

drivers/gpu/drm/i915/i915_debugfs.c

+0 −16
Original line number Diff line number Diff line
@@ -2872,20 +2872,6 @@ static void intel_dp_info(struct seq_file *m, 
		intel_panel_info(m, &intel_connector->panel);

}



static void intel_dp_mst_info(struct seq_file *m,

			  struct intel_connector *intel_connector)

{

	struct intel_encoder *intel_encoder = intel_connector->encoder;

	struct intel_dp_mst_encoder *intel_mst =

		enc_to_mst(&intel_encoder->base);

	struct intel_digital_port *intel_dig_port = intel_mst->primary;

	struct intel_dp *intel_dp = &intel_dig_port->dp;

	bool has_audio = drm_dp_mst_port_has_audio(&intel_dp->mst_mgr,

					intel_connector->port);



	seq_printf(m, "\taudio support: %s\n", yesno(has_audio));

}



static void intel_hdmi_info(struct seq_file *m,

			    struct intel_connector *intel_connector)

{
@@ -2929,8 +2915,6 @@ static void intel_connector_info(struct seq_file *m, 
			intel_hdmi_info(m, intel_connector);

		else if (intel_encoder->type == INTEL_OUTPUT_LVDS)

			intel_lvds_info(m, intel_connector);

		else if (intel_encoder->type == INTEL_OUTPUT_DP_MST)

			intel_dp_mst_info(m, intel_connector);

	}



	seq_printf(m, "\tmodes:\n");

drivers/gpu/drm/i915/i915_reg.h

+2 −0
Original line number Diff line number Diff line
@@ -7444,6 +7444,8 @@ enum skl_disp_power_wells { 
#define  TRANS_CLK_SEL_DISABLED		(0x0<<29)

#define  TRANS_CLK_SEL_PORT(x)		(((x)+1)<<29)



#define CDCLK_FREQ			_MMIO(0x46200)



#define _TRANSA_MSA_MISC		0x60410

#define _TRANSB_MSA_MISC		0x61410

#define _TRANSC_MSA_MISC		0x62410

drivers/gpu/drm/i915/intel_audio.c

+3 −6
Original line number Diff line number Diff line
@@ -262,8 +262,7 @@ static void hsw_audio_codec_disable(struct intel_encoder *encoder) 
	tmp |= AUD_CONFIG_N_PROG_ENABLE;

	tmp &= ~AUD_CONFIG_UPPER_N_MASK;

	tmp &= ~AUD_CONFIG_LOWER_N_MASK;

	if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT) ||

	    intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DP_MST))

	if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT))

		tmp |= AUD_CONFIG_N_VALUE_INDEX;

	I915_WRITE(HSW_AUD_CFG(pipe), tmp);
@@ -476,8 +475,7 @@ static void ilk_audio_codec_enable(struct drm_connector *connector, 
	tmp &= ~AUD_CONFIG_N_VALUE_INDEX;

	tmp &= ~AUD_CONFIG_N_PROG_ENABLE;

	tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK;

	if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT) ||

	    intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DP_MST))

	if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT))

		tmp |= AUD_CONFIG_N_VALUE_INDEX;

	else

		tmp |= audio_config_hdmi_pixel_clock(adjusted_mode);
@@ -515,8 +513,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder) 


	/* ELD Conn_Type */

	connector->eld[5] &= ~(3 << 2);

	if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT) ||

	    intel_pipe_has_type(crtc, INTEL_OUTPUT_DP_MST))

	if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT))

		connector->eld[5] |= (1 << 2);



	connector->eld[6] = drm_av_sync_delay(connector, adjusted_mode) / 2;

drivers/gpu/drm/i915/intel_crt.c

+7 −1
Original line number Diff line number Diff line
@@ -257,8 +257,14 @@ static bool intel_crt_compute_config(struct intel_encoder *encoder, 
		pipe_config->has_pch_encoder = true;



	/* LPT FDI RX only supports 8bpc. */

	if (HAS_PCH_LPT(dev))

	if (HAS_PCH_LPT(dev)) {

		if (pipe_config->bw_constrained && pipe_config->pipe_bpp < 24) {

			DRM_DEBUG_KMS("LPT only supports 24bpp\n");

			return false;

		}



		pipe_config->pipe_bpp = 24;

	}



	/* FDI must always be 2.7 GHz */

	if (HAS_DDI(dev)) {