From patchwork Fri Nov 15 00:04:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 3185931 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2F35C9F3AE for ; Fri, 15 Nov 2013 00:04:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 566A120937 for ; Fri, 15 Nov 2013 00:04:48 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 8F17B20901 for ; Fri, 15 Nov 2013 00:04:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F06E8FB6AE; Thu, 14 Nov 2013 16:04:45 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from oproxy9-pub.mail.unifiedlayer.com (oproxy9-pub.mail.unifiedlayer.com [69.89.24.6]) by gabe.freedesktop.org (Postfix) with SMTP id 2F8F2FB6A8 for ; Thu, 14 Nov 2013 16:04:35 -0800 (PST) Received: (qmail 25033 invoked by uid 0); 15 Nov 2013 00:04:35 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by oproxy9.mail.unifiedlayer.com with SMTP; 15 Nov 2013 00:04:35 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuousgeek.org; s=default; h=Message-Id:Date:Subject:To:From; bh=rItoRHhtFsb5PmCI4BYveojIzVNj1M4LWj7XSikJEoo=; b=bDRuaAmadzFEzDb5aGkyd8K6Ri59RPE109koh8Ld8oa6KYAhWSPtBS4jTb5UCMXixvzyYjgN3fuPGERzrr/8c+Uvqo9WX2z2lcAlI+OZ5fYtBMiwAZIcPjJmUc5qhUbq; Received: from [67.161.37.189] (port=40370 helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (TLSv1:CAMELLIA256-SHA:256) (Exim 4.82) (envelope-from ) id 1Vh6tj-0002gn-Sw for intel-gfx@lists.freedesktop.org; Thu, 14 Nov 2013 17:04:32 -0700 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Thu, 14 Nov 2013 16:04:21 -0800 Message-Id: <1384473865-1456-1-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.8.4.2 X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.161.37.189 authed with jbarnes@virtuousgeek.org} Subject: [Intel-gfx] [PATCH 1/5] drm/i915: make pitch_for_width take a tiled arg v2 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 And move it up in the file for earlier usage. v2: add pre-gen4 support as well (Chris) Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_display.c | 53 ++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3b7f1c4..4cab78d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5452,6 +5452,28 @@ static void vlv_crtc_clock_get(struct intel_crtc *crtc, pipe_config->port_clock = clock.dot / 5; } +static u32 +intel_framebuffer_pitch_for_width(struct drm_i915_private *dev_priv, int width, + int bpp, bool tiled) +{ + u32 pitch = DIV_ROUND_UP(width * bpp, 8); + int align; + + if (tiled) { + if (INTEL_INFO(dev_priv->dev)->gen < 4) { + /* Pre-965 needs power of two tile width */ + for (align = 512; align < pitch; align <<= 1) + ; + } else { + align = 512; + } + } else { + align = 64; + } + + return ALIGN(pitch, align); +} + static bool i9xx_get_pipe_config(struct intel_crtc *crtc, struct intel_crtc_config *pipe_config) { @@ -7629,16 +7651,12 @@ err: } static u32 -intel_framebuffer_pitch_for_width(int width, int bpp) -{ - u32 pitch = DIV_ROUND_UP(width * bpp, 8); - return ALIGN(pitch, 64); -} - -static u32 -intel_framebuffer_size_for_mode(struct drm_display_mode *mode, int bpp) +intel_framebuffer_size_for_mode(struct drm_i915_private *dev_priv, + struct drm_display_mode *mode, int bpp) { - u32 pitch = intel_framebuffer_pitch_for_width(mode->hdisplay, bpp); + u32 pitch = intel_framebuffer_pitch_for_width(dev_priv, + mode->hdisplay, bpp, + false); return ALIGN(pitch * mode->vdisplay, PAGE_SIZE); } @@ -7647,18 +7665,21 @@ intel_framebuffer_create_for_mode(struct drm_device *dev, struct drm_display_mode *mode, int depth, int bpp) { + struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_gem_object *obj; struct drm_mode_fb_cmd2 mode_cmd = { 0 }; + int size; - obj = i915_gem_alloc_object(dev, - intel_framebuffer_size_for_mode(mode, bpp)); + size = intel_framebuffer_size_for_mode(dev_priv, mode, bpp); + obj = i915_gem_alloc_object(dev, size); if (obj == NULL) return ERR_PTR(-ENOMEM); mode_cmd.width = mode->hdisplay; mode_cmd.height = mode->vdisplay; - mode_cmd.pitches[0] = intel_framebuffer_pitch_for_width(mode_cmd.width, - bpp); + mode_cmd.pitches[0] = intel_framebuffer_pitch_for_width(dev_priv, + mode_cmd.width, + bpp, false); mode_cmd.pixel_format = drm_mode_legacy_fb_format(bpp, depth); return intel_framebuffer_create(dev, &mode_cmd, obj); @@ -7681,8 +7702,10 @@ mode_fits_in_fbdev(struct drm_device *dev, return NULL; fb = &dev_priv->fbdev->ifb.base; - if (fb->pitches[0] < intel_framebuffer_pitch_for_width(mode->hdisplay, - fb->bits_per_pixel)) + if (fb->pitches[0] < intel_framebuffer_pitch_for_width(dev_priv, + mode->hdisplay, + fb->bits_per_pixel, + false)) return NULL; if (obj->base.size < mode->vdisplay * fb->pitches[0])