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

Commit 1b0e19bb authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2017-09-27' of... 

Merge tag 'drm-intel-fixes-2017-09-27' of git://anongit.freedesktop.org/git/drm-intel into drm-fixes

drm/i915 fixes for 4.14-rc3

Couple fixes for stable:

- Fix ELD connector types and consequently audio on DP (Jani).
- Ignore HDMI on Port A and consequently fix an ops on i915 probe
  when VBT advertises HDMI on Port A (Jani).

And a small fix:

- That removes a reduntant hw_check on modeset. (Colin)

* tag 'drm-intel-fixes-2017-09-27' of git://anongit.freedesktop.org/git/drm-intel:
  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 9e66317d 2ba7d7e0

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_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,

drivers/gpu/drm/i915/intel_modes.c

+17 −0
Original line number Diff line number Diff line
@@ -30,6 +30,21 @@ 
#include "intel_drv.h"

#include "i915_drv.h"



static void intel_connector_update_eld_conn_type(struct drm_connector *connector)

{

	u8 conn_type;



	if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort ||

	    connector->connector_type == DRM_MODE_CONNECTOR_eDP) {

		conn_type = DRM_ELD_CONN_TYPE_DP;

	} else {

		conn_type = DRM_ELD_CONN_TYPE_HDMI;

	}



	connector->eld[DRM_ELD_SAD_COUNT_CONN_TYPE] &= ~DRM_ELD_CONN_TYPE_MASK;

	connector->eld[DRM_ELD_SAD_COUNT_CONN_TYPE] |= conn_type;

}



/**

 * intel_connector_update_modes - update connector from edid

 * @connector: DRM connector device to use
@@ -44,6 +59,8 @@ int intel_connector_update_modes(struct drm_connector *connector, 
	ret = drm_add_edid_modes(connector, edid);

	drm_edid_to_eld(connector, edid);



	intel_connector_update_eld_conn_type(connector);



	return ret;

}