All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: dri-devel@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [PATCH 12/14] drm: don't export dri1 locking functions
Date: Mon, 23 Aug 2010 22:53:34 +0200	[thread overview]
Message-ID: <1282596816-10896-13-git-send-email-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <1282596816-10896-1-git-send-email-daniel.vetter@ffwll.ch>

Only used by ioctl, not by any in-tree drivers.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 drivers/gpu/drm/drm_lock.c |   10 +++-------
 include/drm/drmP.h         |    1 -
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
index 1973d75..4b9007e 100644
--- a/drivers/gpu/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c
@@ -37,6 +37,8 @@
 
 static int drm_notifier(void *priv);
 
+static int drm_lock_take(struct drm_lock_data *lock_data, unsigned int context);
+
 /**
  * Lock ioctl.
  *
@@ -170,6 +172,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
  *
  * Attempt to mark the lock as held by the given context, via the \p cmpxchg instruction.
  */
+static
 int drm_lock_take(struct drm_lock_data *lock_data,
 		  unsigned int context)
 {
@@ -206,7 +209,6 @@ int drm_lock_take(struct drm_lock_data *lock_data,
 	}
 	return 0;
 }
-EXPORT_SYMBOL(drm_lock_take);
 
 /**
  * This takes a lock forcibly and hands it to context.	Should ONLY be used
@@ -274,7 +276,6 @@ int drm_lock_free(struct drm_lock_data *lock_data, unsigned int context)
 	wake_up_interruptible(&lock_data->lock_queue);
 	return 0;
 }
-EXPORT_SYMBOL(drm_lock_free);
 
 /**
  * If we get here, it means that the process has called DRM_IOCTL_LOCK
@@ -337,7 +338,6 @@ void drm_idlelock_take(struct drm_lock_data *lock_data)
 	}
 	spin_unlock_bh(&lock_data->spinlock);
 }
-EXPORT_SYMBOL(drm_idlelock_take);
 
 void drm_idlelock_release(struct drm_lock_data *lock_data)
 {
@@ -357,8 +357,6 @@ void drm_idlelock_release(struct drm_lock_data *lock_data)
 	}
 	spin_unlock_bh(&lock_data->spinlock);
 }
-EXPORT_SYMBOL(drm_idlelock_release);
-
 
 int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv)
 {
@@ -367,5 +365,3 @@ int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv)
 		_DRM_LOCK_IS_HELD(master->lock.hw_lock->lock) &&
 		master->lock.file_priv == file_priv);
 }
-
-EXPORT_SYMBOL(drm_i_have_hw_lock);
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 07514bf..0798ec5 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1234,7 +1234,6 @@ extern int drm_lock(struct drm_device *dev, void *data,
 		    struct drm_file *file_priv);
 extern int drm_unlock(struct drm_device *dev, void *data,
 		      struct drm_file *file_priv);
-extern int drm_lock_take(struct drm_lock_data *lock_data, unsigned int context);
 extern int drm_lock_free(struct drm_lock_data *lock_data, unsigned int context);
 extern void drm_idlelock_take(struct drm_lock_data *lock_data);
 extern void drm_idlelock_release(struct drm_lock_data *lock_data);
-- 
1.7.1

  parent reply	other threads:[~2010-08-23 21:02 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-23 20:53 [PATCH 00/14] various drm core cleanups Daniel Vetter
2010-08-23 20:53 ` [PATCH 01/14] drm: don't export drm_sg_alloc Daniel Vetter
2010-08-23 20:53 ` [PATCH 02/14] drm: kill kernel_context_switch callbacks Daniel Vetter
2010-08-23 20:53 ` [PATCH 03/14] drm: kill dma_ready callbacks Daniel Vetter
2010-08-23 20:53 ` [PATCH 04/14] drm: kill procfs callbacks Daniel Vetter
2010-08-23 20:53 ` [PATCH 05/14] drm: kill drm_map_ofs callbacks Daniel Vetter
2010-08-23 20:53 ` [PATCH 06/14] drm: kill get_reg_ofs callback Daniel Vetter
2010-08-23 20:53 ` [PATCH 07/14] drm: kill context_ctor callback Daniel Vetter
2010-08-23 20:53 ` [PATCH 08/14] drm: don't export drm_get_drawable_info Daniel Vetter
2010-08-23 20:53 ` [PATCH 09/14] drm: replace drawable ioctl by noops Daniel Vetter
2010-08-23 20:53 ` [PATCH 10/14] drm: kill dev->timer Daniel Vetter
2010-08-23 20:53 ` [PATCH 11/14] drm: kill gem_free_object_unlocked driver callback Daniel Vetter
2010-08-23 20:53 ` Daniel Vetter [this message]
2010-08-23 20:53 ` [PATCH 13/14] drm: drop return value of drm_free_agp Daniel Vetter
2010-08-23 20:53 ` [PATCH 14/14] drm: kill agp indirection mess Daniel Vetter
2010-08-24 15:05   ` Kristian Høgsberg
2010-08-24 16:20     ` Daniel Vetter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1282596816-10896-13-git-send-email-daniel.vetter@ffwll.ch \
    --to=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.