From patchwork Wed Jan 27 16:09:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kumar, Shobhit" X-Patchwork-Id: 8135371 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 37073BEEE5 for ; Wed, 27 Jan 2016 16:12:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B6B6A20274 for ; Wed, 27 Jan 2016 16:12:05 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 35E6D20377 for ; Wed, 27 Jan 2016 16:12:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9A0AC72088; Wed, 27 Jan 2016 08:12:03 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id BDFD172037 for ; Wed, 27 Jan 2016 08:12:00 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP; 27 Jan 2016 08:10:12 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,355,1449561600"; d="scan'208";a="902256137" Received: from skumar40-mobl.iind.intel.com ([10.223.179.230]) by fmsmga002.fm.intel.com with ESMTP; 27 Jan 2016 08:10:08 -0800 From: Shobhit Kumar To: intel-gfx@lists.freedesktop.org Date: Wed, 27 Jan 2016 21:39:59 +0530 Message-Id: <1453911003-9856-2-git-send-email-shobhit.kumar@intel.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1453911003-9856-1-git-send-email-shobhit.kumar@intel.com> References: <1453911003-9856-1-git-send-email-shobhit.kumar@intel.com> Subject: [Intel-gfx] [v2 2/6] drm/i915/skl+: calculate ddb minimum allocation 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, 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 From: "Kumar, Mahesh" don't always use 8 ddb as minimum, instead calculate using proper algorithm. v2: optimizations as per Matt's comments. Cc: matthew.d.roper@intel.com Signed-off-by: Kumar, Mahesh --- drivers/gpu/drm/i915/intel_pm.c | 50 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index d55e5d0..708f329 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -2928,6 +2928,51 @@ skl_get_total_relative_data_rate(const struct intel_crtc_state *cstate) return total_data_rate; } +static uint16_t +skl_ddb_min_alloc(const struct intel_crtc *crtc, + const struct drm_plane *plane, int y) +{ + struct drm_framebuffer *fb = plane->state->fb; + struct intel_plane_state *pstate = to_intel_plane_state(plane->state); + uint32_t src_w, src_h; + uint32_t min_scanlines = 8; + uint8_t bytes_per_pixel; + + /* For packed formats, no y-plane, return 0 */ + if (y && !fb && !(fb->pixel_format == DRM_FORMAT_NV12)) + return 0; + + /* For Non Y-tile return 8-blocks */ + if (!(fb->modifier[0] == I915_FORMAT_MOD_Y_TILED) && + !(fb->modifier[0] == I915_FORMAT_MOD_Yf_TILED)) + return 8; + + src_w = drm_rect_width(&pstate->src) >> 16; + src_h = drm_rect_height(&pstate->src) >> 16; + + if (intel_rotation_90_or_270(plane->state->rotation)) + swap(src_w, src_h); + + bytes_per_pixel = y ? drm_format_plane_cpp(fb->pixel_format, 0) : + drm_format_plane_cpp(fb->pixel_format, 1); + + if (intel_rotation_90_or_270(plane->state->rotation)) { + 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"); + } + } + + return DIV_ROUND_UP((4 * src_w / (y ? 1 : 2) * bytes_per_pixel), 512) * + min_scanlines/4 + 3; +} + static void skl_allocate_pipe_ddb(struct intel_crtc_state *cstate, struct skl_ddb_allocation *ddb /* out */) @@ -2964,7 +3009,6 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate, /* 1. Allocate the mininum required blocks for each active plane */ for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane) { struct drm_plane *plane = &intel_plane->base; - struct drm_framebuffer *fb = plane->state->fb; int id = skl_wm_plane_id(intel_plane); if (!to_intel_plane_state(plane->state)->visible) @@ -2973,9 +3017,9 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate, if (plane->type == DRM_PLANE_TYPE_CURSOR) continue; - minimum[id] = 8; + minimum[id] = skl_ddb_min_alloc(intel_crtc, plane, 0); alloc_size -= minimum[id]; - y_minimum[id] = (fb->pixel_format == DRM_FORMAT_NV12) ? 8 : 0; + y_minimum[id] = skl_ddb_min_alloc(intel_crtc, plane, 1); alloc_size -= y_minimum[id]; }