[PATCH 7/9] drm/vmwgfx: don't initialize TTM io memory manager field

From: Jerome Glisse <jglisse@redhat.com>
To: airlied@gmail.com
Cc: thellstrom@vmware.com, skeggsb@gmail.com,
	Jerome Glisse <jglisse@redhat.com>,
	dri-devel@lists.sf.net
Subject: [PATCH 7/9] drm/vmwgfx: don't initialize TTM io memory manager field
Date: Sat, 20 Feb 2010 00:45:56 +0100	[thread overview]
Message-ID: <1266623158-2404-8-git-send-email-jglisse@redhat.com> (raw)
In-Reply-To: <1266623158-2404-7-git-send-email-jglisse@redhat.com>

This isn't needed anymore with the new TTM fault callback

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
---
 drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
index c284f52..f5d2519 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
@@ -137,9 +137,6 @@ int vmw_invalidate_caches(struct ttm_bo_device *bdev, uint32_t flags)
 int vmw_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
 		      struct ttm_mem_type_manager *man)
 {
-	struct vmw_private *dev_priv =
-	    container_of(bdev, struct vmw_private, bdev);
-
 	switch (type) {
 	case TTM_PL_SYSTEM:
 		/* System memory */
@@ -151,11 +148,8 @@ int vmw_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
 	case TTM_PL_VRAM:
 		/* "On-card" video ram */
 		man->gpu_offset = 0;
-		man->io_offset = dev_priv->vram_start;
-		man->io_size = dev_priv->vram_size;
 		man->flags = TTM_MEMTYPE_FLAG_FIXED |
 		    TTM_MEMTYPE_FLAG_NEEDS_IOREMAP | TTM_MEMTYPE_FLAG_MAPPABLE;
-		man->io_addr = NULL;
 		man->available_caching = TTM_PL_MASK_CACHING;
 		man->default_caching = TTM_PL_FLAG_WC;
 		break;
-- 
1.6.6


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--
