From patchwork Sat Sep 26 02:26:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 7268801 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DB9A4BEEC1 for ; Sat, 26 Sep 2015 02:26:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 082BE2091C for ; Sat, 26 Sep 2015 02:26:49 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C00F92090E for ; Sat, 26 Sep 2015 02:26:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 585E56E24A; Fri, 25 Sep 2015 19:26:46 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pa0-f48.google.com (mail-pa0-f48.google.com [209.85.220.48]) by gabe.freedesktop.org (Postfix) with ESMTPS id 14A9E6E24A for ; Fri, 25 Sep 2015 19:26:45 -0700 (PDT) Received: by pablk4 with SMTP id lk4so24392116pab.3 for ; Fri, 25 Sep 2015 19:26:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=Twp6V/94MbrCWLS+KZF+dFRdUzOmoYNMR7kNOJYCACg=; b=AF1Fm+4owj9S1eLGgw+pfoE1CG5fFlcbYjK8xLlmiESeO8XJrtEatordec0alpHf01 v8c7to5IJ4Hiqg/qYR3v9F7+Fft2OJNkejF0LZj65+6gOs245yn/7HvGd/447/LfZbdz c5uCsbzftnV/wEaavciUiTCmhnYKdSmXfbsWs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Twp6V/94MbrCWLS+KZF+dFRdUzOmoYNMR7kNOJYCACg=; b=VQukP0MAhdFAv/xv6KMMR7X0iHxAG9V6YsU2Y9pjdL9lVISX7ZRWbn5CeT9zzzGYzI 3ehDissKmOEqNBb0uYKiG8uNcMSPSigkUwz4JWqAeH1qO1q5Lav37xZ0w9FNd7idUJNW axNyml0UcTKLLqzF6jlnchlnUpQvpptJHNJdg/3aX2RFk4EvYM5BpSPiT1ShM2nzv0aP xCFLg6THhiYMbo45czT6J/keiGYIgbWwh4q4EI0nXnzwyOAFjINgKmLkfEnI9oMddFXV 6f7LvtZ/pTjjkLi/LabgNFgSqBSal8daLTgUmwBcKOB4zALjUUu4CZlBJ3lY+9hSKHb1 22ow== X-Gm-Message-State: ALoCoQmR2jT84YYxxlNIvea8vZgEXX/ReUvOztwDM6mG0OJpDA6HkquRGP22nlmP4PUn+kfKoWVb X-Received: by 10.68.94.99 with SMTP id db3mr11278275pbb.165.1443234404706; Fri, 25 Sep 2015 19:26:44 -0700 (PDT) Received: from ban.mtv.corp.google.com ([172.22.64.120]) by smtp.gmail.com with ESMTPSA id zk9sm6330895pac.7.2015.09.25.19.26.43 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 Sep 2015 19:26:43 -0700 (PDT) From: Brian Norris To: Date: Fri, 25 Sep 2015 19:26:13 -0700 Message-Id: <1443234373-107752-1-git-send-email-briannorris@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 Cc: Brian Norris , Rodrigo Vivi , linux-kernel@vger.kernel.org, Daniel Vetter , Brian Norris , Duncan Laurie Subject: [Intel-gfx] [RFC PATCH] drm/i915: PSR regressions on Broadwell X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When using PSR, I see the screen freeze after only a few frames (sometimes a split second; sometimes it seems like practically the first frame). Bisecting led me to commit 3301d4092106 ("drm/i915: PSR: Fix DP_PSR_NO_TRAIN_ON_EXIT logic") in v4.2. This patch is the simplest fix that gets it working again for me, but it's probably wrong. Random thought: perhaps my panel's DPCD is programmed incorrectly? Anyway, any tips on fixing this properly? Seen on Chromebook Pixel 2. Also required this patch to get PSR properly running on 4.3-rc2: https://patchwork.freedesktop.org/patch/57698/ Signed-off-by: Brian Norris --- drivers/gpu/drm/i915/intel_psr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c index 7e335a8546f6..4cd33b76b8a6 100644 --- a/drivers/gpu/drm/i915/intel_psr.c +++ b/drivers/gpu/drm/i915/intel_psr.c @@ -261,7 +261,8 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) uint32_t val = 0x0; const uint32_t link_entry_time = EDP_PSR_MIN_LINK_ENTRY_TIME_8_LINES; - if (intel_dp->psr_dpcd[1] & DP_PSR_NO_TRAIN_ON_EXIT) { + if ((intel_dp->psr_dpcd[1] & DP_PSR_NO_TRAIN_ON_EXIT) && + !IS_BROADWELL(dev)) { /* It doesn't mean we shouldn't send TPS patters, so let's send the minimal TP1 possible and skip TP2. */ val |= EDP_PSR_TP1_TIME_100us;