From: Jesse Barnes <jbarnes@virtuousgeek.org>
To: "Stéphane Marchesin" <marcheu@chromium.org>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Preserve the DDI_A_4_LANES bit from the bios
Date: Fri, 12 Jul 2013 13:07:35 -0700 [thread overview]
Message-ID: <20130712130735.6fdcbdf3@jbarnes-desktop> (raw)
In-Reply-To: <1373659426-18245-1-git-send-email-marcheu@chromium.org>
On Fri, 12 Jul 2013 13:03:46 -0700
Stéphane Marchesin <marcheu@chromium.org> wrote:
> Otherwise the DDI_A_4_LANES bit gets lost and we can't use > 2 lanes
> on eDP. This fixes eDP on hsw with > 2 lanes.
>
> Signed-off-by: Stéphane Marchesin <marcheu@chromium.org>
> ---
> drivers/gpu/drm/i915/intel_ddi.c | 2 +-
> drivers/gpu/drm/i915/intel_dp.c | 5 +++--
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index 324211a..5e3f97b 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -1348,7 +1348,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
>
> intel_dig_port->port = port;
> intel_dig_port->port_reversal = I915_READ(DDI_BUF_CTL(port)) &
> - DDI_BUF_PORT_REVERSAL;
> + (DDI_BUF_PORT_REVERSAL | DDI_A_4_LANES);
> intel_dig_port->dp.output_reg = DDI_BUF_CTL(port);
>
> intel_encoder->type = INTEL_OUTPUT_UNKNOWN;
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index b739712..a1d838c 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -834,10 +834,11 @@ intel_dp_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,
> * configuration happens (oddly) in ironlake_pch_enable
> */
>
> - /* Preserve the BIOS-computed detected bit. This is
> + /* Preserve the BIOS-computed detected and 4 lanes bits. This is
> * supposed to be read-only.
> */
> - intel_dp->DP = I915_READ(intel_dp->output_reg) & DP_DETECTED;
> + intel_dp->DP = I915_READ(intel_dp->output_reg) &
> + (DP_DETECTED | DDI_A_4_LANES);
>
> /* Handle DP bits in common between all three register formats */
> intel_dp->DP |= DP_VOLTAGE_0_4 | DP_PRE_EMPHASIS_0;
Thanks. Wonder if we're clobbering any other "BIOS must set this bit
and no one should touch it again" bits elsewhere...
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
--
Jesse Barnes, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2013-07-12 20:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-12 20:03 [PATCH] drm/i915: Preserve the DDI_A_4_LANES bit from the bios Stéphane Marchesin
2013-07-12 20:07 ` Jesse Barnes [this message]
2013-07-12 20:08 ` Daniel Vetter
-- strict thread matches above, loose matches on Subject: below --
2013-07-12 20:54 Stéphane Marchesin
2013-07-12 22:19 ` Paulo Zanoni
2013-07-12 22:50 ` Paulo Zanoni
2013-07-13 8:47 ` Daniel Vetter
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=20130712130735.6fdcbdf3@jbarnes-desktop \
--to=jbarnes@virtuousgeek.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=marcheu@chromium.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox