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

[Sasha Levin <sashal@kernel.org>]

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