From patchwork Tue Feb 23 14:40:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Glisse X-Patchwork-Id: 81465 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1NEg3mk000791 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 23 Feb 2010 14:42:39 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1NjvwY-0008Ji-U6; Tue, 23 Feb 2010 14:40:58 +0000 Received: from sfi-mx-4.v28.ch3.sourceforge.com ([172.29.28.124] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1NjvwX-0008JZ-S9 for dri-devel@lists.sourceforge.net; Tue, 23 Feb 2010 14:40:57 +0000 Received-SPF: fail (sfi-mx-4.v28.ch3.sourceforge.com: domain of redhat.com does not designate 88.191.38.29 as permitted sender) client-ip=88.191.38.29; envelope-from=jglisse@redhat.com; helo=nox.protox.org; Received: from nox.protox.org ([88.191.38.29]) by sfi-mx-4.v28.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.69) id 1NjvwW-0002Bz-NY for dri-devel@lists.sourceforge.net; Tue, 23 Feb 2010 14:40:57 +0000 Received: from localhost.localdomain (lag77-1-82-238-106-69.fbx.proxad.net [82.238.106.69]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by nox.protox.org (Postfix) with ESMTPSA id B7B72169E3F; Tue, 23 Feb 2010 15:40:49 +0100 (CET) From: Jerome Glisse To: airlied@gmail.com Subject: [PATCH 3/9] drm/nouveau/kms: add support for new TTM fault callback V2 Date: Tue, 23 Feb 2010 15:40:38 +0100 Message-Id: <1266936044-11211-4-git-send-email-jglisse@redhat.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1266936044-11211-3-git-send-email-jglisse@redhat.com> References: <1266936044-11211-1-git-send-email-jglisse@redhat.com> <1266936044-11211-2-git-send-email-jglisse@redhat.com> <1266936044-11211-3-git-send-email-jglisse@redhat.com> X-Spam-Score: 4.9 (++++) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 4.0 SPF_CHECK_FAIL SPF reports sender host as NOT permitted to send mails from 1.0 SPF_FAIL SPF: sender does not match SPF record (fail) -0.1 AWL AWL: From: address is in the auto white-list X-Headers-End: 1NjvwW-0002Bz-NY Cc: thellstrom@vmware.com, skeggsb@gmail.com, Jerome Glisse , dri-devel@lists.sf.net X-BeenThere: dri-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.sourceforge.net X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 23 Feb 2010 14:42:39 +0000 (UTC) diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index db0ed4c..bb45233 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -757,6 +757,49 @@ nouveau_bo_verify_access(struct ttm_buffer_object *bo, struct file *filp) return 0; } +static int +nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem, struct ttm_bus_placement *pl) +{ + struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type]; + struct drm_nouveau_private *dev_priv = nouveau_bdev(bdev); + struct drm_device *dev = dev_priv->dev; + + pl->offset = 0; + pl->size = mem->num_pages << PAGE_SHIFT; + pl->base = 0; + pl->is_iomem = false; + if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE)) + return -EINVAL; + switch (mem->mem_type) { + case TTM_PL_SYSTEM: + /* System memory */ + return 0; + case TTM_PL_TT: + pl->offset = mem->mm_node->start << PAGE_SHIFT; +#if __OS_HAS_AGP + if (dev_priv->gart_info.type == NOUVEAU_GART_AGP) { + pl->base = dev_priv->gart_info.aper_base; + pl->is_iomem = true; + } +#endif + return 0; + case TTM_PL_VRAM: + pl->offset = mem->mm_node->start << PAGE_SHIFT; + pl->base = drm_get_resource_start(dev, 1); + pl->is_iomem = true; + break; + default: + return -EINVAL; + } + return 0; +} + +static int +nouveau_ttm_fault(struct ttm_buffer_object *bo, struct ttm_bus_placement *pl) +{ + return nouveau_ttm_io_mem_reserve(bo->bdev, &bo->mem, pl); +} + struct ttm_bo_driver nouveau_bo_driver = { .create_ttm_backend_entry = nouveau_bo_create_ttm_backend_entry, .invalidate_caches = nouveau_bo_invalidate_caches, @@ -769,5 +812,8 @@ struct ttm_bo_driver nouveau_bo_driver = { .sync_obj_flush = nouveau_fence_flush, .sync_obj_unref = nouveau_fence_unref, .sync_obj_ref = nouveau_fence_ref, + .fault_reserve = &nouveau_ttm_fault, + .io_mem_reserve = &nouveau_ttm_io_mem_reserve, + .io_mem_free = NULL, };