From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5871C2BA19 for ; Thu, 16 Apr 2020 02:42:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A8E4B206F9 for ; Thu, 16 Apr 2020 02:42:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587004977; bh=hrHnrM428jXmylq2w+iiUO2REOqJI4DpnqaDRs64tAI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=fgCl8xzRN0UaUur8yCZjLgqKFCg1VTWvTvVpEI6l4okyANTZxhIt2rnfbktohYIUS bR72Hp2pK9GBAgOY2x5nFhzPkQzx56EFygddKD3pKDJZTpldnxc0+6ZRRYr42v/RmV 8Oq0fTlp05QPYhRGRWL/rUCXv720sd8vTXwPHjYA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389035AbgDPCm4 (ORCPT ); Wed, 15 Apr 2020 22:42:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:37954 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732153AbgDPCm4 (ORCPT ); Wed, 15 Apr 2020 22:42:56 -0400 Received: from localhost (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8D344206F9; Thu, 16 Apr 2020 02:42:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587004975; bh=hrHnrM428jXmylq2w+iiUO2REOqJI4DpnqaDRs64tAI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ydaz4LCFCjAu3e2mIwPdBIXeU+bEjpJDWPs6m3fIR0uQhwOWvYZsuJyIQePoysaOg Hf2s0FRNJsdyl4/H9X6md8dBYkaHYlgRAS0dhWQaQfubpHGmx+HvueHIJaFdWkle6G p7hkugwq6cYnfdp2MBMyuj5NFOGJrjlXQMzXYpcU= Date: Wed, 15 Apr 2020 22:42:54 -0400 From: Sasha Levin 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 Message-ID: <20200416024254.GA1068@sasha-vm> References: <158695052111011@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <158695052111011@kroah.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.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 . > >thanks, > >greg k-h > >------------------ original commit in Linus's tree ------------------ > >>From 6e8a36c13382b7165d23928caee8d91c1b301142 Mon Sep 17 00:00:00 2001 >From: Imre Deak >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: # v5.4+ >Signed-off-by: Imre Deak >Reviewed-by: José Roberto de Souza >Link: https://patchwork.freedesktop.org/patch/msgid/20200330152244.11316-1-imre.deak@intel.com >(cherry picked from commit f77a2db27f26c3ccba0681f7e89fef083718f07f) >Signed-off-by: Rodrigo Vivi Conflict because we didn't have b7d02c3a124d ("drm/i915: Pass intel_encoder to enc_to_*()"). Fixed and queued up. -- Thanks, Sasha