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

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

Merge tag 'drm-fixes-for-v4.14-rc4' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "Some i915 fixes from the last two weeks (as they were on a strange
  base and I just waited for rc3), also a single sun4i hdmi fix"

* tag 'drm-fixes-for-v4.14-rc4' of git://people.freedesktop.org/~airlied/linux:
  drm/i915/glk: Fix DMC/DC state idleness calculation
  drm/i915/cnl: Reprogram DMC firmware after S3/S4 resume
  drm/i915: Fix DDI PHY init if it was already on
  drm/sun4i: hdmi: Disable clks in bind function error path and unbind function
  drm/i915/bios: ignore HDMI on port A
  drm/i915: remove redundant variable hw_check
  drm/i915: always update ELD connector type after get modes
parents 27efed3e baf7c1f7

drivers/gpu/drm/i915/intel_audio.c

+0 −5
Original line number Diff line number Diff line
@@ -606,11 +606,6 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder, 
			 connector->encoder->base.id,

			 connector->encoder->name);



	/* ELD Conn_Type */

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

	if (intel_crtc_has_dp_encoder(crtc_state))

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



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



	if (dev_priv->display.audio_codec_enable)

drivers/gpu/drm/i915/intel_bios.c

+7 −0
Original line number Diff line number Diff line
@@ -1163,6 +1163,13 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, 
	is_hdmi = is_dvi && (child->common.device_type & DEVICE_TYPE_NOT_HDMI_OUTPUT) == 0;

	is_edp = is_dp && (child->common.device_type & DEVICE_TYPE_INTERNAL_CONNECTOR);



	if (port == PORT_A && is_dvi) {

		DRM_DEBUG_KMS("VBT claims port A supports DVI%s, ignoring\n",

			      is_hdmi ? "/HDMI" : "");

		is_dvi = false;

		is_hdmi = false;

	}



	info->supports_dvi = is_dvi;

	info->supports_hdmi = is_hdmi;

	info->supports_dp = is_dp;

drivers/gpu/drm/i915/intel_csr.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static void gen9_set_dc_state_debugmask(struct drm_i915_private *dev_priv) 


	mask = DC_STATE_DEBUG_MASK_MEMORY_UP;



	if (IS_BROXTON(dev_priv))

	if (IS_GEN9_LP(dev_priv))

		mask |= DC_STATE_DEBUG_MASK_CORES;



	/* The below bit doesn't need to be cleared ever afterwards */

drivers/gpu/drm/i915/intel_ddi.c

+2 −1
Original line number Diff line number Diff line
@@ -1655,7 +1655,8 @@ bool intel_ddi_get_hw_state(struct intel_encoder *encoder, 
out:

	if (ret && IS_GEN9_LP(dev_priv)) {

		tmp = I915_READ(BXT_PHY_CTL(port));

		if ((tmp & (BXT_PHY_LANE_POWERDOWN_ACK |

		if ((tmp & (BXT_PHY_CMNLANE_POWERDOWN_ACK |

			    BXT_PHY_LANE_POWERDOWN_ACK |

			    BXT_PHY_LANE_ENABLED)) != BXT_PHY_LANE_ENABLED)

			DRM_ERROR("Port %c enabled but PHY powered down? "

				  "(PHY_CTL %08x)\n", port_name(port), tmp);

drivers/gpu/drm/i915/intel_display.c

+0 −2
Original line number Diff line number Diff line
@@ -12359,7 +12359,6 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state) 
	struct drm_crtc_state *old_crtc_state, *new_crtc_state;

	struct drm_crtc *crtc;

	struct intel_crtc_state *intel_cstate;

	bool hw_check = intel_state->modeset;

	u64 put_domains[I915_MAX_PIPES] = {};

	unsigned crtc_vblank_mask = 0;

	int i;
@@ -12376,7 +12375,6 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state) 


		if (needs_modeset(new_crtc_state) ||

		    to_intel_crtc_state(new_crtc_state)->update_pipe) {

			hw_check = true;



			put_domains[to_intel_crtc(crtc)->pipe] =

				modeset_get_crtc_power_domains(crtc,