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

Commit ac9b8236 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Jani Nikula
Browse files

drm/i915: Introduce a gmbus power domain 



Currently the gmbus code uses intel_aux_display_runtime_get/put in an
effort to make sure the hardware is powered up sufficiently for gmbus.
That function only takes the runtime PM reference which on VLV/CHV/BXT
is not enough. We need the disp2d/pipe-a well on VLV/CHV and power well
2 on BXT. So add a new power domnain for gmbus and kill off the now
unused intel_aux_display_runtime_get/put. And change
intel_hdmi_set_edid() to use the gmbus power domain too since that's all
we need there.

Also toss in a BUILD_BUG_ON() to catch problems if we run out of
bits for power domains. We're already really close to the limit...

[Patrik: Add gmbus string to debugfs output]

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarPatrik Jakobsson <patrik.jakobsson@linux.intel.com>
[Cherry-picked from drm-intel-next-queued f0ab43e6 (Imre)]
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1448643329-18675-3-git-send-email-imre.deak@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent a781ce79

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/intel_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -1379,8 +1379,6 @@ void intel_display_power_get(struct drm_i915_private *dev_priv, 
			     enum intel_display_power_domain domain);

void intel_display_power_put(struct drm_i915_private *dev_priv,

			     enum intel_display_power_domain domain);

void intel_aux_display_runtime_get(struct drm_i915_private *dev_priv);

void intel_aux_display_runtime_put(struct drm_i915_private *dev_priv);

void intel_runtime_pm_get(struct drm_i915_private *dev_priv);

void intel_runtime_pm_get_noresume(struct drm_i915_private *dev_priv);

void intel_runtime_pm_put(struct drm_i915_private *dev_priv);

drivers/gpu/drm/i915/intel_hdmi.c

+2 −6
Original line number Diff line number Diff line
@@ -1335,21 +1335,17 @@ intel_hdmi_set_edid(struct drm_connector *connector, bool force) 
{

	struct drm_i915_private *dev_priv = to_i915(connector->dev);

	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);

	struct intel_encoder *intel_encoder =

		&hdmi_to_dig_port(intel_hdmi)->base;

	enum intel_display_power_domain power_domain;

	struct edid *edid = NULL;

	bool connected = false;



	power_domain = intel_display_port_power_domain(intel_encoder);

	intel_display_power_get(dev_priv, power_domain);

	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);



	if (force)

		edid = drm_get_edid(connector,

				    intel_gmbus_get_adapter(dev_priv,

				    intel_hdmi->ddc_bus));



	intel_display_power_put(dev_priv, power_domain);

	intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS);



	to_intel_connector(connector)->detect_edid = edid;

	if (edid && edid->input & DRM_EDID_INPUT_DIGITAL) {

drivers/gpu/drm/i915/intel_i2c.c

+4 −2
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ gmbus_xfer(struct i2c_adapter *adapter, 
	int i = 0, inc, try = 0;

	int ret = 0;



	intel_aux_display_runtime_get(dev_priv);

	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);

	mutex_lock(&dev_priv->gmbus_mutex);



	if (bus->force_bit) {
@@ -595,7 +595,9 @@ gmbus_xfer(struct i2c_adapter *adapter, 


out:

	mutex_unlock(&dev_priv->gmbus_mutex);

	intel_aux_display_runtime_put(dev_priv);



	intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS);



	return ret;

}