projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pwm/for-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
msm
/
msm_fbdev.c
diff --git
a/drivers/gpu/drm/msm/msm_fbdev.c
b/drivers/gpu/drm/msm/msm_fbdev.c
index f97a1964ef39494d9c9c2813482a33d4f7fc7a80..3f6ec077b51df822628291c0c829d6eb3afa2d39 100644
(file)
--- a/
drivers/gpu/drm/msm/msm_fbdev.c
+++ b/
drivers/gpu/drm/msm/msm_fbdev.c
@@
-68,12
+68,7
@@
static int msm_fbdev_mmap(struct fb_info *info, struct vm_area_struct *vma)
if (drm_device_is_unplugged(dev))
return -ENODEV;
if (drm_device_is_unplugged(dev))
return -ENODEV;
- mutex_lock(&dev->struct_mutex);
-
ret = drm_gem_mmap_obj(drm_obj, drm_obj->size, vma);
ret = drm_gem_mmap_obj(drm_obj, drm_obj->size, vma);
-
- mutex_unlock(&dev->struct_mutex);
-
if (ret) {
pr_err("%s:drm_gem_mmap_obj fail\n", __func__);
return ret;
if (ret) {
pr_err("%s:drm_gem_mmap_obj fail\n", __func__);
return ret;