From patchwork Tue Sep 1 01:35:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chandra Konduru X-Patchwork-Id: 7102081 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 17807BEEC1 for ; Tue, 1 Sep 2015 01:37:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 250062055D for ; Tue, 1 Sep 2015 01:37:07 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 334CC2051F for ; Tue, 1 Sep 2015 01:37:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A86BA6E4D4; Mon, 31 Aug 2015 18:37:05 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 548216E4D4 for ; Mon, 31 Aug 2015 18:37:04 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP; 31 Aug 2015 18:37:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,445,1437462000"; d="scan'208";a="795390247" Received: from cmkondur-desk2.fm.intel.com ([10.19.83.165]) by fmsmga002.fm.intel.com with ESMTP; 31 Aug 2015 18:37:04 -0700 From: Chandra Konduru To: intel-gfx@lists.freedesktop.org Date: Mon, 31 Aug 2015 18:35:06 -0700 Message-Id: <1441071321-419-2-git-send-email-chandra.konduru@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1441071321-419-1-git-send-email-chandra.konduru@intel.com> References: <1441071321-419-1-git-send-email-chandra.konduru@intel.com> Cc: daniel.vetter@intel.com, ville.syrjala@intel.com Subject: [Intel-gfx] [PATCH 01/16] drm/i915: Allocate min dbuf blocks per bspec 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 Properly allocate min blocks per hw requirements. Signed-off-by: Chandra Konduru --- drivers/gpu/drm/i915/intel_pm.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index fff0c22..da3046f 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -2959,6 +2959,41 @@ skl_get_total_relative_data_rate(struct intel_crtc *intel_crtc, return total_data_rate; } +static uint16_t +skl_dbuf_min_alloc(const struct intel_plane_wm_parameters *p, int y_plane) +{ + uint16_t min_alloc; + + /* For packed formats, no y-plane, return 0 */ + if (y_plane && !p->y_bytes_per_pixel) + return 0; + + + if (p->tiling == I915_FORMAT_MOD_Y_TILED || + p->tiling == I915_FORMAT_MOD_Yf_TILED) { + uint32_t min_scanlines = 8; + uint8_t bytes_per_pixel = + y_plane ? p->y_bytes_per_pixel : p->bytes_per_pixel; + + switch (bytes_per_pixel) { + case 1: + min_scanlines = 32; + break; + case 2: + min_scanlines = 16; + break; + case 8: + WARN(1, "Unsupported pixel depth for rotation"); + } + min_alloc = DIV_ROUND_UP((4 * p->horiz_pixels/(y_plane ? 1 : 2) * + bytes_per_pixel), 512) * min_scanlines/4 + 3; + } else { + min_alloc = 8; + } + + return min_alloc; +} + static void skl_allocate_pipe_ddb(struct drm_crtc *crtc, const struct intel_wm_config *config, @@ -2999,9 +3034,9 @@ skl_allocate_pipe_ddb(struct drm_crtc *crtc, if (!p->enabled) continue; - minimum[plane] = 8; + minimum[plane] = skl_dbuf_min_alloc(p, 0); /* uv-plane/packed */ alloc_size -= minimum[plane]; - y_minimum[plane] = p->y_bytes_per_pixel ? 8 : 0; + y_minimum[plane] = skl_dbuf_min_alloc(p, 1); /* y-plane */ alloc_size -= y_minimum[plane]; }