summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2014-04-10 08:57:55 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-04-15 13:35:27 +0300
commitb841aedfcfd543d836c856bfde5a17c51cab6b26 (patch)
tree565ddf6ae33b081eadea4f75d2c12540613783eb
parent772cdc9777403f10c4229c49645024a502dfd783 (diff)
downloadlinux-stable-b841aedfcfd543d836c856bfde5a17c51cab6b26.tar.gz
linux-stable-b841aedfcfd543d836c856bfde5a17c51cab6b26.tar.bz2
linux-stable-b841aedfcfd543d836c856bfde5a17c51cab6b26.zip
drm/omap: remove warn from debugfs
Patch dfe96ddcfa22b44100814b9435770f6ff1309d37 (omapdrm: simplify locking in the fb debugfs file) removed taking locks when using omapdrm's debugfs to dump fb objects. However, in omap_gem_describe we give a WARN is the lock has not been taken, so that WARN is now seen every time omapdrm debugfs is used. So, presuming the removal of locks is ok, we can also remove the WARN. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--drivers/gpu/drm/omapdrm/omap_gem.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index c8d972763889..70798b9fe635 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -980,12 +980,9 @@ int omap_gem_resume(struct device *dev)
#ifdef CONFIG_DEBUG_FS
void omap_gem_describe(struct drm_gem_object *obj, struct seq_file *m)
{
- struct drm_device *dev = obj->dev;
struct omap_gem_object *omap_obj = to_omap_bo(obj);
uint64_t off;
- WARN_ON(!mutex_is_locked(&dev->struct_mutex));
-
off = drm_vma_node_start(&obj->vma_node);
seq_printf(m, "%08x: %2d (%2d) %08llx %08Zx (%2d) %p %4d",