From: Zhenyu Wang Subject: Re: [PATCH] drm/i915/edp: Use fixed panel timing information from VBT Date: Thu, 13 May 2010 10:46:56 +0800 Message-ID: <20100513024656.GA12516@zhen-devel.sh.intel.com> References: <1273678193-4697-1-git-send-email-ajax@redhat.com> <1273678193-4697-2-git-send-email-ajax@redhat.com> Reply-To: Zhenyu Wang Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1747313392==" Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 6CD6E9EEE7 for ; Wed, 12 May 2010 19:46:58 -0700 (PDT) In-Reply-To: <1273678193-4697-2-git-send-email-ajax@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Mime-version: 1.0 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: Adam Jackson Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org --===============1747313392== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="rwEMma7ioTxnRzrJ" Content-Disposition: inline --rwEMma7ioTxnRzrJ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2010.05.12 11:29:53 -0400, Adam Jackson wrote: > eDP panels are often fixed-rate. Grab the link speed and lane count > from the VBT and use those instead of trying to compute them. >=20 > Signed-off-by: Adam Jackson > --- Looks good to me, and it might just fix https://bugs.freedesktop.org/show_bug.cgi?id=3D28070 We just have one 1366x768 panel which works fine for me last time I tried, but that bug has a larger one, and from log it seems driver still use 1.6Ghz which may lead to the problem as you addressed. I'll ask the reporter to try your patch. Thanks! > drivers/gpu/drm/i915/i915_drv.h | 2 ++ > drivers/gpu/drm/i915/intel_bios.c | 18 ++++++++++++++++++ > drivers/gpu/drm/i915/intel_dp.c | 29 +++++++++++++++++++++++++++++ > 3 files changed, 49 insertions(+), 0 deletions(-) >=20 > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_= drv.h > index 7f797ef..78212c2 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -326,6 +326,8 @@ typedef struct drm_i915_private { > unsigned int edp_support:1; > int lvds_ssc_freq; > int edp_bpp; > + int edp_link_bw; > + int edp_lane_count; > =20 > struct notifier_block lid_notifier; > =20 > diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/int= el_bios.c > index 4c748d8..ac60a6f 100644 > --- a/drivers/gpu/drm/i915/intel_bios.c > +++ b/drivers/gpu/drm/i915/intel_bios.c > @@ -26,6 +26,7 @@ > */ > #include "drmP.h" > #include "drm.h" > +#include "drm_dp_helper.h" > #include "i915_drm.h" > #include "i915_drv.h" > #include "intel_bios.h" > @@ -437,6 +438,23 @@ parse_edp(struct drm_i915_private *dev_priv, struct = bdb_header *bdb) > dev_priv->edp_bpp =3D 30; > break; > } > + > + if (edp->link_params[panel_type].rate =3D=3D EDP_RATE_1_62) > + dev_priv->edp_link_bw =3D DP_LINK_BW_1_62; > + else > + dev_priv->edp_link_bw =3D DP_LINK_BW_2_7; > + > + switch (edp->link_params[panel_type].lanes) { > + case EDP_LANE_1: > + dev_priv->edp_lane_count =3D 1; > + break; > + case EDP_LANE_2: > + dev_priv->edp_lane_count =3D 2; > + break; > + case EDP_LANE_4: > + dev_priv->edp_lane_count =3D 4; > + break; > + } > } > =20 > static void > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel= _dp.c > index f6299bb..c77c567 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -494,6 +494,31 @@ intel_dp_i2c_init(struct intel_encoder *intel_encode= r, > } > =20 > static bool > +intel_edp_mode_fixup(struct drm_encoder *encoder, struct drm_display_mod= e *mode, > + struct drm_display_mode *adjusted_mode) > +{ > + struct drm_i915_private *dev_priv =3D encoder->dev->dev_private; > + struct intel_encoder *intel_encoder =3D enc_to_intel_encoder(encoder); > + struct intel_dp_priv *dp_priv =3D intel_encoder->dev_priv; > + > + /* the VBT tells us what the panel demands. hopefully it exists. */ > + if (dev_priv->edp_lane_count =3D=3D 0) { > + DRM_DEBUG_KMS("no eDP block found, guessing parameters\n"); > + return false; > + } > + > + dp_priv->link_bw =3D dev_priv->edp_link_bw; > + dp_priv->lane_count =3D dev_priv->edp_lane_count; > + adjusted_mode->clock =3D intel_dp_link_clock(dp_priv->link_bw); > + > + DRM_DEBUG_KMS("eDP link bw %02x lane count %d clock %d\n", > + dp_priv->link_bw, dp_priv->lane_count, > + adjusted_mode->clock); > + > + return true; > +} > + > +static bool > intel_dp_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode= *mode, > struct drm_display_mode *adjusted_mode) > { > @@ -504,6 +529,10 @@ intel_dp_mode_fixup(struct drm_encoder *encoder, str= uct drm_display_mode *mode, > int max_clock =3D intel_dp_max_link_bw(intel_encoder) =3D=3D DP_LINK_BW= _2_7 ? 1 : 0; > static int bws[2] =3D { DP_LINK_BW_1_62, DP_LINK_BW_2_7 }; > =20 > + if (IS_eDP(intel_encoder)) > + if (intel_edp_mode_fixup(encoder, mode, adjusted_mode)) > + return true; > + > for (lane_count =3D 1; lane_count <=3D max_lane_count; lane_count <<=3D= 1) { > for (clock =3D 0; clock <=3D max_clock; clock++) { > int link_avail =3D intel_dp_link_clock(bws[clock]) * lane_count; > --=20 > 1.7.0.1 >=20 > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx --=20 Open Source Technology Center, Intel ltd. $gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827 --rwEMma7ioTxnRzrJ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkvraCAACgkQsQQaM014GCdC+wCgm9r6zPMCnFCn0p82by1wihzh IcAAn3nn1CG7dmRjFBku/hHp2Ldu+oaR =mcBz -----END PGP SIGNATURE----- --rwEMma7ioTxnRzrJ-- --===============1747313392== 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 --===============1747313392==--