From patchwork Fri Aug 14 06:57:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1344670 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com 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 ozlabs.org (Postfix) with ESMTPS id 4BSZ6C2pLVz9sPB; Fri, 14 Aug 2020 16:58:43 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1k6Tfj-000850-2K; Fri, 14 Aug 2020 06:58:39 +0000 Received: from mail-pf1-f194.google.com ([209.85.210.194]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1k6Tfd-0007st-7f for kernel-team@lists.ubuntu.com; Fri, 14 Aug 2020 06:58:33 +0000 Received: by mail-pf1-f194.google.com with SMTP id a79so4100132pfa.8 for ; Thu, 13 Aug 2020 23:58:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2suK/vY+UUpLXxyeMCYqVvBXBtpEj+RkHDXRKzJI38g=; b=VTPhZHn3JAu8WOf3ctiswZYcPQ6JTIiZd3uPlq/WNHcxTbqYsz6hO4aBpwC+GEsUvR FjgQPP89yTVu5PPqY097wroaUqtoepdjRYRmqEHBzimXfT9CQoRAO2YNphKRswbfIxZZ rETl9lAQpQky+om6zsjxqY8c65Q/44/uRdExBtBkBL0sdOGVhJQChVZRUON34BfWPK3v NiAsgNozjhTv0u7FaqpPOuUj0fIE5tnWs+6MeGtEU46DKbLTauxk3eQaBahZZ3XFtAQC jSrZ2WkKr6AomiaglL7j0oGlAPaw7gEZdtWspFrrkKCTegJ3ibi1qudeDdAi57ozlOZ0 AeQQ== X-Gm-Message-State: AOAM531CV7NCpKhHGHWhMaqDuKAjHwuKrF6fUM/B6NkkjOoFpfET7fvW G56mOOSdjSIVLaUIrAhHSDa/voTfnbFTDg== X-Google-Smtp-Source: ABdhPJx3g2Z0P+iLzBFkuQ1LVlWLt27KAC6UgLbqIycabLb/pS0FOZ5py+XC/yF2jOzU9iPACBjbpA== X-Received: by 2002:a65:538d:: with SMTP id x13mr885727pgq.33.1597388303601; Thu, 13 Aug 2020 23:58:23 -0700 (PDT) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id j142sm8306887pfd.100.2020.08.13.23.58.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Aug 2020 23:58:22 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 15/31][SRU][OEM-5.6] drm/i915: Enable transition watermarks for glk Date: Fri, 14 Aug 2020 14:57:24 +0800 Message-Id: <20200814065740.276039-16-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200814065740.276039-1-vicamo.yang@canonical.com> References: <20200814065740.276039-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.210.194; envelope-from=vicamo@gmail.com; helo=mail-pf1-f194.google.com 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: Ville Syrjälä BugLink: https://bugs.launchpad.net/bugs/1891451 We are mistakenly skipping transition watermarks on glk. Fix up the condition for glk, and toss in the w/a name from the database. v2: Reorder the ipc enabled vs. platform check to be more sensible Signed-off-by: Ville Syrjälä Reviewed-by: Rodrigo Vivi #v1 Link: https://patchwork.freedesktop.org/patch/msgid/20200228203552.30273-3-ville.syrjala@linux.intel.com (cherry picked from commit a7f1e8e45f21a0c8e966a8678fe0391f4196b178) Signed-off-by: You-Sheng Yang --- drivers/gpu/drm/i915/intel_pm.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index e5460b470f1f..29137201e20a 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -5128,14 +5128,17 @@ static void skl_compute_transition_wm(const struct intel_crtc_state *crtc_state, const u16 trans_amount = 10; /* This is configurable amount */ u16 wm0_sel_res_b, trans_offset_b, res_blocks; - /* Transition WM are not recommended by HW team for GEN9 */ - if (INTEL_GEN(dev_priv) <= 9) - return; - /* Transition WM don't make any sense if ipc is disabled */ if (!dev_priv->ipc_enabled) return; + /* + * WaDisableTWM:skl,kbl,cfl,bxt + * Transition WM are not recommended by HW team for GEN9 + */ + if (IS_GEN9_BC(dev_priv) || IS_BROXTON(dev_priv)) + return; + trans_min = 14; if (INTEL_GEN(dev_priv) >= 11) trans_min = 4;