From patchwork Fri Dec 18 23:58:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sripada, Radhakrishna" X-Patchwork-Id: 7889021 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 60F87BEEE5 for ; Fri, 18 Dec 2015 23:58:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 94FC220520 for ; Fri, 18 Dec 2015 23:58:44 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id F372320519 for ; Fri, 18 Dec 2015 23:58:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4448E6EB29; Fri, 18 Dec 2015 15:58:41 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 1DFED6EB28; Fri, 18 Dec 2015 15:58:40 -0800 (PST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP; 18 Dec 2015 15:58:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,448,1444719600"; d="scan'208";a="710740490" Received: from invictus.jf.intel.com ([10.7.198.170]) by orsmga003.jf.intel.com with ESMTP; 18 Dec 2015 15:58:40 -0800 From: Radhakrishna Sripada To: intel-gfx@lists.freedesktop.org Date: Fri, 18 Dec 2015 15:58:52 -0800 Message-Id: <1450483132-440-1-git-send-email-radhakrishna.sripada@intel.com> X-Mailer: git-send-email 1.9.1 Cc: drm-intel-fixes@lists.freedesktop.org, Kalyan Kondapally Subject: [Intel-gfx] [PATCH v2] drm/i915/skl: Increase ddb blocks to support large cursor sizes 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, 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 Original value of 32 blocks is not sufficient when using cursor size of 256x256 causing FIFO underruns when the reworked wm caluclations in commit 024c9045221fe45482863c47c4b4c47d37f97cbf Author: Matt Roper Date: Thu Sep 24 15:53:11 2015 -0700 drm/i915/skl: Eliminate usage of pipe_wm_parameters from SKL-style WM (v4) are used. Increasing the number of blocks to 52 to make cursor plane tolerate SAGV block time for the maximum possible cursor size. v2: Included Matt's suggestion, bumping up the no of blocks in multi-pipe case to 16. Signed-off-by: Radhakrishna Sripada Signed-off-by: Kalyan Kondapally --- drivers/gpu/drm/i915/intel_pm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index d385d99..c5ba4e5 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -2802,9 +2802,9 @@ skl_ddb_get_pipe_allocation_limits(struct drm_device *dev, static unsigned int skl_cursor_allocation(const struct intel_wm_config *config) { if (config->num_pipes_active == 1) - return 32; + return 52; - return 8; + return 16; } static void skl_ddb_entry_init_from_hw(struct skl_ddb_entry *entry, u32 reg)