From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rodrigo Vivi Subject: Re: [PATCH 3/6] drm/i915: Make intel_digital_port_connected global Date: Wed, 09 Sep 2015 18:57:38 +0000 Message-ID: References: <1441373176-22302-1-git-send-email-sonika.jindal@intel.com> <1441373176-22302-4-git-send-email-sonika.jindal@intel.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1972158717==" Return-path: Received: from mail-ig0-f178.google.com (mail-ig0-f178.google.com [209.85.213.178]) by gabe.freedesktop.org (Postfix) with ESMTPS id AD9256E27E for ; Wed, 9 Sep 2015 11:57:48 -0700 (PDT) Received: by igxx6 with SMTP id x6so21707039igx.1 for ; Wed, 09 Sep 2015 11:57:48 -0700 (PDT) In-Reply-To: <1441373176-22302-4-git-send-email-sonika.jindal@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Sonika Jindal , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org --===============1972158717== Content-Type: multipart/alternative; boundary=089e01184c180439c8051f550fd0 --089e01184c180439c8051f550fd0 Content-Type: text/plain; charset=UTF-8 On Fri, Sep 4, 2015 at 6:37 AM Sonika Jindal wrote: > This is to allow live status check for HDMI as well. > Also, using intel_encoder->hpd_pin to check the live status > for bxt because of BXT A0/A1 WA for HPD pins. > This is actually the only thing this patch does... So please use separated patch for this.... But the global intel_digital_port connected can be done in the same patch that uses it actually... > > Signed-off-by: Sonika Jindal > --- > drivers/gpu/drm/i915/intel_dp.c | 11 +++++++---- > drivers/gpu/drm/i915/intel_drv.h | 2 ++ > 2 files changed, 9 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c > b/drivers/gpu/drm/i915/intel_dp.c > index 796f930..fedf6d1 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -4663,11 +4663,14 @@ static bool vlv_digital_port_connected(struct > drm_i915_private *dev_priv, > } > > static bool bxt_digital_port_connected(struct drm_i915_private *dev_priv, > - struct intel_digital_port *port) > + struct intel_digital_port > *intel_dig_port) > { > + struct intel_encoder *intel_encoder = &intel_dig_port->base; > + enum port port; > u32 bit; > > - switch (port->port) { > + intel_hpd_pin_to_port(intel_encoder->hpd_pin, &port); > + switch (port) { > case PORT_A: > bit = BXT_DE_PORT_HP_DDIA; > break; > @@ -4678,7 +4681,7 @@ static bool bxt_digital_port_connected(struct > drm_i915_private *dev_priv, > bit = BXT_DE_PORT_HP_DDIC; > break; > default: > - MISSING_CASE(port->port); > + MISSING_CASE(port); > return false; > } > > @@ -4692,7 +4695,7 @@ static bool bxt_digital_port_connected(struct > drm_i915_private *dev_priv, > * > * Return %true if @port is connected, %false otherwise. > */ > -static bool intel_digital_port_connected(struct drm_i915_private > *dev_priv, > +bool intel_digital_port_connected(struct drm_i915_private *dev_priv, > struct intel_digital_port *port) > { > if (HAS_PCH_IBX(dev_priv)) > diff --git a/drivers/gpu/drm/i915/intel_drv.h > b/drivers/gpu/drm/i915/intel_drv.h > index b6c2c20..ac6d748 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -1210,6 +1210,8 @@ void intel_edp_drrs_disable(struct intel_dp > *intel_dp); > void intel_edp_drrs_invalidate(struct drm_device *dev, > unsigned frontbuffer_bits); > void intel_edp_drrs_flush(struct drm_device *dev, unsigned > frontbuffer_bits); > +bool intel_digital_port_connected(struct drm_i915_private *dev_priv, > + struct intel_digital_port *port); > > /* intel_dp_mst.c */ > int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, > int conn_id); > -- > 1.7.10.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > --089e01184c180439c8051f550fd0 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable


On Fri= , Sep 4, 2015 at 6:37 AM Sonika Jindal <sonika.jindal@intel.com> wrote:
This is to allow live status check for HDMI as well.
Also, using intel_encoder->hpd_pin to check the live status
for bxt because of BXT A0/A1 WA for HPD pins.

This is actually the only thing this patch does... So please use sep= arated patch for this....=C2=A0

But the global int= el_digital_port connected can be done in the same patch that uses it actual= ly...
=C2=A0

Signed-off-by: Sonika Jindal <sonika.jindal@intel.com>
---
=C2=A0drivers/gpu/drm/i915/intel_dp.c=C2=A0 |=C2=A0 =C2=A011 +++++++---- =C2=A0drivers/gpu/drm/i915/intel_drv.h |=C2=A0 =C2=A0 2 ++
=C2=A02 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_d= p.c
index 796f930..fedf6d1 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4663,11 +4663,14 @@ static bool vlv_digital_port_connected(struct drm_i= 915_private *dev_priv,
=C2=A0}

=C2=A0static bool bxt_digital_port_connected(struct drm_i915_private *dev_p= riv,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 struct intel_di= gital_port *port)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 struct intel_di= gital_port *intel_dig_port)
=C2=A0{
+=C2=A0 =C2=A0 =C2=A0 =C2=A0struct intel_encoder *intel_encoder =3D &in= tel_dig_port->base;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0enum port port;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 u32 bit;

-=C2=A0 =C2=A0 =C2=A0 =C2=A0switch (port->port) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0intel_hpd_pin_to_port(intel_encoder->hpd_pin= , &port);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0switch (port) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 case PORT_A:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 bit =3D BXT_DE_PORT= _HP_DDIA;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;
@@ -4678,7 +4681,7 @@ static bool bxt_digital_port_connected(struct drm_i91= 5_private *dev_priv,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 bit =3D BXT_DE_PORT= _HP_DDIC;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 default:
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0MISSING_CASE(port-&= gt;port);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0MISSING_CASE(port);=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return false;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 }

@@ -4692,7 +4695,7 @@ static bool bxt_digital_port_connected(struct drm_i91= 5_private *dev_priv,
=C2=A0 *
=C2=A0 * Return %true if @port is connected, %false otherwise.
=C2=A0 */
-static bool intel_digital_port_connected(struct drm_i915_private *dev_priv= ,
+bool intel_digital_port_connected(struct drm_i915_private *dev_priv,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0st= ruct intel_digital_port *port)
=C2=A0{
=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (HAS_PCH_IBX(dev_priv))
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_= drv.h
index b6c2c20..ac6d748 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1210,6 +1210,8 @@ void intel_edp_drrs_disable(struct intel_dp *intel_dp= );
=C2=A0void intel_edp_drrs_invalidate(struct drm_device *dev,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 unsigned frontbuffe= r_bits);
=C2=A0void intel_edp_drrs_flush(struct drm_device *dev, unsigned frontbuffe= r_bits);
+bool intel_digital_port_connected(struct drm_i915_private *dev_priv,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 struct i= ntel_digital_port *port);

=C2=A0/* intel_dp_mst.c */
=C2=A0int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_po= rt, int conn_id);
--
1.7.10.4

_______________________________________________
Intel-gfx mailing list
Intel-= gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo= /intel-gfx
--089e01184c180439c8051f550fd0-- --===============1972158717== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK --===============1972158717==--