From patchwork Tue Nov 6 21:49:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marcin_=C5=9Alusarz?= X-Patchwork-Id: 1706961 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id CBE8BDFE75 for ; Tue, 6 Nov 2012 21:53:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CABE9A08CE for ; Tue, 6 Nov 2012 13:53:31 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id CF38AA022E for ; Tue, 6 Nov 2012 13:49:35 -0800 (PST) Received: by mail-we0-f177.google.com with SMTP id u50so415391wey.36 for ; Tue, 06 Nov 2012 13:49:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=PxqOQNjfyfsusuA/LlA1RqLniKULHO7olZprV0hqswY=; b=ar0m2oihsLgmrdp4gkVzQgc5LIydrTWGM+20wzEU/ggKknpfzYp4EP5BUabJp0Kr39 8fH62eZDbvDc3ycZJ6hm5W4PBYhGIJySn3awkm8geprMozk9kFtNnR86TEr8DNRJitm+ Wme1NvtmQYWrfOe6a5xPojDnHndQPZ0NTCM1+dY5fOOCRYSdz44z+aKh2cUoN5uuI1nt fpVNev78xjKTvWsCN2sz9RLZpEtZvonwAkspPD0w1Eq4S1FeHRbjRpAQlHh8kHJdwsH8 CFRbJ8JLs8pLrYiuN/BsJo9QV8+0DDRnbi+dvW2/qPxwunDrtNbZzEKg7kX0zMhyN+/3 0B0A== Received: by 10.216.197.99 with SMTP id s77mr1159319wen.64.1352238575446; Tue, 06 Nov 2012 13:49:35 -0800 (PST) Received: from joi (acdi235.neoplus.adsl.tpnet.pl. [83.9.158.235]) by mx.google.com with ESMTPS id dm3sm689035wib.3.2012.11.06.13.49.33 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 06 Nov 2012 13:49:34 -0800 (PST) Received: by joi (sSMTP sendmail emulation); Tue, 06 Nov 2012 22:50:07 +0100 From: Marcin Slusarz To: Subject: [PATCH 4/4] drm/ttm: remove ttm_mem_global->queue Date: Tue, 6 Nov 2012 22:49:54 +0100 Message-Id: <1352238594-14991-4-git-send-email-marcin.slusarz@gmail.com> X-Mailer: git-send-email 1.7.12 Cc: Thomas Hellstrom X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 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 It's unused. Signed-off-by: Marcin Slusarz Cc: Thomas Hellstrom Reviewed-by: Thomas Hellstrom --- drivers/gpu/drm/ttm/ttm_memory.c | 1 - include/drm/ttm/ttm_memory.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c index 479c6b0..dbc2def 100644 --- a/drivers/gpu/drm/ttm/ttm_memory.c +++ b/drivers/gpu/drm/ttm/ttm_memory.c @@ -367,7 +367,6 @@ int ttm_mem_global_init(struct ttm_mem_global *glob) spin_lock_init(&glob->lock); glob->swap_queue = create_singlethread_workqueue("ttm_swap"); INIT_WORK(&glob->work, ttm_shrink_work); - init_waitqueue_head(&glob->queue); ret = kobject_init_and_add( &glob->kobj, &ttm_mem_glob_kobj_type, ttm_get_kobj(), "memory_accounting"); if (unlikely(ret != 0)) { diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h index d6d1da4..72dcbe8 100644 --- a/include/drm/ttm/ttm_memory.h +++ b/include/drm/ttm/ttm_memory.h @@ -60,7 +60,6 @@ struct ttm_mem_shrink { * for the GPU, and this will otherwise block other workqueue tasks(?) * At this point we use only a single-threaded workqueue. * @work: The workqueue callback for the shrink queue. - * @queue: Wait queue for processes suspended waiting for memory. * @lock: Lock to protect the @shrink - and the memory accounting members, * that is, essentially the whole structure with some exceptions. * @zones: Array of pointers to accounting zones. @@ -80,7 +79,6 @@ struct ttm_mem_global { struct ttm_mem_shrink *shrink; struct workqueue_struct *swap_queue; struct work_struct work; - wait_queue_head_t queue; spinlock_t lock; struct ttm_mem_zone *zones[TTM_MEM_MAX_ZONES]; unsigned int num_zones;