* [PATCH 4/4] drm/ttm: remove ttm_mem_global->queue
@ 2012-11-06 21:49 Marcin Slusarz
2012-11-07 12:37 ` Thomas Hellstrom
0 siblings, 1 reply; 2+ messages in thread
From: Marcin Slusarz @ 2012-11-06 21:49 UTC (permalink / raw)
To: dri-devel; +Cc: Thomas Hellstrom
It's unused.
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
---
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;
--
1.7.12
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 4/4] drm/ttm: remove ttm_mem_global->queue
2012-11-06 21:49 [PATCH 4/4] drm/ttm: remove ttm_mem_global->queue Marcin Slusarz
@ 2012-11-07 12:37 ` Thomas Hellstrom
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Hellstrom @ 2012-11-07 12:37 UTC (permalink / raw)
To: Marcin Slusarz; +Cc: Thomas Hellstrom, dri-devel
On 11/06/2012 10:49 PM, Marcin Slusarz wrote:
> It's unused.
>
> Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
> Cc: Thomas Hellstrom <thellstrom@vmware.com>
> ---
> 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;
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-11-07 12:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-06 21:49 [PATCH 4/4] drm/ttm: remove ttm_mem_global->queue Marcin Slusarz
2012-11-07 12:37 ` Thomas Hellstrom
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.