stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: gregkh@linuxfoundation.org
Cc: imre.deak@intel.com, jose.souza@intel.com,
	rodrigo.vivi@intel.com, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] drm/i915/icl+: Don't enable DDI IO power on a TypeC port in" failed to apply to 5.5-stable tree
Date: Wed, 15 Apr 2020 22:42:54 -0400	[thread overview]
Message-ID: <20200416024254.GA1068@sasha-vm> (raw)
In-Reply-To: <158695052111011@kroah.com>

On Wed, Apr 15, 2020 at 01:35:21PM +0200, gregkh@linuxfoundation.org wrote:
>
>The patch below does not apply to the 5.5-stable tree.
>If someone wants it applied there, or to any other stable or longterm
>tree, then please email the backport, including the original git commit
>id to <stable@vger.kernel.org>.
>
>thanks,
>
>greg k-h
>
>------------------ original commit in Linus's tree ------------------
>
>From 6e8a36c13382b7165d23928caee8d91c1b301142 Mon Sep 17 00:00:00 2001
>From: Imre Deak <imre.deak@intel.com>
>Date: Mon, 30 Mar 2020 18:22:44 +0300
>Subject: [PATCH] drm/i915/icl+: Don't enable DDI IO power on a TypeC port in
> TBT mode
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>The DDI IO power well must not be enabled for a TypeC port in TBT mode,
>ensure this during driver loading/system resume.
>
>This gets rid of error messages like
>[drm] *ERROR* power well DDI E TC2 IO state mismatch (refcount 1/enabled 0)
>
>and avoids leaking the power ref when disabling the output.
>
>Cc: <stable@vger.kernel.org> # v5.4+
>Signed-off-by: Imre Deak <imre.deak@intel.com>
>Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
>Link: https://patchwork.freedesktop.org/patch/msgid/20200330152244.11316-1-imre.deak@intel.com
>(cherry picked from commit f77a2db27f26c3ccba0681f7e89fef083718f07f)
>Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Conflict because we didn't have b7d02c3a124d ("drm/i915: Pass
intel_encoder to enc_to_*()"). Fixed and queued up.

-- 
Thanks,
Sasha

      reply	other threads:[~2020-04-16  2:42 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-15 11:35 FAILED: patch "[PATCH] drm/i915/icl+: Don't enable DDI IO power on a TypeC port in" failed to apply to 5.5-stable tree gregkh
2020-04-16  2:42 ` Sasha Levin [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=20200416024254.GA1068@sasha-vm \
    --to=sashal@kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=imre.deak@intel.com \
    --cc=jose.souza@intel.com \
    --cc=rodrigo.vivi@intel.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).