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

Commit 00b83070 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2015-12-03' of git://anongit.freedesktop.org/drm-intel into drm-fixes 

Another batch of drm/i915 fixes for v4.4, on top of the ones from
earlier this week. One timeout handling regression fix from Chris, and
backport of five patches from our -next to fix a power management
related HDMI hotplug regression.

* tag 'drm-intel-fixes-2015-12-03' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: take a power domain reference while checking the HDMI live status
  drm/i915: add MISSING_CASE to a few port/aux power domain helpers
  drm/i915/ddi: fix intel_display_port_aux_power_domain() after HDMI detect
  drm/i915: Introduce a gmbus power domain
  drm/i915: Clean up AUX power domain handling
  drm/i915: Check the timeout passed to i915_wait_request
parents c936a699 0f5a9be1

drivers/gpu/drm/i915/i915_debugfs.c

+2 −0
Original line number Diff line number Diff line
@@ -2734,6 +2734,8 @@ static const char *power_domain_str(enum intel_display_power_domain domain) 
		return "AUX_C";

	case POWER_DOMAIN_AUX_D:

		return "AUX_D";

	case POWER_DOMAIN_GMBUS:

		return "GMBUS";

	case POWER_DOMAIN_INIT:

		return "INIT";

	default:

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ enum intel_display_power_domain { 
	POWER_DOMAIN_AUX_B,

	POWER_DOMAIN_AUX_C,

	POWER_DOMAIN_AUX_D,

	POWER_DOMAIN_GMBUS,

	POWER_DOMAIN_INIT,



	POWER_DOMAIN_NUM,

drivers/gpu/drm/i915/i915_gem.c

+10 −2
Original line number Diff line number Diff line
@@ -1210,8 +1210,16 @@ int __i915_wait_request(struct drm_i915_gem_request *req, 
	if (i915_gem_request_completed(req, true))

		return 0;



	timeout_expire = timeout ?

		jiffies + nsecs_to_jiffies_timeout((u64)*timeout) : 0;

	timeout_expire = 0;

	if (timeout) {

		if (WARN_ON(*timeout < 0))

			return -EINVAL;



		if (*timeout == 0)

			return -ETIME;



		timeout_expire = jiffies + nsecs_to_jiffies_timeout(*timeout);

	}



	if (INTEL_INFO(dev_priv)->gen >= 6)

		gen6_rps_boost(dev_priv, rps, req->emitted_jiffies);

drivers/gpu/drm/i915/intel_display.c

+51 −1
Original line number Diff line number Diff line
@@ -5194,11 +5194,31 @@ static enum intel_display_power_domain port_to_power_domain(enum port port) 
	case PORT_E:

		return POWER_DOMAIN_PORT_DDI_E_2_LANES;

	default:

		WARN_ON_ONCE(1);

		MISSING_CASE(port);

		return POWER_DOMAIN_PORT_OTHER;

	}

}



static enum intel_display_power_domain port_to_aux_power_domain(enum port port)

{

	switch (port) {

	case PORT_A:

		return POWER_DOMAIN_AUX_A;

	case PORT_B:

		return POWER_DOMAIN_AUX_B;

	case PORT_C:

		return POWER_DOMAIN_AUX_C;

	case PORT_D:

		return POWER_DOMAIN_AUX_D;

	case PORT_E:

		/* FIXME: Check VBT for actual wiring of PORT E */

		return POWER_DOMAIN_AUX_D;

	default:

		MISSING_CASE(port);

		return POWER_DOMAIN_AUX_A;

	}

}



#define for_each_power_domain(domain, mask)				\

	for ((domain) = 0; (domain) < POWER_DOMAIN_NUM; (domain)++)	\

		if ((1 << (domain)) & (mask))
@@ -5230,6 +5250,36 @@ intel_display_port_power_domain(struct intel_encoder *intel_encoder) 
	}

}



enum intel_display_power_domain

intel_display_port_aux_power_domain(struct intel_encoder *intel_encoder)

{

	struct drm_device *dev = intel_encoder->base.dev;

	struct intel_digital_port *intel_dig_port;



	switch (intel_encoder->type) {

	case INTEL_OUTPUT_UNKNOWN:

	case INTEL_OUTPUT_HDMI:

		/*

		 * Only DDI platforms should ever use these output types.

		 * We can get here after the HDMI detect code has already set

		 * the type of the shared encoder. Since we can't be sure

		 * what's the status of the given connectors, play safe and

		 * run the DP detection too.

		 */

		WARN_ON_ONCE(!HAS_DDI(dev));

	case INTEL_OUTPUT_DISPLAYPORT:

	case INTEL_OUTPUT_EDP:

		intel_dig_port = enc_to_dig_port(&intel_encoder->base);

		return port_to_aux_power_domain(intel_dig_port->port);

	case INTEL_OUTPUT_DP_MST:

		intel_dig_port = enc_to_mst(&intel_encoder->base)->primary;

		return port_to_aux_power_domain(intel_dig_port->port);

	default:

		MISSING_CASE(intel_encoder->type);

		return POWER_DOMAIN_AUX_A;

	}

}



static unsigned long get_crtc_power_domains(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

drivers/gpu/drm/i915/intel_dp.c

+14 −34
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static void pps_lock(struct intel_dp *intel_dp) 
	 * See vlv_power_sequencer_reset() why we need

	 * a power domain reference here.

	 */

	power_domain = intel_display_port_power_domain(encoder);

	power_domain = intel_display_port_aux_power_domain(encoder);

	intel_display_power_get(dev_priv, power_domain);



	mutex_lock(&dev_priv->pps_mutex);
@@ -293,7 +293,7 @@ static void pps_unlock(struct intel_dp *intel_dp) 


	mutex_unlock(&dev_priv->pps_mutex);



	power_domain = intel_display_port_power_domain(encoder);

	power_domain = intel_display_port_aux_power_domain(encoder);

	intel_display_power_put(dev_priv, power_domain);

}
@@ -816,8 +816,6 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, 


	intel_dp_check_edp(intel_dp);



	intel_aux_display_runtime_get(dev_priv);



	/* Try to wait for any previous AUX channel activity */

	for (try = 0; try < 3; try++) {

		status = I915_READ_NOTRACE(ch_ctl);
@@ -926,7 +924,6 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, 
	ret = recv_bytes;

out:

	pm_qos_update_request(&dev_priv->pm_qos, PM_QOS_DEFAULT_VALUE);

	intel_aux_display_runtime_put(dev_priv);



	if (vdd)

		edp_panel_vdd_off(intel_dp, false);
@@ -1784,7 +1781,7 @@ static bool edp_panel_vdd_on(struct intel_dp *intel_dp) 
	if (edp_have_panel_vdd(intel_dp))

		return need_to_disable;



	power_domain = intel_display_port_power_domain(intel_encoder);

	power_domain = intel_display_port_aux_power_domain(intel_encoder);

	intel_display_power_get(dev_priv, power_domain);



	DRM_DEBUG_KMS("Turning eDP port %c VDD on\n",
@@ -1874,7 +1871,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp) 
	if ((pp & POWER_TARGET_ON) == 0)

		intel_dp->last_power_cycle = jiffies;



	power_domain = intel_display_port_power_domain(intel_encoder);

	power_domain = intel_display_port_aux_power_domain(intel_encoder);

	intel_display_power_put(dev_priv, power_domain);

}
@@ -2025,7 +2022,7 @@ static void edp_panel_off(struct intel_dp *intel_dp) 
	wait_panel_off(intel_dp);



	/* We got a reference when we enabled the VDD. */

	power_domain = intel_display_port_power_domain(intel_encoder);

	power_domain = intel_display_port_aux_power_domain(intel_encoder);

	intel_display_power_put(dev_priv, power_domain);

}
@@ -4765,26 +4762,6 @@ intel_dp_unset_edid(struct intel_dp *intel_dp) 
	intel_dp->has_audio = false;

}



static enum intel_display_power_domain

intel_dp_power_get(struct intel_dp *dp)

{

	struct intel_encoder *encoder = &dp_to_dig_port(dp)->base;

	enum intel_display_power_domain power_domain;



	power_domain = intel_display_port_power_domain(encoder);

	intel_display_power_get(to_i915(encoder->base.dev), power_domain);



	return power_domain;

}



static void

intel_dp_power_put(struct intel_dp *dp,

		   enum intel_display_power_domain power_domain)

{

	struct intel_encoder *encoder = &dp_to_dig_port(dp)->base;

	intel_display_power_put(to_i915(encoder->base.dev), power_domain);

}



static enum drm_connector_status

intel_dp_detect(struct drm_connector *connector, bool force)

{
@@ -4808,7 +4785,8 @@ intel_dp_detect(struct drm_connector *connector, bool force) 
		return connector_status_disconnected;

	}



	power_domain = intel_dp_power_get(intel_dp);

	power_domain = intel_display_port_aux_power_domain(intel_encoder);

	intel_display_power_get(to_i915(dev), power_domain);



	/* Can't disconnect eDP, but you can close the lid... */

	if (is_edp(intel_dp))
@@ -4853,7 +4831,7 @@ intel_dp_detect(struct drm_connector *connector, bool force) 
	}



out:

	intel_dp_power_put(intel_dp, power_domain);

	intel_display_power_put(to_i915(dev), power_domain);

	return status;

}
@@ -4862,6 +4840,7 @@ intel_dp_force(struct drm_connector *connector) 
{

	struct intel_dp *intel_dp = intel_attached_dp(connector);

	struct intel_encoder *intel_encoder = &dp_to_dig_port(intel_dp)->base;

	struct drm_i915_private *dev_priv = to_i915(intel_encoder->base.dev);

	enum intel_display_power_domain power_domain;



	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
@@ -4871,11 +4850,12 @@ intel_dp_force(struct drm_connector *connector) 
	if (connector->status != connector_status_connected)

		return;



	power_domain = intel_dp_power_get(intel_dp);

	power_domain = intel_display_port_aux_power_domain(intel_encoder);

	intel_display_power_get(dev_priv, power_domain);



	intel_dp_set_edid(intel_dp);



	intel_dp_power_put(intel_dp, power_domain);

	intel_display_power_put(dev_priv, power_domain);



	if (intel_encoder->type != INTEL_OUTPUT_EDP)

		intel_encoder->type = INTEL_OUTPUT_DISPLAYPORT;
@@ -5091,7 +5071,7 @@ static void intel_edp_panel_vdd_sanitize(struct intel_dp *intel_dp) 
	 * indefinitely.

	 */

	DRM_DEBUG_KMS("VDD left on by BIOS, adjusting state tracking\n");

	power_domain = intel_display_port_power_domain(&intel_dig_port->base);

	power_domain = intel_display_port_aux_power_domain(&intel_dig_port->base);

	intel_display_power_get(dev_priv, power_domain);



	edp_panel_vdd_schedule_off(intel_dp);
@@ -5173,7 +5153,7 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) 
		      port_name(intel_dig_port->port),

		      long_hpd ? "long" : "short");



	power_domain = intel_display_port_power_domain(intel_encoder);

	power_domain = intel_display_port_aux_power_domain(intel_encoder);

	intel_display_power_get(dev_priv, power_domain);



	if (long_hpd) {