From patchwork Thu Nov 25 10:10:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chris Chiu X-Patchwork-Id: 1559627 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=Xo2K/8Mz; 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 4J0DFG6KnSz9s5P for ; Thu, 25 Nov 2021 21:12:02 +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 1mqBjJ-0007ey-0c; Thu, 25 Nov 2021 10:11:49 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mqBim-00067M-1j for kernel-team@lists.ubuntu.com; Thu, 25 Nov 2021 10:11:16 +0000 Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) (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-0.canonical.com (Postfix) with ESMTPS id F078F40742 for ; Thu, 25 Nov 2021 10:11:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1637835072; bh=qqjZhlUpgsT8WaJTArt6cN2L78ZdSauZGZmb+t8V0WI=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=Xo2K/8Mza/4esC7r/oliPRBDuJcHe3aFJZ6+rcYv4hgLec9iExUMLKPELNgTBvWl1 6UbRO8sCrQXRDCWbAr4ycEX80SCAdqhOkIJlzI8/V6inh/2R/VSElehgg64pwrqeU1 ZHj2BODO2cI/QsTssS0qajpgbs1zw61guJTswVSFsU3LR03jgazRtrrOomGpN9oZkb nsoZn/y32TnNd3eEUH9H2aJ/8X7zXYeSbzPbXWCHlp/6U0xdbRqtFOZ/rp8/jJwTRE ARfTwlakOxd2GyCZY/+aszKGmqbKL6hcG0J/rPStXGkk1Yq2nOoKwuXy4z8LpzO+HZ saded0FkqLOcA== Received: by mail-pj1-f70.google.com with SMTP id iq9-20020a17090afb4900b001a54412feb0so3142788pjb.1 for ; Thu, 25 Nov 2021 02:11:12 -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=qqjZhlUpgsT8WaJTArt6cN2L78ZdSauZGZmb+t8V0WI=; b=S2vQ9ehX+gcG4E7tCYKLO8Bo5YuGJvsP+ya63QPzRGGbeDHo7crGg2/QXOD9OBv8Z2 ilTve6VW6s48Ww62+xCuvjVZKB7twyg4qvYskp9KyTIYGqirEl+pifJGn0nQADCoFpI3 ROVrnTAVb1mByeQpGR1NNqSnzYHPLTVeQj/ckfEMrqEhByxHjEibed4vSN7Rtr8wOPtM ln3AJmVQe+BPx6/KEBB/7gBJ+sD140UzJfizjky1PPXtWaOvcQUOrAyXBzd1OnY//XQR tAXsxIr0r1nJweanS3zkw72X2c85l0K5VATgqTqd1u/E9CNiE9AX0ZP5cG7b6XnN0idj Zq7w== X-Gm-Message-State: AOAM532GpbcySUQN4uA08bS9QJgO0PXZoRxy3K0pwoyh2Lwdm04KF7uN YpMzBJfJd7dyxhGFWG1mIu1pdW8GSxC/dpRDy233kUpCB2awYceHI5o32MPsh+WFS0yx7QFbnpC aghdIki9lexIZM0TJ93zf7n9vUiGF53RNx1gM6iX2bA== X-Received: by 2002:a17:90b:4f83:: with SMTP id qe3mr5658327pjb.56.1637835071449; Thu, 25 Nov 2021 02:11:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJxV0HNL37ZZIpr5q4QMuIk+s5E2YjeO+wzYnhX9nfjWplDC/JOuxYlekpUCAB6BPJVpT61BzQ== X-Received: by 2002:a17:90b:4f83:: with SMTP id qe3mr5658284pjb.56.1637835071080; Thu, 25 Nov 2021 02:11:11 -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.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 02:11:10 -0800 (PST) From: Chris Chiu To: kernel-team@lists.ubuntu.com Subject: [PATCH 11/12][SRU][Jammy/Unstable] drm/i915/tc: Drop extra TC cold blocking from intel_tc_port_connected() Date: Thu, 25 Nov 2021 18:10:55 +0800 Message-Id: <20211125101056.20316-12-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 After the previous patch the driver holds a power domain blocking TC-cold whenever the port is locked, so we can remove the extra blocking around the lock/unlock sequence. 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-13-imre.deak@intel.com (cherry picked from commit ff67c4c0dd67b6dbb78a0d045100dd2f9dee88b0) Signed-off-by: Chris Chiu --- drivers/gpu/drm/i915/display/intel_tc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c index 66cb321a4488..4a14db604cba 100644 --- a/drivers/gpu/drm/i915/display/intel_tc.c +++ b/drivers/gpu/drm/i915/display/intel_tc.c @@ -740,16 +740,12 @@ bool intel_tc_port_connected(struct intel_encoder *encoder) { struct intel_digital_port *dig_port = enc_to_dig_port(encoder); bool is_connected; - enum intel_display_power_domain domain; - intel_wakeref_t tc_cold_wref; intel_tc_port_lock(dig_port); - tc_cold_wref = tc_cold_block(dig_port, &domain); is_connected = tc_port_live_status_mask(dig_port) & BIT(dig_port->tc_mode); - tc_cold_unblock(dig_port, domain, tc_cold_wref); intel_tc_port_unlock(dig_port); return is_connected;