From patchwork Wed Apr 22 06:55:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1274754 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 496WRD5qL2z9sSK; Wed, 22 Apr 2020 16:55:36 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jR9IB-0007XR-Mb; Wed, 22 Apr 2020 06:55:31 +0000 Received: from mail-pl1-f179.google.com ([209.85.214.179]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jR9I9-0007VV-Ve for kernel-team@lists.ubuntu.com; Wed, 22 Apr 2020 06:55:30 +0000 Received: by mail-pl1-f179.google.com with SMTP id h11so557643plr.11 for ; Tue, 21 Apr 2020 23:55:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7uuxhXIE7Svf12gKNfqJSKr+QhEiTJgTYfbNHRsRLMs=; b=ZEN8vrVToW5FXrCpzCckKJ5VeOt57TSnrzFx/H1gf0uOIiEAxKO8IJSZwdVNhplvLb iLfU8fHJ58+1kHsfDCeSJpqVREckr4Y9mgny63tbZdWDEC0Aox5i/Pyxs4/E3zVqASpf 9dJriUBJhWteKAcniNAc2WHuQuA1+bQEqaFxMiOgqNVXcVe4X4Zrum5yeLerMNn9S5vA qG6yyL8D0yeHDeS5boHQhUqmAaP/UzSpu0t0LSaYLI12F2Z59mYDuqGO5bKLKtJ6M89a h4DL7/1zVVgP1OaNrmhgWaRSMyZa6qrgVEddFOStYl4nlCfkjKMq0WVrYjJM22MY+Mq2 kB0w== X-Gm-Message-State: AGi0PubeHQyJZkZ+U4znnoLa+LBY2u4ASyzQ+HRSsxJxOnr6hunfJFfT UJXf4D2+fwix6t/VLWig1VjZGHJVnnU= X-Google-Smtp-Source: APiQypK0qnUjLYnjike8diqjdvbbWUyCXoCwEjS8C/1HumLCgITwvUwYfrOjqugbwgs6nzpqMxZLlg== X-Received: by 2002:a17:902:aa09:: with SMTP id be9mr24514914plb.341.1587538528071; Tue, 21 Apr 2020 23:55:28 -0700 (PDT) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id x13sm4434180pfq.154.2020.04.21.23.55.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 23:55:27 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PATCH 6/9] drm/i915/tc: Skip ref held check for TC legacy aux power wells Date: Wed, 22 Apr 2020 14:55:07 +0800 Message-Id: <20200422065510.802065-7-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200422065510.802065-1-vicamo.yang@canonical.com> References: <20200422065510.802065-1-vicamo.yang@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: José Roberto de Souza BugLink: https://bugs.launchpad.net/bugs/1868936 As part of ICL TC cold exit sequences we need to request aux power well before lock the access to TC ports, so skiping the intel_tc_port_ref_held() check for TC legacy ports. Reviewed-by: Imre Deak Tested-by: You-Sheng Yang Signed-off-by: José Roberto de Souza Link: https://patchwork.freedesktop.org/patch/msgid/20200414194956.164323-5-jose.souza@intel.com (backported from drm-tip commit 7ce40a671538c225ea8eb170830cad90b16ec211) Signed-off-by: You-Sheng Yang --- drivers/gpu/drm/i915/display/intel_display_power.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c index 083aefcce9c9..d8f670244422 100644 --- a/drivers/gpu/drm/i915/display/intel_display_power.c +++ b/drivers/gpu/drm/i915/display/intel_display_power.c @@ -571,6 +571,9 @@ static void icl_tc_port_assert_ref_held(struct drm_i915_private *dev_priv, if (WARN_ON(!dig_port)) return; + if (INTEL_GEN(dev_priv) == 11 && dig_port->tc_legacy_port) + return; + WARN_ON(!intel_tc_port_ref_held(dig_port)); }