From: Jani Nikula <jani.nikula@linux.intel.com>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Francois Tigeot <ftigeot@wolfpond.org>,
stable@vger.kernel.org, Daniel Vetter <daniel.vetter@intel.com>
Subject: Re: [PATCH] drm/i915: Unlock panel even when LVDS is disabled
Date: Mon, 29 Dec 2014 10:00:38 +0200 [thread overview]
Message-ID: <87387y3mxl.fsf@intel.com> (raw)
In-Reply-To: <1417453015-8522-1-git-send-email-daniel.vetter@ffwll.ch>
On Mon, 01 Dec 2014, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Otherwise we'll have backtraces in assert_panel_unlocked because the
> BIOS locks the register. In the reporter's case this regression was
> introduced in
>
> commit c31407a3672aaebb4acddf90944a114fa5c8af7b
> Author: Chris Wilson <chris@chris-wilson.co.uk>
> Date: Thu Oct 18 21:07:01 2012 +0100
>
> drm/i915: Add no-lvds quirk for Supermicro X7SPA-H
>
> Reported-by: Alexey Orishko <alexey.orishko@gmail.com>
> Cc: Alexey Orishko <alexey.orishko@gmail.com>
> Cc: stable@vger.kernel.org
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Francois Tigeot <ftigeot@wolfpond.org>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
>
> ---
>
> Alexey, please test this patch.
>
> Thanks, Daniel
> ---
> drivers/gpu/drm/i915/intel_lvds.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> index c03d457a5150..14654d628ca4 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -899,6 +899,17 @@ void intel_lvds_init(struct drm_device *dev)
> int pipe;
> u8 pin;
>
> + /*
> + * Unlock registers and just leave them unlocked. Do this before
> + * checking quirk lists to avoid bogus WARNINGs.
> + */
> + if (HAS_PCH_SPLIT(dev)) {
> + I915_WRITE(PCH_PP_CONTROL,
> + I915_READ(PCH_PP_CONTROL) | PANEL_UNLOCK_REGS);
> + } else {
> + I915_WRITE(PP_CONTROL,
> + I915_READ(PP_CONTROL) | PANEL_UNLOCK_REGS);
> + }
Ugh, this is bogus for vlv/chv.
Jani.
> if (!intel_lvds_supported(dev))
> return;
>
> @@ -1097,17 +1108,6 @@ out:
> lvds_encoder->a3_power = I915_READ(lvds_encoder->reg) &
> LVDS_A3_POWER_MASK;
>
> - /*
> - * Unlock registers and just
> - * leave them unlocked
> - */
> - if (HAS_PCH_SPLIT(dev)) {
> - I915_WRITE(PCH_PP_CONTROL,
> - I915_READ(PCH_PP_CONTROL) | PANEL_UNLOCK_REGS);
> - } else {
> - I915_WRITE(PP_CONTROL,
> - I915_READ(PP_CONTROL) | PANEL_UNLOCK_REGS);
> - }
> lvds_connector->lid_notifier.notifier_call = intel_lid_notify;
> if (acpi_lid_notifier_register(&lvds_connector->lid_notifier)) {
> DRM_DEBUG_KMS("lid notifier registration failed\n");
> --
> 2.1.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2014-12-29 8:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-30 22:14 i915 driver failure Alexey Orishko
2014-12-01 9:10 ` Daniel Vetter
2014-12-01 10:56 ` Alexey Orishko
2014-12-01 16:56 ` [PATCH] drm/i915: Unlock panel even when LVDS is disabled Daniel Vetter
2014-12-01 18:38 ` Alexey Orishko
2014-12-02 12:43 ` Alexey Orishko
2014-12-02 13:00 ` Daniel Vetter
2014-12-02 13:12 ` Francois Tigeot
2014-12-02 13:21 ` Jani Nikula
2014-12-03 0:53 ` shuang.he
2014-12-29 8:00 ` Jani Nikula [this message]
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=87387y3mxl.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=ftigeot@wolfpond.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=stable@vger.kernel.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 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.