From patchwork Thu Apr 22 21:38:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Owain Ainsworth X-Patchwork-Id: 94544 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3MLcxeT029490 for ; Thu, 22 Apr 2010 21:40:45 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0633C9F3C5; Thu, 22 Apr 2010 14:38:58 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ww0-f49.google.com (mail-ww0-f49.google.com [74.125.82.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 78F969E817 for ; Thu, 22 Apr 2010 14:38:54 -0700 (PDT) Received: by mail-ww0-f49.google.com with SMTP id 17so176209wwi.36 for ; Thu, 22 Apr 2010 14:38:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:received:from:to:cc:subject :date:message-id:x-mailer:in-reply-to:references; bh=amMFAc08SF77TpE0pzhmh43/XRzSoJztaco5/VnJAd8=; b=sO0OMzSasCjblde+qSPzsbXmoROnVm2YEWrMmPm91oZTBpePQ2T776WFR0XCH5ao4/ dydPgaHSnKB7XsJX3CUDWzI973fcbLwht/h2QvkgGO2qIZQBV+epDIc/gvZ0cX+No+Qe ymK2tcfKq3TYJQY2Dnko23jpxwIKZfRKxOSPo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=X05dBYtp4EnLci0u41AdNHF+lYz1XED7Ppn3sRylOHGBqKJFkYmonf/m5ZQcUziUqG hLVvBJTnbL1MzZ9VC02WNhf4n4SiC3JYVHZ1e+7QlIrTtsYUnUy2pNUufljMDnJBXfgO T+xQWCienWnLR91/DczpNOYfuzvZGnDokZfw4= Received: by 10.216.93.19 with SMTP id k19mr3536159wef.223.1271972334058; Thu, 22 Apr 2010 14:38:54 -0700 (PDT) Received: from stephanie.nicotinebsd.org (ns1.nicotinebsd.org [93.97.176.184]) by mx.google.com with ESMTPS id z34sm2803298wbv.2.2010.04.22.14.38.53 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Apr 2010 14:38:53 -0700 (PDT) Received: from localhost (1000@localhost [IPv6:::1]) by stephanie.nicotinebsd.org (OpenSMTPD) with ESMTP id 1271972332.VdithES9QJYsjfV8; Thu, 22 Apr 2010 22:38:52 +0100 (BST) From: "Owain G. Ainsworth" To: intel-gfx@lists.freedesktop.org Date: Thu, 22 Apr 2010 22:38:42 +0100 Message-Id: <1271972322-18780-2-git-send-email-oga@openbsd.org> X-Mailer: git-send-email 1.6.5.7 In-Reply-To: <1271972322-18780-1-git-send-email-oga@openbsd.org> References: <1271972322-18780-1-git-send-email-oga@openbsd.org> Cc: "Owain G. Ainsworth" Subject: [Intel-gfx] [PATCH 2/2] drm/i915: Remove the bind in mmap_gtt_ioctl X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 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-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 22 Apr 2010 21:40:51 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index a9da182..935cd83 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1426,20 +1426,6 @@ i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data, args->offset = obj_priv->mmap_offset; - /* - * Pull it into the GTT so that we have a page list (makes the - * initial fault faster and any subsequent flushing possible). - */ - if (!obj_priv->agp_mem) { - ret = i915_gem_object_bind_to_gtt(obj, 0); - if (ret) { - drm_gem_object_unreference(obj); - mutex_unlock(&dev->struct_mutex); - return ret; - } - list_add_tail(&obj_priv->list, &dev_priv->mm.inactive_list); - } - drm_gem_object_unreference(obj); mutex_unlock(&dev->struct_mutex);