From patchwork Tue Oct 31 23:21:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paz Zcharya X-Patchwork-Id: 160381 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:abcd:0:b0:403:3b70:6f57 with SMTP id f13csp81678vqx; Tue, 31 Oct 2023 16:23:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF6dZyohSmrQNqm/8C6TAwk5L8bR0fvLW+Ozoy0CtfAYtgrL2emsAxtINVOKFl2LDYttPOL X-Received: by 2002:a05:6a20:4320:b0:166:6582:a7d5 with SMTP id h32-20020a056a20432000b001666582a7d5mr13566836pzk.3.1698794606687; Tue, 31 Oct 2023 16:23:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698794606; cv=none; d=google.com; s=arc-20160816; b=pjmU11YpK+fI4SxHDynb4ZN4BfFaSbkzQxnaPlSbxMVOxXuWsQNznVMtYye7wGU7GK FUlLt5paw7fjSfKGti/xp2i45Y3vNlvfZnSHEDagKm3OBKIEq443TFbw/sLLiuAJu6+v gw0TFoL+GPJQJzJCLHzcRXzz2z4g8h1P1dVi2rA6qbAHegsh3WbQdr82zyASm8KOCxrG 0gBzbo5LLpfLSJxGpCGrvPgH5UAlMOamgifcy/U2kvvthWe2zQS5+aNGHNXPKeXL16FE VNmLZWShNUvlnxthh29y+Z5eYgW0MpMxka8lqu+5hClgdcDz4sLiLrmeAf59l6TljUEY XZXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=Sw2B6vE9G+G7w2w874BluWAOKQISQdBMx0gd2n/sE7M=; fh=sQqUjnBBvqqToVh7WptYQ7K1lf4S3lLPxg5BriSxxRI=; b=XwT2GW4nddSsaTooQsVxz+/liqMVv+paOnwpR2nGxkasn1BidY5FN+HX5KZyZyo2Ot TiyNupt4nuiDybxw374V0fLY/Hpr+av8A2YCQVrxB62MW7nJYCRq4mt+Yg2EIa1I0GNA 1xK2/zq2BZeb9WThqLNnC9ZmOA8g/PngrOuzvMbyhm7nDVXp75CVr8gdoB19fZzc5xSy P9uGHxhSVdo/eeUZCpcJVBPZRb4TXCJo6yVyYGH7lOHmHtQNruas06s7Pc4G1zXOhkTB dVatfFfiX2zLDh5xV5B2tuUE1sN0pGVo6+kwmQQe7WkPRfdKdy1X4dLhb/2cgntkoMxz 3OZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=BW2mFTuv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id gz12-20020a17090b0ecc00b0028072770ee5si1553173pjb.37.2023.10.31.16.23.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 16:23:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=BW2mFTuv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 6529980F7F2D; Tue, 31 Oct 2023 16:23:24 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346893AbjJaXXO (ORCPT + 34 others); Tue, 31 Oct 2023 19:23:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236055AbjJaXXM (ORCPT ); Tue, 31 Oct 2023 19:23:12 -0400 Received: from mail-qv1-xf44.google.com (mail-qv1-xf44.google.com [IPv6:2607:f8b0:4864:20::f44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0408C9 for ; Tue, 31 Oct 2023 16:23:09 -0700 (PDT) Received: by mail-qv1-xf44.google.com with SMTP id 6a1803df08f44-67540aa0f5bso5503806d6.2 for ; Tue, 31 Oct 2023 16:23:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1698794589; x=1699399389; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Sw2B6vE9G+G7w2w874BluWAOKQISQdBMx0gd2n/sE7M=; b=BW2mFTuv9jDc9OJMZjLLQAknYgReepwrgGsbY8uK98i89x/HVhTTkmQA0pdMa4TbKr /7OD2bos/IzXxe2zvUQ98g4L3lymefDPSQxvp/fe5T5aMFBrKBE61HC3ys9N4j2mXzDO A5IkVcAvl/G927jFfP/GYPYrKfvXTaOOD1+zI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698794589; x=1699399389; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Sw2B6vE9G+G7w2w874BluWAOKQISQdBMx0gd2n/sE7M=; b=xAW4Y/Iek6FovdM6uxQoRQ/MhAYQMMnVszcrS4xXNeFB95wQlMVkXn0I7v9EmWK2uO ZRxk9CKaaN9+uT6+iw69rt7/Ve76mBPA9D9gZn3opVS+GgO/TJ4oFaoGPJIqKHtbK/fA RDUY2voAL3dGvB9fgIEoKXmqn5mHRvRcR7C4G3O6Dt34jHjmosQxLg7PxsTo1EUbOj+B n3TDQp7709MW5LDapaDd87/QZn4Wh8RC2SIHN2Z8MBucs3JEA4odbZrdoG63nkEkmV2b cX1vGWxLeJHb6Z/xAgD/vFPzXpZEMYE6194bxMgC0PkKfx61zS/hAPAfcT4pT6OaZog7 lxyQ== X-Gm-Message-State: AOJu0YysEEolrfVIXEBFRE4XRZgH4cQcAtAmHjoZktLIu6KHhR50ikj0 DwyueRunx+xYrAZrhMG1zZyzxw== X-Received: by 2002:a05:6214:d09:b0:672:3f54:b94f with SMTP id 9-20020a0562140d0900b006723f54b94fmr7618938qvh.7.1698794589164; Tue, 31 Oct 2023 16:23:09 -0700 (PDT) Received: from pazz.c.googlers.com.com (129.177.85.34.bc.googleusercontent.com. [34.85.177.129]) by smtp.gmail.com with ESMTPSA id f2-20020a0ccc82000000b0066d1d2242desm937757qvl.120.2023.10.31.16.23.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 16:23:08 -0700 (PDT) From: Paz Zcharya X-Google-Original-From: Paz Zcharya To: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin Cc: Subrata Banik , Drew Davenport , Sean Paul , Manasi Navare , Paz Zcharya , Paz Zcharya , Andrzej Hajda , Ankit Nautiyal , Daniel Vetter , David Airlie , =?utf-8?q?Jos=C3=A9_Roberto_de_Souza?= , =?utf-8?q?Jo?= =?utf-8?q?uni_H=C3=B6gander?= , Khaled Almahallawy , Luca Coelho , Matt Roper , Mika Kahola , Stanislav Lisovskiy , Suraj Kandpal , Uma Shankar , =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= , dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/i915/display: Only fail fastset on PSR2 Date: Tue, 31 Oct 2023 23:21:57 +0000 Message-ID: <20231031232245.1331194-1-pazz@google.com> X-Mailer: git-send-email 2.42.0.820.g83a721a137-goog MIME-Version: 1.0 X-Spam-Status: No, score=-1.3 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Tue, 31 Oct 2023 16:23:24 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781315253786683549 X-GMAIL-MSGID: 1781315253786683549 Currently, i915 fails fastset if both the sink and the source support any version of PSR and regardless of the configuration setting of the driver (i.e., i915.enable_psr kernel argument). However, the implementation of PSR1 enable sequence is already seamless and works smoothly with fastset. Accordingly, do not fail fastset if PSR2 is not enabled. Signed-off-by: Paz Zcharya --- drivers/gpu/drm/i915/display/intel_dp.c | 4 ++-- drivers/gpu/drm/i915/display/intel_psr.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index e0e4cb529284..a1af96e31518 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -2584,8 +2584,8 @@ bool intel_dp_initial_fastset_check(struct intel_encoder *encoder, fastset = false; } - if (CAN_PSR(intel_dp)) { - drm_dbg_kms(&i915->drm, "[ENCODER:%d:%s] Forcing full modeset to compute PSR state\n", + if (CAN_PSR(intel_dp) && psr2_global_enabled(intel_dp)) { + drm_dbg_kms(&i915->drm, "[ENCODER:%d:%s] Forcing full modeset due to PSR2\n", encoder->base.base.id, encoder->base.name); crtc_state->uapi.mode_changed = true; fastset = false; diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 97d5eef10130..388bc3246db9 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -187,7 +187,7 @@ static bool psr_global_enabled(struct intel_dp *intel_dp) } } -static bool psr2_global_enabled(struct intel_dp *intel_dp) +bool psr2_global_enabled(struct intel_dp *intel_dp) { struct drm_i915_private *i915 = dp_to_i915(intel_dp); diff --git a/drivers/gpu/drm/i915/display/intel_psr.h b/drivers/gpu/drm/i915/display/intel_psr.h index 0b95e8aa615f..6f3c36389cd3 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.h +++ b/drivers/gpu/drm/i915/display/intel_psr.h @@ -21,6 +21,7 @@ struct intel_encoder; struct intel_plane; struct intel_plane_state; +bool psr2_global_enabled(struct intel_dp *intel_dp); void intel_psr_init_dpcd(struct intel_dp *intel_dp); void intel_psr_pre_plane_update(struct intel_atomic_state *state, struct intel_crtc *crtc);