From patchwork Tue May 23 15:16:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 98050 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2229667vqo; Tue, 23 May 2023 08:31:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ55ij2GtAdhFadPdxrjuiWpkgj7Vs8NxQucYcAPCXEeWfng+u1JuXAAMGSB1G52C31iv4h0 X-Received: by 2002:a17:90a:d681:b0:255:c829:b638 with SMTP id x1-20020a17090ad68100b00255c829b638mr510199pju.9.1684855912706; Tue, 23 May 2023 08:31:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684855912; cv=none; d=google.com; s=arc-20160816; b=BoM1fHKrfyNwDj25XgPeAgHbDF3jgozZvA1qjuJXQbiZ40TSFwFhudKerMttpBnlOD kG95hES31s6Q7syuC13+o5lKPvdsIx9FpUklOh2gxp1hJP+xA4EtswUznC+KUKozTH3P CgCwLDXEFCT5Rm5rbVOtXoThhywcSyrifKvqiyALxclu2T+DLAaEGzzFHWMTypy1mzK/ CqXlr2jaFq7Yx9k5nsrjqHUnX8PTly2CwEprIqDJlaDuklgndOLwhC3qZRgYqvdBr8H3 FJ6fMkc8d3A5bS8hyupvZOAu/v3EyCO8z1ZtpVhzuGcKyy/H/K8icn/zZ/NZG5tDF6mS GREg== 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=x3LBkNezrypBVJqqCOkXhqnJ51EaPYTVI+rXSkPkXg4=; b=lOducaRUCM8s5nfc5DtjdcXI/xRkP9Uy9eNEDA4+1UB3WfgEr1xFJQ3/jqAupopCYQ zX3Lra/f71CcF2h8emqKkyZyOkTefcl2CyL+RAwK/VDGq7S/cLRmOupkmk8zppXIKJ3l sEvxzdVt+XBEo1jf1lyhGMAShS/cQl0BJNEXy4syPgS9pSYxdj1dTnMOg3W+LA/RDCap qqvW84sgAwMJsY1r7ddtPKX1L5SK2B03tVXp3qSU2kwu+Gg5x5DBIuYmE7iGBblj0Hwg mmAa4xK7FLRmkFb83u1Vs5dqV+ojplThr4SGVbS6BN9zEf5O7xXSEjtRk8Sny7qqX/h8 Tb3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=aCoBt0h0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y8-20020a17090ad70800b002504799a157si8855917pju.134.2023.05.23.08.31.37; Tue, 23 May 2023 08:31:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=aCoBt0h0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237456AbjEWPSE (ORCPT + 99 others); Tue, 23 May 2023 11:18:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237564AbjEWPRs (ORCPT ); Tue, 23 May 2023 11:17:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7522A189; Tue, 23 May 2023 08:17:42 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 07406623F1; Tue, 23 May 2023 15:17:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6381BC433D2; Tue, 23 May 2023 15:17:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684855061; bh=D2TI28zRqMeP33qD4AGJWV2hUnE/pn90ek046LImn8g=; h=From:To:Cc:Subject:Date:From; b=aCoBt0h0f7NnX7GHkpKHx5gX/kOf9gAf60zsdhyzmiEFf+xCbWPbmRlqVY2L+G3uB qHsIFCdiq1Vo2YL79EGMRddXfA7JRKvA2aXHN0efIAUqdMgUpU70iS9t8yoNaPh4KZ DyrY+bUPUsYjBE6py0YTCxEurL/YMVOizJBEywAwYU5NHi4oUJaHRd+XeYfAgLuyZM 0z0XPl9Zw2kcaFZWuqLwG09mIZVspbZef7/Yz3A5M7mw6llm7VBYZ3skX6OCps4Jpx zj9Lh+ZaiZVKPIBANRvV69ER6euCgEo++kYy6qqBNCFycbhItcIyZKJY30Y9NKIhgv Dsmk9u8YB0CZw== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1q1Tlg-0007O5-3D; Tue, 23 May 2023 17:17:44 +0200 From: Johan Hovold To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov Cc: Sean Paul , David Airlie , Daniel Vetter , Bjorn Andersson , Kuogee Hsieh , Sankeerth Billakanti , Stephen Boyd , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Johan Hovold , Vinod Polimera Subject: [PATCH] Revert "drm/msm/dp: set self refresh aware based on PSR support" Date: Tue, 23 May 2023 17:16:46 +0200 Message-Id: <20230523151646.28366-1-johan+linaro@kernel.org> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766699473518496041?= X-GMAIL-MSGID: =?utf-8?q?1766699473518496041?= This reverts commit 1844e680d56bb0c4e0489138f2b7ba2dc1c988e3. PSR support clearly is not ready for mainline and specifically breaks virtual terminals which are no longer updated when PSR is enabled (e.g. no keyboard input is echoed, no cursor blink). Disable PSR support for now by reverting commit 1844e680d56b ("drm/msm/dp: set self refresh aware based on PSR support"). Cc: Vinod Polimera Cc: Dmitry Baryshkov Signed-off-by: Johan Hovold --- Bjorn reported that PSR support broke virtual terminals two months ago, but this is still broken in 6.4-rc3: https://lore.kernel.org/lkml/20230326162723.3lo6pnsfdwzsvbhj@ripper/ despite the following series that claimed to address this: https://lore.kernel.org/lkml/1680271114-1534-1-git-send-email-quic_vpolimer@quicinc.com Let's revert until this has been fixed properly. Johan drivers/gpu/drm/msm/dp/dp_drm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c index 785d76639497..029e08c5bb06 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.c +++ b/drivers/gpu/drm/msm/dp/dp_drm.c @@ -117,8 +117,6 @@ static int edp_bridge_atomic_check(struct drm_bridge *drm_bridge, if (WARN_ON(!conn_state)) return -ENODEV; - conn_state->self_refresh_aware = dp->psr_supported; - if (!conn_state->crtc || !crtc_state) return 0;