diff options
| author | Thomas White <taw27@cam.ac.uk> | 2009-06-08 14:42:36 +0100 |
|---|---|---|
| committer | Thomas White <taw27@cam.ac.uk> | 2009-06-08 14:42:36 +0100 |
| commit | 6e278419626d23b3c15e4cb0ee3b56ce4ab99f87 (patch) | |
| tree | f95a3e57a03362b499fe7c782d65b2d1d0cad191 /drivers/mfd/glamo/glamo-drm-private.h | |
| parent | 799dc0363fc2c4c98f18dbd9abf39c20811618d9 (diff) | |
| parent | e5db384674345591ab0fd239cf14e7e2ef9fb1a3 (diff) | |
Merge branch 'drm-tracking-cleanup' into drm-tracking
Diffstat (limited to 'drivers/mfd/glamo/glamo-drm-private.h')
| -rw-r--r-- | drivers/mfd/glamo/glamo-drm-private.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mfd/glamo/glamo-drm-private.h b/drivers/mfd/glamo/glamo-drm-private.h index 59fbc2488c5..4cc5877e118 100644 --- a/drivers/mfd/glamo/glamo-drm-private.h +++ b/drivers/mfd/glamo/glamo-drm-private.h @@ -1,6 +1,7 @@ /* Smedia Glamo 336x/337x DRM private bits * * Copyright (C) 2008-2009 Thomas White <taw@bitwiz.org.uk> + * Copyright (C) 2009 Andreas Pokorny <andreas.pokorny@gmail.com> * Based on xf86-video-glamo * Copyright 2007 OpenMoko, Inc. * Copyright © 2009 Lars-Peter Clausen <lars@metafoo.de> @@ -29,6 +30,7 @@ #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/semaphore.h> #include "glamo-core.h" @@ -56,6 +58,9 @@ struct glamodrm_handle { /* Memory management */ struct drm_mm *mmgr; + + /* semaphore against concurrent ioctl */ + struct semaphore add_to_ring; }; /* Private data. This is where we keep our memory management bits */ |