From: "Zanoni, Paulo R" <paulo.r.zanoni@intel.com>
To: "intel-gfx@lists.freedesktop.org"
<intel-gfx@lists.freedesktop.org>,
"Vivi, Rodrigo" <rodrigo.vivi@intel.com>
Cc: "Runyan, Arthur J" <arthur.j.runyan@intel.com>
Subject: Re: [PATCH] drm/i915/skl: Update DDI buffer translation programming.
Date: Fri, 21 Aug 2015 18:23:03 +0000 [thread overview]
Message-ID: <1440181380.2672.57.camel@intel.com> (raw)
In-Reply-To: <1438811946-13598-1-git-send-email-rodrigo.vivi@intel.com>
Em Qua, 2015-08-05 às 14:59 -0700, Rodrigo Vivi escreveu:
> SKL-Y can now use the same programming for all VccIO values after an
> adjustment to I_boost.
> SKL-U DP table adjustments.
> 1. Remove SKL Y 0.95V from "SKL H and S" columns in all tables.
> The other SKL Y column removes the "0.85V VccIO" so it now applies
> to all voltages.
> 2. DP table changes SKL U 400mV+0db dword 0 value from 2016h to
> 201Bh.
> 3. DP table changes SKL U 600mv+0db dword 0 value from 2016h to
> 201Bh.
> 4. DP table increases I_boost to level 3 for SKL Y 400mv+9.5db.
>
> Reference: Graphics Spec Change r97962
> Cc: Arthur Runyan <arthur.j.runyan@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/intel_ddi.c: In function ‘skl_get_buf_trans_dp’:
drivers/gpu/drm/i915/intel_ddi.c:338:27: warning: unused variable
‘dev_priv’ [-Wunused-variable]
drivers/gpu/drm/i915/intel_ddi.c: In function ‘skl_get_buf_trans_hdmi’:
drivers/gpu/drm/i915/intel_ddi.c:394:27: warning: unused variable
‘dev_priv’ [-Wunused-variable]
With that fixed:
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> ---
> drivers/gpu/drm/i915/intel_ddi.c | 73 ++++++++++++++----------------
> ----------
> 1 file changed, 25 insertions(+), 48 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c
> b/drivers/gpu/drm/i915/intel_ddi.c
> index 9a40bfb..9e5a21b 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -128,7 +128,7 @@ static const struct ddi_buf_trans
> bdw_ddi_translations_hdmi[] = {
> { 0x80FFFFFF, 0x001B0002, 0x0 },/* 9: 1000 1000 0 > */
>
> };
>
> -/* Skylake H, S, and Skylake Y with 0.95V VccIO */
> +/* Skylake H and S */
> static const struct ddi_buf_trans skl_ddi_translations_dp[] = {
> { 0x00002016, 0x000000A0, 0x0 },
> { 0x00005012, 0x0000009B, 0x0 },
> @@ -143,23 +143,23 @@ static const struct ddi_buf_trans
> skl_ddi_translations_dp[] = {
>
> /* Skylake U */
> static const struct ddi_buf_trans skl_u_ddi_translations_dp[] = {
> - { 0x00002016, 0x000000A2, 0x0 },
> + { 0x0000201B, 0x000000A2, 0x0 },
> { 0x00005012, 0x00000088, 0x0 },
> { 0x00007011, 0x00000087, 0x0 },
> - { 0x80009010, 0x000000C7, 0x1 }, /* Uses I_boost */
> - { 0x00002016, 0x0000009D, 0x0 },
> + { 0x80009010, 0x000000C7, 0x1 }, /* Uses I_boost
> level 0x1 */
> + { 0x0000201B, 0x0000009D, 0x0 },
> { 0x00005012, 0x000000C7, 0x0 },
> { 0x00007011, 0x000000C7, 0x0 },
> { 0x00002016, 0x00000088, 0x0 },
> { 0x00005012, 0x000000C7, 0x0 },
> };
>
> -/* Skylake Y with 0.85V VccIO */
> -static const struct ddi_buf_trans skl_y_085v_ddi_translations_dp[] =
> {
> +/* Skylake Y */
> +static const struct ddi_buf_trans skl_y_ddi_translations_dp[] = {
> { 0x00000018, 0x000000A2, 0x0 },
> { 0x00005012, 0x00000088, 0x0 },
> { 0x00007011, 0x00000087, 0x0 },
> - { 0x80009010, 0x000000C7, 0x1 }, /* Uses I_boost */
> + { 0x80009010, 0x000000C7, 0x3 }, /* Uses I_boost
> level 0x3 */
> { 0x00000018, 0x0000009D, 0x0 },
> { 0x00005012, 0x000000C7, 0x0 },
> { 0x00007011, 0x000000C7, 0x0 },
> @@ -168,7 +168,7 @@ static const struct ddi_buf_trans
> skl_y_085v_ddi_translations_dp[] = {
> };
>
> /*
> - * Skylake H and S, and Skylake Y with 0.95V VccIO
> + * Skylake H and S
> * eDP 1.4 low vswing translation parameters
> */
> static const struct ddi_buf_trans skl_ddi_translations_edp[] = {
> @@ -202,10 +202,10 @@ static const struct ddi_buf_trans
> skl_u_ddi_translations_edp[] = {
> };
>
> /*
> - * Skylake Y with 0.95V VccIO
> + * Skylake Y
> * eDP 1.4 low vswing translation parameters
> */
> -static const struct ddi_buf_trans skl_y_085v_ddi_translations_edp[]
> = {
> +static const struct ddi_buf_trans skl_y_ddi_translations_edp[] = {
> { 0x00000018, 0x000000A8, 0x0 },
> { 0x00004013, 0x000000AB, 0x0 },
> { 0x00007011, 0x000000A4, 0x0 },
> @@ -218,7 +218,7 @@ static const struct ddi_buf_trans
> skl_y_085v_ddi_translations_edp[] = {
> { 0x00000018, 0x0000008A, 0x0 },
> };
>
> -/* Skylake H, S and U, and Skylake Y with 0.95V VccIO */
> +/* Skylake U, H and S */
> static const struct ddi_buf_trans skl_ddi_translations_hdmi[] = {
> { 0x00000018, 0x000000AC, 0x0 },
> { 0x00005012, 0x0000009D, 0x0 },
> @@ -233,8 +233,8 @@ static const struct ddi_buf_trans
> skl_ddi_translations_hdmi[] = {
> { 0x00000018, 0x000000C7, 0x0 },
> };
>
> -/* Skylake Y with 0.85V VccIO */
> -static const struct ddi_buf_trans skl_y_085v_ddi_translations_hdmi[]
> = {
> +/* Skylake Y */
> +static const struct ddi_buf_trans skl_y_ddi_translations_hdmi[] = {
> { 0x00000018, 0x000000A1, 0x0 },
> { 0x00005012, 0x000000DF, 0x0 },
> { 0x00007011, 0x00000084, 0x0 },
> @@ -244,7 +244,7 @@ static const struct ddi_buf_trans
> skl_y_085v_ddi_translations_hdmi[] = {
> { 0x00006013, 0x000000C7, 0x0 },
> { 0x00000018, 0x0000008A, 0x0 },
> { 0x00003015, 0x000000C7, 0x0 }, /* Default */
> - { 0x80003015, 0x000000C7, 0x7 }, /* Uses I_boost */
> + { 0x80003015, 0x000000C7, 0x7 }, /* Uses I_boost
> level 0x7 */
> { 0x00000018, 0x000000C7, 0x0 },
> };
>
> @@ -337,17 +337,10 @@ static const struct ddi_buf_trans
> *skl_get_buf_trans_dp(struct drm_device *dev,
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
> const struct ddi_buf_trans *ddi_translations;
> - static int is_095v = -1;
>
> - if (is_095v == -1) {
> - u32 spr1 = I915_READ(UAIMI_SPR1);
> -
> - is_095v = spr1 & SKL_VCCIO_MASK;
> - }
> -
> - if (IS_SKL_ULX(dev) && !is_095v) {
> - ddi_translations = skl_y_085v_ddi_translations_dp;
> - *n_entries =
> ARRAY_SIZE(skl_y_085v_ddi_translations_dp);
> + if (IS_SKL_ULX(dev)) {
> + ddi_translations = skl_y_ddi_translations_dp;
> + *n_entries = ARRAY_SIZE(skl_y_ddi_translations_dp);
> } else if (IS_SKL_ULT(dev)) {
> ddi_translations = skl_u_ddi_translations_dp;
> *n_entries = ARRAY_SIZE(skl_u_ddi_translations_dp);
> @@ -364,23 +357,14 @@ static const struct ddi_buf_trans
> *skl_get_buf_trans_edp(struct drm_device *dev,
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
> const struct ddi_buf_trans *ddi_translations;
> - static int is_095v = -1;
>
> - if (is_095v == -1) {
> - u32 spr1 = I915_READ(UAIMI_SPR1);
> -
> - is_095v = spr1 & SKL_VCCIO_MASK;
> - }
> -
> - if (IS_SKL_ULX(dev) && !is_095v) {
> + if (IS_SKL_ULX(dev)) {
> if (dev_priv->edp_low_vswing) {
> - ddi_translations =
> skl_y_085v_ddi_translations_edp;
> - *n_entries =
> - ARRAY_SIZE(skl_y_085v_ddi_translatio
> ns_edp);
> + ddi_translations =
> skl_y_ddi_translations_edp;
> + *n_entries =
> ARRAY_SIZE(skl_y_ddi_translations_edp);
> } else {
> - ddi_translations =
> skl_y_085v_ddi_translations_dp;
> - *n_entries =
> - ARRAY_SIZE(skl_y_085v_ddi_translatio
> ns_dp);
> + ddi_translations =
> skl_y_ddi_translations_dp;
> + *n_entries =
> ARRAY_SIZE(skl_y_ddi_translations_dp);
> }
> } else if (IS_SKL_ULT(dev)) {
> if (dev_priv->edp_low_vswing) {
> @@ -409,17 +393,10 @@ skl_get_buf_trans_hdmi(struct drm_device *dev,
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
> const struct ddi_buf_trans *ddi_translations;
> - static int is_095v = -1;
> -
> - if (is_095v == -1) {
> - u32 spr1 = I915_READ(UAIMI_SPR1);
> -
> - is_095v = spr1 & SKL_VCCIO_MASK;
> - }
>
> - if (IS_SKL_ULX(dev) && !is_095v) {
> - ddi_translations = skl_y_085v_ddi_translations_hdmi;
> - *n_entries =
> ARRAY_SIZE(skl_y_085v_ddi_translations_hdmi);
> + if (IS_SKL_ULX(dev)) {
> + ddi_translations = skl_y_ddi_translations_hdmi;
> + *n_entries =
> ARRAY_SIZE(skl_y_ddi_translations_hdmi);
> } else {
> ddi_translations = skl_ddi_translations_hdmi;
> *n_entries = ARRAY_SIZE(skl_ddi_translations_hdmi);
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-08-21 18:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-05 21:59 [PATCH] drm/i915/skl: Update DDI buffer translation programming Rodrigo Vivi
2015-08-06 1:46 ` Zhang, Xiong Y
2015-08-08 1:02 ` Rodrigo Vivi
2015-08-12 11:30 ` shuang.he
2015-08-21 18:23 ` Zanoni, Paulo R [this message]
2015-08-24 23:48 ` Rodrigo Vivi
2015-08-26 7:27 ` Jani Nikula
2015-08-29 4:42 ` shuang.he
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1440181380.2672.57.camel@intel.com \
--to=paulo.r.zanoni@intel.com \
--cc=arthur.j.runyan@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=rodrigo.vivi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.