From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [Intel-gfx] [PATCH 2/5] drm/i915: Add has_hdmi_monitor to intel_hdmi Date: Mon, 14 Jan 2013 17:25:01 +0200 Message-ID: <20130114152501.GA3489@intel.com> References: <1358172910-7820-1-git-send-email-ville.syrjala@linux.intel.com> <1358172910-7820-3-git-send-email-ville.syrjala@linux.intel.com> <20130114150939.GA9361@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline In-Reply-To: <20130114150939.GA9361@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Daniel Vetter Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Mon, Jan 14, 2013 at 04:09:39PM +0100, Daniel Vetter wrote: > On Mon, Jan 14, 2013 at 04:15:07PM +0200, ville.syrjala@linux.intel.com w= rote: > > From: Ville Syrj=E4l=E4 > > = > > intel_hdmi.has_hdmi_sink is tied into the force audio property, so it > > doesn't seem like the correct way to detect HDMI monitors. Instead add > > a new has_hdmi_monitor member which simply tells whether a HDMI monitor > > was detected. > > = > > Not sure if this is the best way, or if we should just use has_hdmi_sink > > for the CEA-861 automatic color range property... At least the infoframe > > stuff already depends on has_hdmi_sink. > > = > > Signed-off-by: Ville Syrj=E4l=E4 > = > Imo it looks simpler if we just reuse the has_hdmi_sink bool. That already > controls infoframes and similar stuff, so if users would force dvi mode > this would automatically also disable all broadcast range magic (if that's > in the default value). Users could still override the broadcast stuff > explictly. OK. I can do that. > I guess it'd have been better if we have a a force-dvi master switch > outside of the audio property to control all things hdmi. But alas > ... Yeah it feels a bit weird that some audio prop controls it all. > -Daniel > = > > --- > > drivers/gpu/drm/i915/intel_drv.h | 1 + > > drivers/gpu/drm/i915/intel_hdmi.c | 6 ++++-- > > 2 files changed, 5 insertions(+), 2 deletions(-) > > = > > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/in= tel_drv.h > > index 4df47be..aed7478 100644 > > --- a/drivers/gpu/drm/i915/intel_drv.h > > +++ b/drivers/gpu/drm/i915/intel_drv.h > > @@ -344,6 +344,7 @@ struct intel_hdmi { > > int ddc_bus; > > uint32_t color_range; > > bool has_hdmi_sink; > > + bool has_hdmi_monitor; > > bool has_audio; > > enum hdmi_force_audio force_audio; > > void (*write_infoframe)(struct drm_encoder *encoder, > > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/i= ntel_hdmi.c > > index f194d75..e663dec 100644 > > --- a/drivers/gpu/drm/i915/intel_hdmi.c > > +++ b/drivers/gpu/drm/i915/intel_hdmi.c > > @@ -815,6 +815,7 @@ intel_hdmi_detect(struct drm_connector *connector, = bool force) > > return status; > > = > > intel_hdmi->has_hdmi_sink =3D false; > > + intel_hdmi->has_hdmi_monitor =3D false; > > intel_hdmi->has_audio =3D false; > > edid =3D drm_get_edid(connector, > > intel_gmbus_get_adapter(dev_priv, > > @@ -823,9 +824,10 @@ intel_hdmi_detect(struct drm_connector *connector,= bool force) > > if (edid) { > > if (edid->input & DRM_EDID_INPUT_DIGITAL) { > > status =3D connector_status_connected; > > + intel_hdmi->has_hdmi_monitor =3D > > + drm_detect_hdmi_monitor(edid); > > if (intel_hdmi->force_audio !=3D HDMI_AUDIO_OFF_DVI) > > - intel_hdmi->has_hdmi_sink =3D > > - drm_detect_hdmi_monitor(edid); > > + intel_hdmi->has_hdmi_sink =3D intel_hdmi->has_hdmi_monitor; > > intel_hdmi->has_audio =3D drm_detect_monitor_audio(edid); > > } > > kfree(edid); > > -- = > > 1.7.8.6 > > = > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > = > -- = > Daniel Vetter > Software Engineer, Intel Corporation > +41 (0) 79 365 57 48 - http://blog.ffwll.ch -- = Ville Syrj=E4l=E4 Intel OTC