From patchwork Thu Nov 25 10:10:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chris Chiu X-Patchwork-Id: 1559625 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=L2X2Yw9v; dkim-atps=neutral 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4J0DF933fHz9s5P for ; Thu, 25 Nov 2021 21:11:57 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mqBjD-0007Lp-WA; Thu, 25 Nov 2021 10:11:44 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mqBii-00062U-MW for kernel-team@lists.ubuntu.com; Thu, 25 Nov 2021 10:11:12 +0000 Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 074444000A for ; Thu, 25 Nov 2021 10:11:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1637835071; bh=XJYw34m5+hdt9ibYFIVJJJLRXJcZ6X0qXM8FeCSJ31Y=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=L2X2Yw9v5Hu53JUQPY4tyke3XJ5QSoUVg4buQUePLXp/8Fql6QtaQvPHMWICDa+3R vk2YnkjI9bBCtjPcOlMO5vHyIUxWSxQ777y3cb4bFEc6cUWnMS1ZKhry7nRoFn8jBS opvHyaHxsTiR0UcrHEGsSI9Au20/A1yz76JDuQrVcPr5SJgv/Bq7FTH1/FcjON8cvU wbNmakjNJK7mpS5btQxGou8MUjRJ93ALw++14O8heg9Yh6iTi4HB6jrngUeVtQDdR1 IUvy5IoY78fYgfHRSnGDlLHYnDy6yhenyrU2McTVNiLPLY91pgErTsmoi7uq/LpC3j pjIjtd+A2tigg== Received: by mail-pg1-f199.google.com with SMTP id t1-20020a6564c1000000b002e7f31cf59fso1851564pgv.14 for ; Thu, 25 Nov 2021 02:11:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XJYw34m5+hdt9ibYFIVJJJLRXJcZ6X0qXM8FeCSJ31Y=; b=KflR9mkfvD7EgvU93s06/qZ4/EI0oLukbvkZ0+7rfGqlRf+UJekIhBlXyr2UitiQlU pIpNuUXZh6g8Q2UkAWTIxeCOABjXtz6Uh1TcyCisiGpQTprJNYLx1YjONFz5YhipGybQ 42aLMi0wQk6i0LM5L9KD0jyw0ei/1jpRlnFkhly4cvUv4kxUJmERxi4oeclzISlhg9Z1 gcwp1hu1vjqQrP3oMdu45JWJnZ/jCz2EguALylsH1uP6gxztyNur0KZcuqGQ15w0QkLA /gYJh4g324IEa4MhPVXydZWTgn3Aicf09mO81zaNFp8oW6FMNK16YKeajkchZHgytfsy lz1Q== X-Gm-Message-State: AOAM5319CHxs3qigy3bQd4XS9CQ55r8L2iSlO3Xz8VKR0Jc3Q42TBEU/ 5kb9e/dn4FsG5/4p2ULFzEhLkll1Di5NGK1hZk119pVjxW4ipNtSiJeROV8qKzLHQqbStGNYdPu ho8sDgqoq+srFTlFgJ6ggqACT8BEf5kbnDhKnmnRS3A== X-Received: by 2002:a17:90b:4a92:: with SMTP id lp18mr5550738pjb.55.1637835069539; Thu, 25 Nov 2021 02:11:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJy8ClcxwU12O0keZDMpWvt4yZbgWxLWh9Irj+5Pp6hb2ZwuEKqsOkAH6Vr5ftZIXB6bE8dF5A== X-Received: by 2002:a17:90b:4a92:: with SMTP id lp18mr5550704pjb.55.1637835069231; Thu, 25 Nov 2021 02:11:09 -0800 (PST) Received: from localhost.localdomain (111-240-133-170.dynamic-ip.hinet.net. [111.240.133.170]) by smtp.gmail.com with ESMTPSA id il7sm2554831pjb.54.2021.11.25.02.11.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 02:11:08 -0800 (PST) From: Chris Chiu To: kernel-team@lists.ubuntu.com Subject: [PATCH 09/12][SRU][Jammy/Unstable] drm/i915/icl/tc: Remove the ICL special casing during TC-cold blocking Date: Thu, 25 Nov 2021 18:10:53 +0800 Message-Id: <20211125101056.20316-10-chris.chiu@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211125101056.20316-1-chris.chiu@canonical.com> References: <20211125101056.20316-1-chris.chiu@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: Imre Deak BugLink: https://bugs.launchpad.net/bugs/1952041 While a TypeC port mode is locked a DISPLAY_CORE power domain reference is held, which implies a runtime PM ref. By removing the ICL !legacy port special casing, a TC_COLD_OFF power domain reference will be taken for such ports, which also translates to a runtime PM ref on that platform. A follow-up change will stop holding the DISPLAY_CORE power domain while the port is locked. Cc: José Roberto de Souza Signed-off-by: Imre Deak Reviewed-by: José Roberto de Souza Link: https://patchwork.freedesktop.org/patch/msgid/20210921002313.1132357-11-imre.deak@intel.com (cherry picked from commit 38c393462d01d2746f9f91c1a6482fded2b1b8bb) Signed-off-by: Chris Chiu --- drivers/gpu/drm/i915/display/intel_tc.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c index 2df4d0beb636..9367770de5d7 100644 --- a/drivers/gpu/drm/i915/display/intel_tc.c +++ b/drivers/gpu/drm/i915/display/intel_tc.c @@ -71,9 +71,6 @@ tc_cold_block_in_mode(struct intel_digital_port *dig_port, enum tc_port_mode mod { struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev); - if (DISPLAY_VER(i915) == 11 && !dig_port->tc_legacy_port) - return 0; - *domain = tc_cold_get_power_domain(dig_port, mode); return intel_display_power_get(i915, *domain); @@ -108,9 +105,6 @@ assert_tc_cold_blocked(struct intel_digital_port *dig_port) struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev); bool enabled; - if (DISPLAY_VER(i915) == 11 && !dig_port->tc_legacy_port) - return; - enabled = intel_display_power_is_enabled(i915, tc_cold_get_power_domain(dig_port, dig_port->tc_mode));