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

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

Merge tag 'drm-intel-fixes-2013-06-11' of... 

Merge tag 'drm-intel-fixes-2013-06-11' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes

Daniel writes:
Just tiny regression fixes here:
- Two fixes to fix sdvo hotplug which broke in the hpd storm detection
  work.
- One fix to patch-up the sdvo lvds regression fixer from the last pull -
  we need to prefer the vbt mode over edid modes.

* tag 'drm-intel-fixes-2013-06-11' of git://people.freedesktop.org/~danvet/drm-intel:
  drm/i915: prefer VBT modes for SVDO-LVDS over EDID
  drm/i915: Enable hotplug interrupts after querying hw capabilities.
  drm/i915: Fix hotplug interrupt enabling for SDVOC
parents e6eea153 c3456fb3

drivers/gpu/drm/i915/intel_sdvo.c

+14 −10
Original line number Diff line number Diff line
@@ -1777,10 +1777,13 @@ static void intel_sdvo_get_lvds_modes(struct drm_connector *connector) 
	 * arranged in priority order.

	 */

	intel_ddc_get_modes(connector, &intel_sdvo->ddc);

	if (list_empty(&connector->probed_modes) == false)

		goto end;



	/* Fetch modes from VBT */

	/*

	 * Fetch modes from VBT. For SDVO prefer the VBT mode since some

	 * SDVO->LVDS transcoders can't cope with the EDID mode. Since

	 * drm_mode_probed_add adds the mode at the head of the list we add it

	 * last.

	 */

	if (dev_priv->sdvo_lvds_vbt_mode != NULL) {

		newmode = drm_mode_duplicate(connector->dev,

					     dev_priv->sdvo_lvds_vbt_mode);
@@ -1792,7 +1795,6 @@ static void intel_sdvo_get_lvds_modes(struct drm_connector *connector) 
		}

	}



end:

	list_for_each_entry(newmode, &connector->probed_modes, head) {

		if (newmode->type & DRM_MODE_TYPE_PREFERRED) {

			intel_sdvo->sdvo_lvds_fixed_mode =
@@ -2790,12 +2792,6 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob) 
			SDVOB_HOTPLUG_INT_STATUS_I915 : SDVOC_HOTPLUG_INT_STATUS_I915;

	}



	/* Only enable the hotplug irq if we need it, to work around noisy

	 * hotplug lines.

	 */

	if (intel_sdvo->hotplug_active)

		intel_encoder->hpd_pin = HPD_SDVO_B ? HPD_SDVO_B : HPD_SDVO_C;



	intel_encoder->compute_config = intel_sdvo_compute_config;

	intel_encoder->disable = intel_disable_sdvo;

	intel_encoder->mode_set = intel_sdvo_mode_set;
@@ -2814,6 +2810,14 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob) 
		goto err_output;

	}



	/* Only enable the hotplug irq if we need it, to work around noisy

	 * hotplug lines.

	 */

	if (intel_sdvo->hotplug_active) {

		intel_encoder->hpd_pin =

			intel_sdvo->is_sdvob ?  HPD_SDVO_B : HPD_SDVO_C;

	}



	/*

	 * Cloning SDVO with anything is often impossible, since the SDVO

	 * encoder can request a special input timing mode. And even if that's