Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp2306946ybz; Thu, 30 Apr 2020 14:49:54 -0700 (PDT) X-Google-Smtp-Source: APiQypJlsizXhH755uTPdowKk6VWbXrWFIrguENgwEjSNKE/nKUtLNkr3HDBz6Yu55biSY33Gg08 X-Received: by 2002:a17:906:f1d2:: with SMTP id gx18mr570304ejb.24.1588283394785; Thu, 30 Apr 2020 14:49:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588283394; cv=none; d=google.com; s=arc-20160816; b=R+70zWZF0xEJ8vmmd8Ee4qLRe6du7eB4m3EBbLwwzvhz166Rb2SH0YYn5dQjAay6fz jVrXowgm/ZnxP6bKz7/E0FZdhHqDhbzaHfAqESPftftuQj7ttXWY9ElEGt6zwPU/+/C8 H4zj4CxABcBhv+yIvei2lqaFSzazN/P7xypn0Yn7xNYJw2aS96Sz0HAYISovt8v/HDWH hWeGtHLSzI3qPPClMx6ftAMdBMBP9NrYu+1SjdxEbMth8s7WuZh6wLKpfewfCQFg9Hq/ t8XcmzT2qNFV2ZnTw1tn9/NfDMBt+bI4qcIBvb6M0ry7qNPiIPDkOruEZxNH8ABi6msg F8sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:to:content-transfer-encoding:mime-version :message-id:date:subject:cc:from:dkim-signature; bh=VEoKjaxo4U/H7kyegfaqsoRet1MtFuSswC0UEQ4BGR4=; b=c35/3fU4AfTDpXI68fc5fX5L0bAeI9CW6LMDPeKsz75RnqSR+bt7is620d1ICJs2du hanhbKqxX9MIbqoGMq0eQTqv+TlQ8tDR2CoNpQTtP+L9yfwC1eOWFfQMTWcFS+nYnTTk g54ICNNZZ8lG92vVGl0HQPqygd5dSs7BvSfTQKFKHmbgI/1/+++evE78c5kW6nqSQ8aq jcFpDQPKX2hVzFe07CFjXt8GLC76mWEYrpvi4Y7Ic7X0aoiEf6ulhaJ4QLc8oWuqMZ4J qemDi8zrmbhg85Qva23En6yTtpBjRIXbMqGtJfPvjDnYJBsea8TALEwOMdjI1tsdEMZr xLZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=nbxQst+V; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y4si543429edv.549.2020.04.30.14.49.31; Thu, 30 Apr 2020 14:49:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=nbxQst+V; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726817AbgD3Vr3 (ORCPT + 99 others); Thu, 30 Apr 2020 17:47:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726336AbgD3Vr2 (ORCPT ); Thu, 30 Apr 2020 17:47:28 -0400 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BA16C035494; Thu, 30 Apr 2020 14:47:28 -0700 (PDT) Received: by mail-pf1-x443.google.com with SMTP id x2so569625pfx.7; Thu, 30 Apr 2020 14:47:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=VEoKjaxo4U/H7kyegfaqsoRet1MtFuSswC0UEQ4BGR4=; b=nbxQst+Vtu3ZTqPSC6mNSEZiYn4TaBwPFH1Cm9loSUDn0Cx4uD9L6qTjQJW2wDaBpe kOdXjfwrvhcDUIu4FmnufwEAmTUW/ojO1BI7gdzDrhOivb3PeoZLBPImO19WiedKgIOc PY8VxGUt+gb82ydshSG3lAwaux9OPL47OB3tXOLykmO6eeZ3tAi0FPitnsfVNNVfxjjH xvs1o9S3M4wWVV4vs1/kEr234iwPmYJixT5ZIL34ivF9hTIXf7DVbX+alwr2+h4OhtbS DCNMA0eTr4zcCzsJB+3bY9JJUxWQ8IaCBmVsYr3jKjJxyo22EzkCG1e7e/7+GmGyYnFw AvTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=VEoKjaxo4U/H7kyegfaqsoRet1MtFuSswC0UEQ4BGR4=; b=U1BK4Fe0UebhUvd+M04VC9snPMp5dfRQNMKbcRO1qOtVus5MRyZqzGzDZOfPG1Q6Fz EQ6G4yZIt/gdWc5Cua3KiNMgSKyInemub3ugHCmhDgazlzp7a1aqdJMJcRybGesrgB15 P+l5mNLsaJSVNlhDKBAKagIrjjsESCQdh1dfphXc2O7+szsaM/DPKpifeL5zfmKYYKDb Bc57YQapfaL1YxmyTsiOVzUb+YaHK6EyJVsuIoLHDh1WFmlmqcZ0KiWgXadh22iWxBjV DjCzK6R9OrLSZ+rn05nF9W9dUDx3DGV6U32smbbAZf6Qaf9wZMDv6kDxQt3RhF82Oecr KFTQ== X-Gm-Message-State: AGi0Puar0hhqEhXF7JdcEZq7ceBMBg3Yuhg/jK6orrnfxBr9oJS+vmpI kIHM2Vzqm0j+6wmcBLFFVWs= X-Received: by 2002:a63:da02:: with SMTP id c2mr1027206pgh.22.1588283247850; Thu, 30 Apr 2020 14:47:27 -0700 (PDT) Received: from sultan-box.localdomain ([104.200.129.62]) by smtp.gmail.com with ESMTPSA id c2sm625854pfp.118.2020.04.30.14.47.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Apr 2020 14:47:26 -0700 (PDT) From: Sultan Alsawaf X-Google-Original-From: Sultan Alsawaf Cc: Sultan Alsawaf , stable@vger.kernel.org, Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , David Airlie , Daniel Vetter , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/i915: Don't enable WaIncreaseLatencyIPCEnabled when IPC is disabled Date: Thu, 30 Apr 2020 14:46:54 -0700 Message-Id: <20200430214654.51314-1-sultan@kerneltoast.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sultan Alsawaf In commit 5a7d202b1574, a logical AND was erroneously changed to an OR, causing WaIncreaseLatencyIPCEnabled to be enabled unconditionally for kabylake and coffeelake, even when IPC is disabled. Fix the logic so that WaIncreaseLatencyIPCEnabled is only used when IPC is enabled. Fixes: 5a7d202b1574 ("drm/i915: Drop WaIncreaseLatencyIPCEnabled/1140 for cnl") Cc: stable@vger.kernel.org # 5.3.x+ Signed-off-by: Sultan Alsawaf --- drivers/gpu/drm/i915/intel_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 8375054ba27d..a52986a9e7a6 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4992,7 +4992,7 @@ static void skl_compute_plane_wm(const struct intel_crtc_state *crtc_state, * WaIncreaseLatencyIPCEnabled: kbl,cfl * Display WA #1141: kbl,cfl */ - if ((IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv)) || + if ((IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv)) && dev_priv->ipc_enabled) latency += 4; -- 2.26.2