From patchwork Fri Feb 25 10:18:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Riesen X-Patchwork-Id: 589801 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1PAIZPw029161 for ; Fri, 25 Feb 2011 10:18:55 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F0C769F364 for ; Fri, 25 Feb 2011 02:18:34 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-gw0-f52.google.com (mail-gw0-f52.google.com [74.125.83.52]) by gabe.freedesktop.org (Postfix) with ESMTP id A305C9E793 for ; Fri, 25 Feb 2011 02:18:25 -0800 (PST) Received: by gwaa20 with SMTP id a20so926953gwa.25 for ; Fri, 25 Feb 2011 02:18:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=ZY2C/cJjZ1ZNs5lkVmqDuoU76UUAxEL5l/c98rCR4DM=; b=Ucjii4JkVj06uJW9Vssh7VaO9WyezadeaVHss5AXp5N6VOGmE3gHsnwTh4nRKBlYNH NeI6BwI11timhL0WPVT/GJwhCt9SAxU0tQ5NEwOuOwSEBXQ1hO6QaZBEqzjpIYir36D3 uaNWcwQXOZ0oYkHMZe+X+Hu4yaaGfNi7eRgT0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=ZLasPNEYzxkgaUaA5McDyRGD8bH0KvAeBeG+9GQekZgQV6Tp1vmd9UP6/2lquaHjZ0 McpDwkPJ/RQjgvfPFTgqnDqyV2nGBhi5ZBHHQ6O4I1Q9CgIbxgtbtnXjEilMSRnGslMO iMwAhbm0+CblM/ADvbsPvGVQw/c4ex8Vwz8xU= MIME-Version: 1.0 Received: by 10.90.82.11 with SMTP id f11mr3525025agb.40.1298629104919; Fri, 25 Feb 2011 02:18:24 -0800 (PST) Received: by 10.90.223.11 with HTTP; Fri, 25 Feb 2011 02:18:24 -0800 (PST) In-Reply-To: <1cced1eb38110129d097e1c8b6857d81.squirrel@webmail.greenhost.nl> References: <0d30dc$l7ehaa@orsmga001.jf.intel.com> <1cced1eb38110129d097e1c8b6857d81.squirrel@webmail.greenhost.nl> Date: Fri, 25 Feb 2011 11:18:24 +0100 Message-ID: Subject: Re: [git pull] drm fixes From: Alex Riesen To: Indan Zupancic Cc: linux-kernel@vger.kernel.org, DRI mailing list , Linus Torvalds X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 25 Feb 2011 10:18:55 +0000 (UTC) X-MIME-Autoconverted: from base64 to 8bit by demeter1.kernel.org id p1PAIZPw029161 diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index cf4f74c..2e6b532 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1404,6 +1404,8 @@ i915_gem_get_unfenced_gtt_alignment(struct drm_i915_gem_object *obj) struct drm_device *dev = obj->base.dev; int tile_height; + return i915_gem_get_gtt_alignment(obj); + /* * Minimum alignment is 4k (GTT page size) for sane hw.