From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: Re: [PATCH 08/19] drm/i915: get port power domain in connector detect Date: Wed, 19 Feb 2014 14:39:58 +0200 Message-ID: <1392813598.19792.1.camel@intelbox> References: <1392674540-10915-1-git-send-email-imre.deak@intel.com> <1392674540-10915-9-git-send-email-imre.deak@intel.com> <20140219123508.GD3852@intel.com> Reply-To: imre.deak@intel.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0338317656==" Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 72904FA166 for ; Wed, 19 Feb 2014 04:40:10 -0800 (PST) In-Reply-To: <20140219123508.GD3852@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Ville =?ISO-8859-1?Q?Syrj=E4l=E4?= Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org --===============0338317656== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-lrY5AN4SoPTxRR6ffbAG" --=-lrY5AN4SoPTxRR6ffbAG Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, 2014-02-19 at 14:35 +0200, Ville Syrj=C3=A4l=C3=A4 wrote: > On Tue, Feb 18, 2014 at 12:02:09AM +0200, Imre Deak wrote: > > The connector detect and get_mode handlers need to access the port > > specific HW blocks to read the EDID etc. Get/put the port power domains > > around these handlers. > >=20 > > Signed-off-by: Imre Deak > > --- > > drivers/gpu/drm/i915/intel_crt.c | 42 ++++++++++++++++++++++++++++++++= -------- > > drivers/gpu/drm/i915/intel_dp.c | 16 ++++++++++++--- > > drivers/gpu/drm/i915/intel_dsi.c | 13 ++++++++++++- >=20 > And what about HDMI? Good catch, I missed that one. --Imre > > 3 files changed, 59 insertions(+), 12 deletions(-) > >=20 > > diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/in= tel_crt.c > > index 9864aa1..2a38429 100644 > > --- a/drivers/gpu/drm/i915/intel_crt.c > > +++ b/drivers/gpu/drm/i915/intel_crt.c > > @@ -630,7 +630,10 @@ static enum drm_connector_status > > intel_crt_detect(struct drm_connector *connector, bool force) > > { > > struct drm_device *dev =3D connector->dev; > > + struct drm_i915_private *dev_priv =3D dev->dev_private; > > struct intel_crt *crt =3D intel_attached_crt(connector); > > + struct intel_encoder *intel_encoder =3D &crt->base; > > + enum intel_display_power_domain power_domain; > > enum drm_connector_status status; > > struct intel_load_detect_pipe tmp; > > =20 > > @@ -638,6 +641,11 @@ intel_crt_detect(struct drm_connector *connector, = bool force) > > connector->base.id, drm_get_connector_name(connector), > > force); > > =20 > > + power_domain =3D intel_display_port_power_domain(intel_encoder); > > + intel_display_power_get(dev_priv, power_domain); > > + > > + status =3D connector_status_connected; > > + > > if (I915_HAS_HOTPLUG(dev)) { > > /* We can not rely on the HPD pin always being correctly wired > > * up, for example many KVM do not pass it through, and so > > @@ -645,23 +653,27 @@ intel_crt_detect(struct drm_connector *connector,= bool force) > > */ > > if (intel_crt_detect_hotplug(connector)) { > > DRM_DEBUG_KMS("CRT detected via hotplug\n"); > > - return connector_status_connected; > > + goto out; > > } else > > DRM_DEBUG_KMS("CRT not detected via hotplug\n"); > > } > > =20 > > if (intel_crt_detect_ddc(connector)) > > - return connector_status_connected; > > + goto out; > > =20 > > /* Load detection is broken on HPD capable machines. Whoever wants a > > * broken monitor (without edid) to work behind a broken kvm (that fa= ils > > * to have the right resistors for HP detection) needs to fix this up= . > > * For now just bail out. */ > > - if (I915_HAS_HOTPLUG(dev)) > > - return connector_status_disconnected; > > + if (I915_HAS_HOTPLUG(dev)) { > > + status =3D connector_status_disconnected; > > + goto out; > > + } > > =20 > > - if (!force) > > - return connector->status; > > + if (!force) { > > + status =3D connector->status; > > + goto out; > > + } > > =20 > > /* for pre-945g platforms use load detect */ > > if (intel_get_load_detect_pipe(connector, NULL, &tmp)) { > > @@ -673,6 +685,9 @@ intel_crt_detect(struct drm_connector *connector, b= ool force) > > } else > > status =3D connector_status_unknown; > > =20 > > +out: > > + intel_display_power_put(dev_priv, power_domain); > > + > > return status; > > } > > =20 > > @@ -686,17 +701,28 @@ static int intel_crt_get_modes(struct drm_connect= or *connector) > > { > > struct drm_device *dev =3D connector->dev; > > struct drm_i915_private *dev_priv =3D dev->dev_private; > > + struct intel_crt *crt =3D intel_attached_crt(connector); > > + struct intel_encoder *intel_encoder =3D &crt->base; > > + enum intel_display_power_domain power_domain; > > int ret; > > struct i2c_adapter *i2c; > > =20 > > + power_domain =3D intel_display_port_power_domain(intel_encoder); > > + intel_display_power_get(dev_priv, power_domain); > > + > > i2c =3D intel_gmbus_get_adapter(dev_priv, dev_priv->vbt.crt_ddc_pin); > > ret =3D intel_crt_ddc_get_modes(connector, i2c); > > if (ret || !IS_G4X(dev)) > > - return ret; > > + goto out; > > =20 > > /* Try to probe digital port for output in DVI-I -> VGA mode. */ > > i2c =3D intel_gmbus_get_adapter(dev_priv, GMBUS_PORT_DPB); > > - return intel_crt_ddc_get_modes(connector, i2c); > > + ret =3D intel_crt_ddc_get_modes(connector, i2c); > > + > > +out: > > + intel_display_power_put(dev_priv, power_domain); > > + > > + return ret; > > } > > =20 > > static int intel_crt_set_property(struct drm_connector *connector, > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/int= el_dp.c > > index f53c95c..9c39425 100644 > > --- a/drivers/gpu/drm/i915/intel_dp.c > > +++ b/drivers/gpu/drm/i915/intel_dp.c > > @@ -3224,9 +3224,11 @@ intel_dp_detect(struct drm_connector *connector,= bool force) > > struct drm_device *dev =3D connector->dev; > > struct drm_i915_private *dev_priv =3D dev->dev_private; > > enum drm_connector_status status; > > + enum intel_display_power_domain power_domain; > > struct edid *edid =3D NULL; > > =20 > > - intel_runtime_pm_get(dev_priv); > > + power_domain =3D intel_display_port_power_domain(intel_encoder); > > + intel_display_power_get(dev_priv, power_domain); > > =20 > > DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", > > connector->base.id, drm_get_connector_name(connector)); > > @@ -3256,23 +3258,31 @@ intel_dp_detect(struct drm_connector *connector= , bool force) > > if (intel_encoder->type !=3D INTEL_OUTPUT_EDP) > > intel_encoder->type =3D INTEL_OUTPUT_DISPLAYPORT; > > status =3D connector_status_connected; > > - > > out: > > - intel_runtime_pm_put(dev_priv); > > + intel_display_power_put(dev_priv, power_domain); > > + > > return status; > > } > > =20 > > static int intel_dp_get_modes(struct drm_connector *connector) > > { > > struct intel_dp *intel_dp =3D intel_attached_dp(connector); > > + struct intel_digital_port *intel_dig_port =3D dp_to_dig_port(intel_dp= ); > > + struct intel_encoder *intel_encoder =3D &intel_dig_port->base; > > struct intel_connector *intel_connector =3D to_intel_connector(connec= tor); > > struct drm_device *dev =3D connector->dev; > > + struct drm_i915_private *dev_priv =3D dev->dev_private; > > + enum intel_display_power_domain power_domain; > > int ret; > > =20 > > /* We should parse the EDID data and find out if it has an audio sink > > */ > > =20 > > + power_domain =3D intel_display_port_power_domain(intel_encoder); > > + intel_display_power_get(dev_priv, power_domain); > > + > > ret =3D intel_dp_get_edid_modes(connector, &intel_dp->adapter); > > + intel_display_power_put(dev_priv, power_domain); > > if (ret) > > return ret; > > =20 > > diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/in= tel_dsi.c > > index 3ee1db1..63b95bbd 100644 > > --- a/drivers/gpu/drm/i915/intel_dsi.c > > +++ b/drivers/gpu/drm/i915/intel_dsi.c > > @@ -488,8 +488,19 @@ static enum drm_connector_status > > intel_dsi_detect(struct drm_connector *connector, bool force) > > { > > struct intel_dsi *intel_dsi =3D intel_attached_dsi(connector); > > + struct intel_encoder *intel_encoder =3D &intel_dsi->base; > > + enum intel_display_power_domain power_domain; > > + enum drm_connector_status connector_status; > > + struct drm_i915_private *dev_priv =3D intel_encoder->base.dev->dev_pr= ivate; > > + > > DRM_DEBUG_KMS("\n"); > > - return intel_dsi->dev.dev_ops->detect(&intel_dsi->dev); > > + power_domain =3D intel_display_port_power_domain(intel_encoder); > > + > > + intel_display_power_get(dev_priv, power_domain); > > + connector_status =3D intel_dsi->dev.dev_ops->detect(&intel_dsi->dev); > > + intel_display_power_put(dev_priv, power_domain); > > + > > + return connector_status; > > } > > =20 > > static int intel_dsi_get_modes(struct drm_connector *connector) > > --=20 > > 1.8.4 > >=20 > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx >=20 --=-lrY5AN4SoPTxRR6ffbAG Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQEcBAABAgAGBQJTBKYeAAoJEORIIAnNuWDFYIYH/RSDMiQM6iuIK6Sj/rLxONAn N3E6m00cnlT2X3UjENq+v4jpQWePzQgQk9GKuZdeAVPlsjytVDWxv7A7eirKH3du rX4TkhHCw8OrT3QRd7EE54uJgrOci507sS0ng6cqwOC5G18D1xvOtJ4OZJyZN9W5 iDSuhAj+BEPNzlifsYxvedhGC5/tCkIJiML9X8iNzVlwj1R5WBpcIq4hJUx2dcAe OurKxi3W5rfJAMtcYJlYuvytvR02PqHzFyGIhQbRuxMleYNSbTDxROvdGWGz6VgQ cGDo7z7emKTJlaP+ACHWV01M3T6VmM2aK6pcJ1v6reBYtBQ07Fp215Pr9SN8mcs= =UdGz -----END PGP SIGNATURE----- --=-lrY5AN4SoPTxRR6ffbAG-- --===============0338317656== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============0338317656==--