From mboxrd@z Thu Jan 1 00:00:00 1970 From: Zhenyu Wang Subject: Re: HDMI monitor hot remove handling Date: Mon, 14 Nov 2011 10:05:05 +0800 Message-ID: <20111114020505.GN22336@zhen-devel.sh.intel.com> References: <20111111050131.GA7073@localhost> <20111111051524.GA8882@localhost> <20111111052630.GG22336@zhen-devel.sh.intel.com> <20111111054038.GA11861@localhost> <20111111055703.GH22336@zhen-devel.sh.intel.com> <20111111063439.GA19914@localhost> <20111111064222.GJ22336@zhen-devel.sh.intel.com> <20111111070554.GA22299@localhost> <20111111071549.GL22336@zhen-devel.sh.intel.com> <20111111085041.GA4934@localhost> Reply-To: Zhenyu Wang Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1964157646==" Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 04FC39E8E2 for ; Sun, 13 Nov 2011 18:05:06 -0800 (PST) In-Reply-To: <20111111085041.GA4934@localhost> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Wu Fengguang Cc: "intel-gfx@lists.freedesktop..." List-Id: intel-gfx@lists.freedesktop.org --===============1964157646== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="/TUrtqMIkCP4YtJm" Content-Disposition: inline --/TUrtqMIkCP4YtJm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2011.11.11 16:50:41 +0800, Wu Fengguang wrote: > > > > I still think you should do those in hot_plug(), to call detect() f= or current > > > > status, write eld and set specific audio enable/disable bit for all= audio stuff. > > > > Just my sense, you may send RFC patch for other's comment.=20 >=20 > > yeah, mode_set() will only be in normal mode setting path and taking cu= rrent > > monitor's audio capability, but not on hot removal path. And if connect= or's DPMS off, > > does audio need to care? I think no, as user might still like to hear s= ound, right? ;) > >=20 > > So looks currently nobody cares for hot removal, you need to set that by > > yourself somewhere. >=20 > Zhenyu, according to your comments, here is the patch, tested OK on > HDMI :) DP not tested yet. Well, I don't think I suggested a new hook for hot removal. ;) You know that hot_plug() hook is intel encoder thing, which is the place I think you can do audio config stuff.=20 >=20 > This notifies the audio driver of the HDMI/DP monitor hot removal > event. >=20 > - clear SDVO_AUDIO_ENABLE/DP_AUDIO_OUTPUT_ENABLE > - clear ELD Valid bit >=20 > Signed-off-by: Wu Fengguang > --- > drivers/gpu/drm/drm_crtc_helper.c | 4 ++++ > drivers/gpu/drm/i915/intel_dp.c | 19 +++++++++++++++++++ > drivers/gpu/drm/i915/intel_drv.h | 4 ++++ > drivers/gpu/drm/i915/intel_hdmi.c | 17 +++++++++++++++++ > include/drm/drm_crtc.h | 1 + > 5 files changed, 45 insertions(+) >=20 > --- linux.orig/drivers/gpu/drm/i915/intel_dp.c 2011-11-11 16:42:58.000000= 000 +0800 > +++ linux/drivers/gpu/drm/i915/intel_dp.c 2011-11-11 16:42:59.000000000 += 0800 > @@ -1984,6 +1984,24 @@ intel_dp_detect(struct drm_connector *co > return connector_status_connected; > } > =20 > +static void intel_dp_hot_remove(struct drm_connector *connector) > +{ > + struct intel_dp *intel_dp =3D intel_attached_dp(connector); > + struct drm_device *dev =3D intel_dp->base.base.dev; > + struct drm_i915_private *dev_priv =3D dev->dev_private; > + struct drm_crtc *crtc =3D intel_dp->base.base.crtc; > + struct intel_crtc *intel_crtc =3D to_intel_crtc(crtc); > + > + intel_dp->DP &=3D ~DP_AUDIO_OUTPUT_ENABLE; > + I915_WRITE(intel_dp->output_reg, intel_dp->DP); > + POSTING_READ(intel_dp->output_reg); > + intel_wait_for_vblank(dev, intel_crtc->pipe); > + > + connector->eld[0] =3D 0; > + if (dev_priv->display.write_eld) > + dev_priv->display.write_eld(connector, crtc); > +} > + > static int intel_dp_get_modes(struct drm_connector *connector) > { > struct intel_dp *intel_dp =3D intel_attached_dp(connector); > @@ -2143,6 +2161,7 @@ static const struct drm_connector_funcs=20 > .detect =3D intel_dp_detect, > .fill_modes =3D drm_helper_probe_single_connector_modes, > .set_property =3D intel_dp_set_property, > + .hot_remove =3D intel_dp_hot_remove, > .destroy =3D intel_dp_destroy, > }; > =20 > --- linux.orig/drivers/gpu/drm/i915/intel_drv.h 2011-11-11 16:42:58.00000= 0000 +0800 > +++ linux/drivers/gpu/drm/i915/intel_drv.h 2011-11-11 16:42:59.000000000 = +0800 > @@ -382,6 +382,10 @@ extern void intel_fb_restore_mode(struct > extern void intel_init_clock_gating(struct drm_device *dev); > extern void intel_write_eld(struct drm_encoder *encoder, > struct drm_display_mode *mode); > +extern void intel_hotplug_status(struct drm_device *dev, > + struct drm_connector *connector, > + struct drm_crtc *crtc, > + enum drm_connector_status status); > extern void intel_cpt_verify_modeset(struct drm_device *dev, int pipe); > =20 > #endif /* __INTEL_DRV_H__ */ > --- linux.orig/drivers/gpu/drm/i915/intel_hdmi.c 2011-11-11 16:42:58.0000= 00000 +0800 > +++ linux/drivers/gpu/drm/i915/intel_hdmi.c 2011-11-11 16:42:59.000000000= +0800 > @@ -352,6 +352,22 @@ intel_hdmi_detect(struct drm_connector * > return status; > } > =20 > +static void intel_hdmi_hot_remove(struct drm_connector *connector) > +{ > + struct intel_hdmi *intel_hdmi =3D intel_attached_hdmi(connector); > + struct drm_i915_private *dev_priv =3D connector->dev->dev_private; > + u32 temp; > + > + temp =3D I915_READ(intel_hdmi->sdvox_reg); > + I915_WRITE(intel_hdmi->sdvox_reg, temp & ~SDVO_AUDIO_ENABLE); > + POSTING_READ(intel_hdmi->sdvox_reg); > + > + connector->eld[0] =3D 0; > + if (dev_priv->display.write_eld) > + dev_priv->display.write_eld(connector, > + intel_hdmi->base.base.crtc); > +} > + > static int intel_hdmi_get_modes(struct drm_connector *connector) > { > struct intel_hdmi *intel_hdmi =3D intel_attached_hdmi(connector); > @@ -461,6 +477,7 @@ static const struct drm_connector_funcs=20 > .detect =3D intel_hdmi_detect, > .fill_modes =3D drm_helper_probe_single_connector_modes, > .set_property =3D intel_hdmi_set_property, > + .hot_remove =3D intel_hdmi_hot_remove, > .destroy =3D intel_hdmi_destroy, > }; > =20 > --- linux.orig/drivers/gpu/drm/drm_crtc_helper.c 2011-11-11 16:42:58.0000= 00000 +0800 > +++ linux/drivers/gpu/drm/drm_crtc_helper.c 2011-11-11 16:42:59.000000000= +0800 > @@ -907,6 +907,10 @@ static void output_poll_execute(struct w > old_status, connector->status); > if (old_status !=3D connector->status) > changed =3D true; > + if (old_status =3D=3D connector_status_connected && > + connector->status =3D=3D connector_status_disconnected) > + connector->funcs->hot_remove(connector); > + > } > =20 > mutex_unlock(&dev->mode_config.mutex); > --- linux.orig/include/drm/drm_crtc.h 2011-11-11 16:42:58.000000000 +0800 > +++ linux/include/drm/drm_crtc.h 2011-11-11 16:42:59.000000000 +0800 > @@ -419,6 +419,7 @@ struct drm_connector_funcs { > int (*fill_modes)(struct drm_connector *connector, uint32_t max_width, = uint32_t max_height); > int (*set_property)(struct drm_connector *connector, struct drm_propert= y *property, > uint64_t val); > + void (*hot_remove)(struct drm_connector *connector); > void (*destroy)(struct drm_connector *connector); > void (*force)(struct drm_connector *connector); > }; --=20 Open Source Technology Center, Intel ltd. $gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827 --/TUrtqMIkCP4YtJm Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEARECAAYFAk7Ad1EACgkQsQQaM014GCdRkACfXCl87Nlg2MGZVxypU60nggne JsIAn0B3RFVK9Y/DEVR5BT7MZdbfN7ih =ibti -----END PGP SIGNATURE----- --/TUrtqMIkCP4YtJm-- --===============1964157646== 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 --===============1964157646==--