diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-07-06 06:28:05 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-07-06 06:29:24 +1000 |
| commit | 96b2bb0b9637df1a68bb5b6853903a207fabcefd (patch) | |
| tree | 6f9d61aeb2a46c0492aa18a98b77106c84306724 /drivers/gpu/drm/omapdrm/omap_debugfs.c | |
| parent | f29135ee4e0d4e01911ed569f731bfdb841cea6d (diff) | |
| parent | f8466184bd5b5c21eb6196cd0e44668725a2e47a (diff) | |
Merge tag 'omapdrm-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next
omapdrm changes for 4.19
* Workaround for DRA7 errata i932
* Fix mm_list locking
* Cleanups
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/88b2e77f-9646-d15f-645b-ba45af2a1966@ti.com
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_debugfs.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_debugfs.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_debugfs.c b/drivers/gpu/drm/omapdrm/omap_debugfs.c index b42e286616b00..91cf043f2b6ba 100644 --- a/drivers/gpu/drm/omapdrm/omap_debugfs.c +++ b/drivers/gpu/drm/omapdrm/omap_debugfs.c @@ -30,16 +30,11 @@ static int gem_show(struct seq_file *m, void *arg) struct drm_info_node *node = (struct drm_info_node *) m->private; struct drm_device *dev = node->minor->dev; struct omap_drm_private *priv = dev->dev_private; - int ret; - - ret = mutex_lock_interruptible(&dev->struct_mutex); - if (ret) - return ret; seq_printf(m, "All Objects:\n"); + mutex_lock(&priv->list_lock); omap_gem_describe_objects(&priv->obj_list, m); - - mutex_unlock(&dev->struct_mutex); + mutex_unlock(&priv->list_lock); return 0; } |